diff options
| -rw-r--r-- | Source/WebKit2/ChangeLog | 13 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 9 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 654d0c3a8..addd4bc3c 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,16 @@ +2012-12-03 Simon Hausmann <simon.hausmann@digia.com> + + 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): + 2012-11-30 Pierre Rossi <pierre.rossi@gmail.com> [Qt] Unreviewed speculative Mac build fix after r136232 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; |