Changeset 64245 in webkit

Timestamp:

Jul 28, 2010 4:45:53 PM (14 years ago)

Author:

kim.1.gronholm@nokia.com

Message:

2010-07-28 Kim Grönholm <​kim.1.gronholm@nokia.com>

Reviewed by Antonio Gomes.

[Qt] Decouple QTouchEvent's accepted flag from JS prevent default
​https://bugs.webkit.org/show_bug.cgi?id=42892

Added comments to the touch event handling code.

• Api/qgraphicswebview.cpp: (QGraphicsWebView::sceneEvent):
• Api/qwebpage.cpp: (QWebPagePrivate::touchEvent): (QWebPage::event):
• Api/qwebpage_p.h:
• Api/qwebview.cpp: (QWebView::event):

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (1 diff)
• Api/qwebpage.cpp (modified) (2 diffs)
• Api/qwebpage_p.h (modified) (1 diff)
• Api/qwebview.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -320 +320 @@
                 || event->type() == QEvent::TouchUpdate)) {
         d->page->event(event);
+
+        // Always return true so that we'll receive also TouchUpdate and TouchEnd events
         return true;
     }

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1400 +1400 @@
         return false;
 
+    // Always accept the QTouchEvent so that we'll receive also TouchUpdate and TouchEnd events
     event->setAccepted(true);
+
+    // Return whether the default action was cancelled in the JS event handler
     return frame->eventHandler()->handleTouchEvent(PlatformTouchEvent(event));
 }
@@ -2845 +2848 @@
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
+        // Return whether the default action was cancelled in the JS event handler
         return d->touchEvent(static_cast<QTouchEvent*>(ev));
 #endif

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -133 +133 @@
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    // Returns whether the default action was cancelled in the JS event handler
     bool touchEvent(QTouchEvent*);
 #endif

trunk/WebKit/qt/Api/qwebview.cpp

@@ -827 +827 @@
                    || e->type() == QEvent::TouchUpdate) {
             d->page->event(e);
+
+            // Always return true so that we'll receive also TouchUpdate and TouchEnd events
             return true;
 #endif

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-07-28  Kim Grönholm  <kim.1.gronholm@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Decouple QTouchEvent's accepted flag from JS prevent default
+        https://bugs.webkit.org/show_bug.cgi?id=42892
+
+        Added comments to the touch event handling code.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::sceneEvent):
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::touchEvent):
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+        * Api/qwebview.cpp:
+        (QWebView::event):
+
 2010-07-26  Steve Block  <steveblock@google.com>