Title: [128093] trunk
Revision
128093
Author
[email protected]
Date
2012-09-10 13:09:45 -0700 (Mon, 10 Sep 2012)

Log Message

Source/WebKit/chromium: [chromium] Add unused GestureTapCancel
https://bugs.webkit.org/show_bug.cgi?id=96183

Patch by Rick Byers <[email protected]> on 2012-09-10
Reviewed by Adam Barth.

This adds a new 'tap cancel' gesture type.  This is temporarily unused,
so that we can change chromium to start sending the gesture type
without breaking anything.

* public/WebInputEvent.h:
* src/PageWidgetDelegate.cpp:
(WebKit::PageWidgetDelegate::handleInputEvent):
* src/WebInputEventConversion.cpp:
(WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
* src/WebPopupMenuImpl.cpp:
(WebKit::WebPopupMenuImpl::handleInputEvent):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleGestureEvent):

Tools: Add handling of new GestureTapCancel in DRT

https://bugs.webkit.org/show_bug.cgi?id=96183

Patch by Rick Byers <[email protected]> on 2012-09-10
Reviewed by Adam Barth.

* DumpRenderTree/chromium/TestWebPlugin.cpp:
(TestWebPlugin::handleInputEvent):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (128092 => 128093)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-09-10 20:09:45 UTC (rev 128093)
@@ -1,3 +1,24 @@
+2012-09-10  Rick Byers  <[email protected]>
+
+        [chromium] Add unused GestureTapCancel
+        https://bugs.webkit.org/show_bug.cgi?id=96183
+
+        Reviewed by Adam Barth.
+
+        This adds a new 'tap cancel' gesture type.  This is temporarily unused,
+        so that we can change chromium to start sending the gesture type
+        without breaking anything.
+
+        * public/WebInputEvent.h:
+        * src/PageWidgetDelegate.cpp:
+        (WebKit::PageWidgetDelegate::handleInputEvent):
+        * src/WebInputEventConversion.cpp:
+        (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::handleInputEvent):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleGestureEvent):
+
 2012-09-10  Mark Pilgrim  <[email protected]>
 
         [Chromium] Define new setSharedWorkerRepository function in preparation for removing WebKitPlatformSupport::sharedWorkerRepository()

Modified: trunk/Source/WebKit/chromium/public/WebInputEvent.h (128092 => 128093)


--- trunk/Source/WebKit/chromium/public/WebInputEvent.h	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Source/WebKit/chromium/public/WebInputEvent.h	2012-09-10 20:09:45 UTC (rev 128093)
@@ -116,6 +116,7 @@
         GestureFlingCancel,
         GestureTap,
         GestureTapDown,
+        GestureTapCancel,
         GestureDoubleTap,
         GestureTwoFingerTap,
         GestureLongPress,
@@ -216,6 +217,7 @@
             || type == GesturePinchUpdate
             || type == GestureTap
             || type == GestureTapDown
+            || type == GestureTapCancel
             || type == GestureDoubleTap
             || type == GestureTwoFingerTap
             || type == GestureLongPress

Modified: trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp (128092 => 128093)


--- trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp	2012-09-10 20:09:45 UTC (rev 128093)
@@ -154,6 +154,7 @@
     case WebInputEvent::GestureFlingCancel:
     case WebInputEvent::GestureTap:
     case WebInputEvent::GestureTapDown:
+    case WebInputEvent::GestureTapCancel:
     case WebInputEvent::GestureDoubleTap:
     case WebInputEvent::GestureTwoFingerTap:
     case WebInputEvent::GestureLongPress:

Modified: trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp (128092 => 128093)


--- trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp	2012-09-10 20:09:45 UTC (rev 128093)
@@ -288,6 +288,7 @@
     case WebInputEvent::Undefined:
     case WebInputEvent::MouseEnter:
     case WebInputEvent::ContextMenu:
+    case WebInputEvent::GestureTapCancel:
         return false;
     }
     return false;

Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (128092 => 128093)


--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp	2012-09-10 20:09:45 UTC (rev 128093)
@@ -771,6 +771,10 @@
         PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
         return mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
     }
+    case WebInputEvent::GestureTapCancel:
+        // FIXME: Update WebCore to handle this event after chromium has been updated to send it
+        // http://wkb.ug/96060
+        return false;
     default:
         ASSERT_NOT_REACHED();
     }

Modified: trunk/Tools/ChangeLog (128092 => 128093)


--- trunk/Tools/ChangeLog	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Tools/ChangeLog	2012-09-10 20:09:45 UTC (rev 128093)
@@ -1,3 +1,14 @@
+2012-09-10  Rick Byers  <[email protected]>
+
+        Add handling of new GestureTapCancel in DRT
+        
+        https://bugs.webkit.org/show_bug.cgi?id=96183
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/TestWebPlugin.cpp:
+        (TestWebPlugin::handleInputEvent):
+
 2012-09-10  Brady Eidson  <[email protected]>
 
         _javascript_ in foreground tabs should not wait synchronously for plug-ins to load

Modified: trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp (128092 => 128093)


--- trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp	2012-09-10 19:55:15 UTC (rev 128092)
+++ trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp	2012-09-10 20:09:45 UTC (rev 128093)
@@ -392,6 +392,7 @@
     case WebKit::WebInputEvent::GestureFlingCancel:  eventName = "GestureFlingCancel"; break;
     case WebKit::WebInputEvent::GestureTap:          eventName = "GestureTap"; break;
     case WebKit::WebInputEvent::GestureTapDown:      eventName = "GestureTapDown"; break;
+    case WebKit::WebInputEvent::GestureTapCancel:    eventName = "GestureTapCancel"; break;
     case WebKit::WebInputEvent::GestureDoubleTap:    eventName = "GestureDoubleTap"; break;
     case WebKit::WebInputEvent::GestureTwoFingerTap: eventName = "GestureTwoFingerTap"; break;
     case WebKit::WebInputEvent::GestureLongPress:    eventName = "GestureLongPress"; break;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to