Unreviewed, rolling out r111855.

http://trac.webkit.org/changeset/111855
https://bugs.webkit.org/show_bug.cgi?id=82053

It broke 30+ tests (Requested by Ossy on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-23

* UIProcess/qt/QtPageClient.cpp:
(QtPageClient::isViewWindowActive):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 41b5d94f915925eb676bafb84268d65a496d80c9..4af42c0d766b8ae13b2fde6d4aa6cc88d2bb1206 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r111855.
+        http://trac.webkit.org/changeset/111855
+        https://bugs.webkit.org/show_bug.cgi?id=82053
+
+        It broke 30+ tests (Requested by Ossy on #webkit).
+
+        * UIProcess/qt/QtPageClient.cpp:
+        (QtPageClient::isViewWindowActive):
+
 2012-03-23  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 
         [Qt][WK2] Implement PageClient::isViewWindowActive()

diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
index af0797b909b83236cf79611fbebe6a3ae4f4742b..d7049cb3b620859af936ae4f6b6e8c4f01057eae 100644 (file)
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
@@ -29,7 +29,6 @@
 #include "qquickwebview_p.h"
 #include "qquickwebview_p_p.h"
 #include <QGuiApplication>
-#include <QQuickCanvas>
 #include <WebCore/Cursor.h>
 #include <WebCore/DragData.h>
 #include <WebCore/FloatRect.h>
@@ -256,9 +255,8 @@ WebCore::IntSize QtPageClient::viewSize()
 
 bool QtPageClient::isViewWindowActive()
 {
-    if (!m_webView || !m_webView->canvas())
-        return false;
-    return m_webView->canvas()->isActive();
+    // FIXME: The scene graph does not have the concept of being active or not when this was written.
+    return true;
 }
 
 bool QtPageClient::isViewFocused()