Changeset 122325 in webkit

Timestamp:

Jul 11, 2012 3:40:41 AM (12 years ago)

Author:

abecsi@webkit.org

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 <​webkit.review.bot@gmail.com> on 2012-07-11

• UIProcess/API/qt/qquickwebview.cpp:
• UIProcess/API/qt/qquickwebview_p.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (1 diff)
• UIProcess/API/qt/qquickwebview_p.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <keunsoon.lee@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -1656 +1656 @@
 }
 
-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)
 {

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

@@ -169 +169 @@
 
 protected:
-    virtual bool childMouseEventFilter(QQuickItem*, QEvent*);
     virtual void geometryChanged(const QRectF&, const QRectF&);
     virtual void componentComplete();