Title: [111855] trunk/Source/WebKit2
- Revision
- 111855
- Author
- [email protected]
- Date
- 2012-03-23 06:27:06 -0700 (Fri, 23 Mar 2012)
Log Message
[Qt][WK2] Implement PageClient::isViewWindowActive()
https://bugs.webkit.org/show_bug.cgi?id=81143
Patch by Jesus Sanchez-Palencia <[email protected]> on 2012-03-23
Reviewed by Kenneth Rohde Christiansen.
This patch implements PageClient::isViewWindowActive()
now that QQuickCanvas::isActive() is available (from QWindow).
* UIProcess/qt/QtPageClient.cpp:
(QtPageClient::isViewWindowActive):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (111854 => 111855)
--- trunk/Source/WebKit2/ChangeLog 2012-03-23 13:10:55 UTC (rev 111854)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-23 13:27:06 UTC (rev 111855)
@@ -1,3 +1,16 @@
+2012-03-23 Jesus Sanchez-Palencia <[email protected]>
+
+ [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 Andras Becsi <[email protected]>
[Qt][WK2] Disable the flickable when pinching.
Modified: trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp (111854 => 111855)
--- trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp 2012-03-23 13:10:55 UTC (rev 111854)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp 2012-03-23 13:27:06 UTC (rev 111855)
@@ -29,6 +29,7 @@
#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>
@@ -255,8 +256,9 @@
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();
}
bool QtPageClient::isViewFocused()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
