Attachment 193336 Details for Bug 93045 – Patch

[patch] Patch

bug-93045-20130315134347.patch (text/plain), 7.26 KB, created by miletus on 2013-03-15 10:47:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: miletus

Created: 2013-03-15 10:47:52 PDT

Size: 7.26 KB

patch

obsolete

>Subversion Revision: 145838
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 77ba28a158db78cf259358d34039b44b6627c77d..b2f9aac9faf1bba8b4b5a5672d0cff76e7103caf 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2013-03-14  Yufeng Shen  <miletus@chromium.org>
>+
>+        Remove PlatformEvent::GestureDoubleTap
>+        https://bugs.webkit.org/show_bug.cgi?id=93045
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        PlatformEvent::GestureDoubleTap is not currently
>+        used in WebCore and replaced by GestureTap with
>+        tap count 2, so remove it.
>+
>+        Test: We are removing something that is not used, so
>+        no new test. All existing tests pass.
>+
>+        * dom/GestureEvent.cpp:
>+        (WebCore::GestureEvent::create):
>+        * page/EventHandler.cpp:
>+        (WebCore::EventHandler::handleGestureEvent):
>+        * platform/PlatformEvent.h:
>+        * platform/chromium/PopupContainer.cpp:
>+        (WebCore::PopupContainer::handleGestureEvent):
>+
> 2013-03-14  Alberto Garcia  <agarcia@igalia.com>
> 
>         [BlackBerry] Gradient: don't use the default setPlatformGradientSpaceTransform()
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 5bb645bcaf6aa99f4c6791c00a1e2f36f243b35d..5f8f79805eb312c635087691e66108a88e8cac7c 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-03-14  Yufeng Shen  <miletus@chromium.org>
>+
>+        Remove PlatformEvent::GestureDoubleTap
>+        https://bugs.webkit.org/show_bug.cgi?id=93045
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        PlatformEvent::GestureDoubleTap is not currently
>+        used in WebCore so remove it.
>+
>+        * src/WebInputEventConversion.cpp:
>+        (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
>+
> 2013-03-14  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed.  Rolled Chromium DEPS to r188004.  Requested by
>diff --git a/Source/WebCore/dom/GestureEvent.cpp b/Source/WebCore/dom/GestureEvent.cpp
>index e0671f89ab1341e6b8e5abd38ae0f01144c21a43..5541ac6bfaa7a1e17cbc8fb5c9bb5cbc38a90cc5 100644
>--- a/Source/WebCore/dom/GestureEvent.cpp
>+++ b/Source/WebCore/dom/GestureEvent.cpp
>@@ -53,7 +53,6 @@ PassRefPtr<GestureEvent> GestureEvent::create(PassRefPtr<AbstractView> view, con
>         eventType = eventNames().gesturetapEvent; break;
>     case PlatformEvent::GestureTapDown:
>         eventType = eventNames().gesturetapdownEvent; break;
>-    case PlatformEvent::GestureDoubleTap:
>     case PlatformEvent::GestureTwoFingerTap:
>     case PlatformEvent::GestureLongPress:
>     case PlatformEvent::GesturePinchBegin:
>diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
>index ff144974bcb256ba0598e09bf62bf50ae8d33af1..1f9561f6ec28798fccaca97559f59d4b67cd5028 100644
>--- a/Source/WebCore/page/EventHandler.cpp
>+++ b/Source/WebCore/page/EventHandler.cpp
>@@ -2454,11 +2454,6 @@ bool EventHandler::handleGestureTapDown()
> 
> bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
> {
>-    // We don't use DoubleTap at the moment, it's mostly redundant with tap since tap now contains
>-    // a tap count. FIXME: We should probably remove GestureDoubleTap (http://wkb.ug/93045).
>-    if (gestureEvent.type() == PlatformEvent::GestureDoubleTap)
>-        return false;
>-
>     Node* eventTarget = 0;
>     Scrollbar* scrollbar = 0;
>     if (gestureEvent.type() == PlatformEvent::GestureScrollEnd
>@@ -2540,7 +2535,6 @@ bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
>         return handleGestureLongTap(gestureEvent);
>     case PlatformEvent::GestureTwoFingerTap:
>         return handleGestureTwoFingerTap(gestureEvent);
>-    case PlatformEvent::GestureDoubleTap:
>     case PlatformEvent::GesturePinchBegin:
>     case PlatformEvent::GesturePinchEnd:
>     case PlatformEvent::GesturePinchUpdate:
>diff --git a/Source/WebCore/platform/PlatformEvent.h b/Source/WebCore/platform/PlatformEvent.h
>index 2547a2ea0aa1534cb127c5249d22124313d30059..31af04190c0fcd2353ef02e409834b5c74d0aea1 100644
>--- a/Source/WebCore/platform/PlatformEvent.h
>+++ b/Source/WebCore/platform/PlatformEvent.h
>@@ -56,7 +56,6 @@ public:
>         GestureTap,
>         GestureTapDown,
>         GestureTapDownCancel,
>-        GestureDoubleTap,
>         GestureTwoFingerTap,
>         GestureLongPress,
>         GestureLongTap,
>diff --git a/Source/WebCore/platform/chromium/PopupContainer.cpp b/Source/WebCore/platform/chromium/PopupContainer.cpp
>index 9fb43c39664fb1fb8eabdefd46701cd01dbf302b..5b42d8648d51d65b3ed20aa010fa7c82077dc98a 100644
>--- a/Source/WebCore/platform/chromium/PopupContainer.cpp
>+++ b/Source/WebCore/platform/chromium/PopupContainer.cpp
>@@ -319,8 +319,6 @@ bool PopupContainer::handleGestureEvent(const PlatformGestureEvent& gestureEvent
>         handleMouseReleaseEvent(fakeMouseUp);
>         return true;
>     }
>-    case PlatformEvent::GestureDoubleTap:
>-        break;
>     case PlatformEvent::GestureScrollUpdate:
>     case PlatformEvent::GestureScrollUpdateWithoutPropagation: {
>         PlatformWheelEvent syntheticWheelEvent(gestureEvent.position(), gestureEvent.globalPosition(), gestureEvent.deltaX(), gestureEvent.deltaY(), gestureEvent.deltaX() / 120.0f, gestureEvent.deltaY() / 120.0f, ScrollByPixelWheelEvent, gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey());
>diff --git a/Source/WebKit/chromium/src/WebInputEventConversion.cpp b/Source/WebKit/chromium/src/WebInputEventConversion.cpp
>index 71ee0b60185f1e2178056d3769c22fba66f6de07..45340bd04060eae4064c18beb947700c7933b78e 100644
>--- a/Source/WebKit/chromium/src/WebInputEventConversion.cpp
>+++ b/Source/WebKit/chromium/src/WebInputEventConversion.cpp
>@@ -186,9 +186,6 @@ PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W
>     case WebInputEvent::GestureTapCancel:
>         m_type = PlatformEvent::GestureTapDownCancel;
>         break;
>-    case WebInputEvent::GestureDoubleTap:
>-        m_type = PlatformEvent::GestureDoubleTap;
>-        break;
>     case WebInputEvent::GestureTwoFingerTap:
>         m_type = PlatformEvent::GestureTwoFingerTap;
>         m_area = expandedIntSize(FloatSize(e.data.twoFingerTap.firstFingerWidth / scale, e.data.twoFingerTap.firstFingerHeight / scale));
>diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
>index 640aa6b85e0ce55c9cd853c0fd6dc43c2601920c..c2a19ae622ec663af8baa90e940a8b93f78e54d1 100644
>--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
>@@ -827,9 +827,11 @@ bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
>         if (m_webSettings->doubleTapToZoomEnabled() && m_minimumPageScaleFactor != m_maximumPageScaleFactor) {
>             m_client->cancelScheduledContentIntents();
>             animateZoomAroundPoint(platformEvent.position(), DoubleTap);
>-            eventSwallowed = true;
>-            break;
>         }
>+        // GestureDoubleTap is currently only used by Android for zooming. For WebCore,
>+        // GestureTap with tap count = 2 is used instead. So we drop GestureDoubleTap here.
>+        eventSwallowed = true;
>+        break;
>     case WebInputEvent::GestureScrollBegin:
>     case WebInputEvent::GesturePinchBegin:
>         m_client->cancelScheduledContentIntents();

Actions: View | Formatted Diff | Diff

Attachments on bug 93045: 193178 | 193336