Title: [100779] trunk/Source/WebKit2
- Revision
- 100779
- Author
- [email protected]
- Date
- 2011-11-18 08:18:53 -0800 (Fri, 18 Nov 2011)
Log Message
[Qt] Guard for the viewportInteractionEngine as it doesn't always exist.
Reviewed by Antonio Gomes.
The engine is non-existent when the view is configured to use desktop
behavior.
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::handleWheelEvent):
(QtWebPageProxy::didFindZoomableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (100778 => 100779)
--- trunk/Source/WebKit2/ChangeLog 2011-11-18 16:03:00 UTC (rev 100778)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-18 16:18:53 UTC (rev 100779)
@@ -1,3 +1,16 @@
+2011-11-18 Kenneth Rohde Christiansen <[email protected]>
+
+ [Qt] Guard for the viewportInteractionEngine as it doesn't always exist.
+
+ Reviewed by Antonio Gomes.
+
+ The engine is non-existent when the view is configured to use desktop
+ behavior.
+
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::handleWheelEvent):
+ (QtWebPageProxy::didFindZoomableArea):
+
2011-11-18 Carlos Garcia Campos <[email protected]>
[GTK] Send DidCreateDestination to DownloadProxy when destination has been created
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (100778 => 100779)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-18 16:03:00 UTC (rev 100778)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-18 16:18:53 UTC (rev 100779)
@@ -270,7 +270,8 @@
{
m_webPageProxy->handleWheelEvent(NativeWebWheelEvent(ev));
// FIXME: Handle whether the page used the wheel event or not.
- m_interactionEngine->wheelEvent(ev);
+ if (m_interactionEngine)
+ m_interactionEngine->wheelEvent(ev);
return ev->isAccepted();
}
@@ -633,6 +634,9 @@
void QtWebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
{
+ if (!m_interactionEngine)
+ return;
+
// FIXME: As the find method might not respond immediately during load etc,
// we should ignore all but the latest request.
m_interactionEngine->zoomToAreaGestureEnded(QPointF(target), QRectF(area));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
