Changeset 111993 in webkit

Timestamp:

Mar 24, 2012 8:23:56 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][WK2] Implement PageClient::isViewWindowActive()
​https://bugs.webkit.org/show_bug.cgi?id=81143

Patch by Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org> on 2012-03-24
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

This patch implements PageClient::isViewWindowActive()
now that QQuickCanvas::isActive() is available (from QWindow).

• UIProcess/qt/QtPageClient.cpp:

(QtPageClient::isViewWindowActive):

Tools:

Fix the WrapperWindow from our PlatformWebView
so it correctly creates the platform related
stuff for QWindow, which is not created unless
QWindow::setVisible() or QWindow::show() are called.

• WebKitTestRunner/qt/PlatformWebViewQt.cpp:

(WTR::PlatformWebView::PlatformWebView):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/qt/QtPageClient.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-24  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt][WK2] Implement PageClient::isViewWindowActive()
+        https://bugs.webkit.org/show_bug.cgi?id=81143
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        This patch implements PageClient::isViewWindowActive()
+        now that QQuickCanvas::isActive() is available (from QWindow).
+
+        * UIProcess/qt/QtPageClient.cpp:
+        (QtPageClient::isViewWindowActive):
+
 2012-03-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp

@@ -30 +30 @@
 #include "qquickwebview_p_p.h"
 #include <QGuiApplication>
+#include <QQuickCanvas>
 #include <WebCore/Cursor.h>
 #include <WebCore/DragData.h>
@@ -256 +257 @@
 bool QtPageClient::isViewWindowActive()
 {
-    // FIXME: The scene graph does not have the concept of being active or not when this was written.
-    return true;
+    if (!m_webView || !m_webView->canvas())
+        return false;
+    return m_webView->canvas()->isActive();
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-24  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt][WK2] Implement PageClient::isViewWindowActive()
+        https://bugs.webkit.org/show_bug.cgi?id=81143
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix the WrapperWindow from our PlatformWebView
+        so it correctly creates the platform related
+        stuff for QWindow, which is not created unless
+        QWindow::setVisible() or QWindow::show() are called.
+
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+        (WTR::PlatformWebView::PlatformWebView):
+
 2012-03-23  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

@@ -77 +77 @@
     QQuickWebViewExperimental experimental(m_view);
     experimental.setRenderToOffscreenBuffer(true);
+
+    // QWindow does not create the underlying platform
+    // specific bits unless QWindow::setVisible() or QWindow::show() are called,
+    // and without it QWindow::isActive() will always return false.
+    // For these cases QWindow::create() is provided.
+    m_window->create();
 }