Title: [122325] trunk/Source/WebKit2
- Revision
- 122325
- Author
- [email protected]
- Date
- 2012-07-11 03:40:41 -0700 (Wed, 11 Jul 2012)
Log Message
Unreviewed, rolling out r122318.
http://trac.webkit.org/changeset/122318
https://bugs.webkit.org/show_bug.cgi?id=90961
It made 11 fast/events/touch fail (Requested by bbandix on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2012-07-11
* UIProcess/API/qt/qquickwebview.cpp:
* UIProcess/API/qt/qquickwebview_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (122324 => 122325)
--- trunk/Source/WebKit2/ChangeLog 2012-07-11 10:35:31 UTC (rev 122324)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-11 10:40:41 UTC (rev 122325)
@@ -1,3 +1,15 @@
+2012-07-11 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122318.
+ http://trac.webkit.org/changeset/122318
+ https://bugs.webkit.org/show_bug.cgi?id=90961
+
+ It made 11 fast/events/touch fail (Requested by bbandix on
+ #webkit).
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ * UIProcess/API/qt/qquickwebview_p.h:
+
2012-07-11 Keunsoon Lee <[email protected]>
[EFL][Wk2] WebErrorsEfl.cpp needs to return non-empty errors
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (122324 => 122325)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-07-11 10:35:31 UTC (rev 122324)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-07-11 10:40:41 UTC (rev 122325)
@@ -1655,38 +1655,6 @@
WTF::initializeMainThread();
}
-bool QQuickWebView::childMouseEventFilter(QQuickItem* item, QEvent* event)
-{
- // This function is used by MultiPointTouchArea and PinchArea to filter
- // touch events, thus to hinder the canvas from sending synthesized
- // mouse events to the Flickable implementation we need to reimplement
- // childMouseEventFilter and filter incoming touch events as well.
-
- if (!isVisible() || !isEnabled())
- return QQuickFlickable::childMouseEventFilter(item, event);
-
- switch (event->type()) {
- case QEvent::MouseButtonPress:
- mousePressEvent(static_cast<QMouseEvent*>(event));
- return event->isAccepted();
- case QEvent::MouseMove:
- mouseMoveEvent(static_cast<QMouseEvent*>(event));
- return event->isAccepted();
- case QEvent::MouseButtonRelease:
- mouseReleaseEvent(static_cast<QMouseEvent*>(event));
- return event->isAccepted();
- case QEvent::TouchBegin:
- case QEvent::TouchUpdate:
- case QEvent::TouchEnd:
- touchEvent(static_cast<QTouchEvent*>(event));
- return event->isAccepted();
- default:
- break;
- }
-
- return QQuickFlickable::childMouseEventFilter(item, event);
-}
-
void QQuickWebView::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
{
Q_D(QQuickWebView);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (122324 => 122325)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-07-11 10:35:31 UTC (rev 122324)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-07-11 10:40:41 UTC (rev 122325)
@@ -168,7 +168,6 @@
void navigationRequested(QWebNavigationRequest* request);
protected:
- virtual bool childMouseEventFilter(QQuickItem*, QEvent*);
virtual void geometryChanged(const QRectF&, const QRectF&);
virtual void componentComplete();
virtual void keyPressEvent(QKeyEvent*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes