summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-12-04 05:19:54 +0100
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2012-12-04 12:00:01 +0100
commit0b789c6a785d5ef45c3f6f2fc0f8694772b3d392 (patch)
tree790d0a999dccfb93fded91bb8d324a2de0acf0ff /Source/WebKit2/UIProcess/API
parentf2eabd8732d3806320b30cd3dedff1a3873c3575 (diff)
downloadqtwebkit-0b789c6a785d5ef45c3f6f2fc0f8694772b3d392.tar.gz
Unreviewed, rolling out r136119.
http://trac.webkit.org/changeset/136119 https://bugs.webkit.org/show_bug.cgi?id=100964 We decided to restore previous default behaviour * UIProcess/API/qt/qquickwebview.cpp: (QQuickWebViewFlickablePrivate::handleMouseEvent): * UIProcess/API/qt/qquickwebview_p_p.h: (QQuickWebViewFlickablePrivate): Change-Id: I8b8696e6de8f771a0985b487eb383115a5db6867 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/API')
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp9
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index a41bde0a7..7af76f25f 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -891,6 +891,15 @@ void QQuickWebViewFlickablePrivate::pageDidRequestScroll(const QPoint& pos)
m_pageViewportController->pageDidRequestScroll(pos);
}
+void QQuickWebViewFlickablePrivate::handleMouseEvent(QMouseEvent* event)
+{
+ if (!pageView->eventHandler())
+ return;
+
+ // FIXME: Update the axis locker for mouse events as well.
+ pageView->eventHandler()->handleInputEvent(event);
+}
+
QQuickWebViewExperimental::QQuickWebViewExperimental(QQuickWebView *webView, QQuickWebViewPrivate* webViewPrivate)
: QObject(webView)
, q_ptr(webView)
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
index 8445fe2f7..adedb6a31 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
@@ -223,6 +223,7 @@ public:
virtual void updateViewportSize();
virtual void pageDidRequestScroll(const QPoint& pos);
+ virtual void handleMouseEvent(QMouseEvent*);
private:
QScopedPointer<WebKit::PageViewportController> m_pageViewportController;