add log

Author: hekra

src/webdriver/extension_qt/qml_view_util.cc

@@ -122,7 +122,7 @@ QQmlEngine* QQmlViewUtil::getQMLEngine(QQuickWindow* qquickWindow) {
     return NULL;
 }
 
-void QQmlViewUtil::setSource(const QUrl &url, bool sync, QQuickWindow* qquickWindow) {
+void QQmlViewUtil::setSource(const Logger& logger, const QUrl &url, bool sync, QQuickWindow* qquickWindow) {
     QQuickView* pView = qobject_cast<QQuickView*>(qquickWindow);
 
     if (pView != NULL) {
@@ -134,8 +134,14 @@ void QQmlViewUtil::setSource(const QUrl &url, bool sync, QQuickWindow* qquickWin
             if (QQuickView::Loading == pView->status()) {
                 loop.exec();
             }
+
+            if (QQuickView::Ready != pView->status()) {
+                logger.Log(kWarningLogLevel, "QML sync load, smth wrong. View is not in READY state.");
+            }
+
         } else {
             pView->setSource(url);
+            logger.Log(kFineLogLevel, "QML async load - ");
         }
     }
     else {

src/webdriver/extension_qt/qml_view_util.h

@@ -25,6 +25,7 @@
 #include <QtCore/QDebug>
 
 #include "common_util.h"
+#include "webdriver_logging.h"
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 class QWindow;
@@ -53,7 +54,7 @@ class QQmlViewUtil {
     static QWindow* getQWindowView(Session* session, const ViewId& viewId);
     static QQuickWindow* getQMLView(Session* session, const ViewId& viewId);
     static QQmlEngine* getQMLEngine(QQuickWindow* qquickWindow);
-    static void setSource(const QUrl &url, bool sync, QQuickWindow* qquickWindow);
+    static void setSource(const Logger& logger, const QUrl &url, bool sync, QQuickWindow* qquickWindow);
     static const QUrl getSource(QQuickWindow* qquickWindow);
 #else    
     static QDeclarativeView* getQMLView(Session* session, const ViewId& viewId);

src/webdriver/extension_qt/quick2_view_enumerator.cc

@@ -38,23 +38,13 @@ void Quick2ViewEnumeratorImpl::EnumerateViews(Session* session, std::set<ViewId>
 
     foreach(QWindow* pWindow, QGuiApplication::allWindows())
     {
-        session->logger().Log(kInfoLogLevel,
-                       "Quick2ViewEnumerator found new view ");
         if (!pWindow->isVisible()) continue;
-        session->logger().Log(kInfoLogLevel,
-                       "Quick2ViewEnumerator found new view visible ");
 
         QQuickWindow* pView = qobject_cast<QQuickWindow*>(pWindow);
         if (pView != NULL) {
-            session->logger().Log(kInfoLogLevel,
-                       "Quick2ViewEnumerator found new view QQuickWindow ");
-
             ViewHandlePtr handle(new QWindowViewHandle(pView));
             ViewId viewId = session->GetViewForHandle(handle);
             if (!viewId.is_valid()) {
-                session->logger().Log(kInfoLogLevel,
-                        "Quick2ViewEnumerator found new view is_valid");
-
                 if (session->AddNewView(handle, &viewId))  {
                     session->logger().Log(kInfoLogLevel,
                         "Quick2ViewEnumerator found new view("+viewId.id()+")");

src/webdriver/extension_qt/quick2_view_executor.cc

@@ -776,7 +776,7 @@ void Quick2ViewCmdExecutor::NavigateToURL(const std::string& url, bool sync, Err
         rootContext->setContextProperty("QmlWindow", view);
     }
 
-    QQmlViewUtil::setSource(address, sync, view);
+    QQmlViewUtil::setSource(session_->logger(), address, sync, view);
 }
 
 void Quick2ViewCmdExecutor::GetURL(std::string* url, Error** error) {