Changeset 186148 in webkit

Timestamp:

Jun 30, 2015 5:08:12 PM (9 years ago)

Author:

enrica@apple.com

Message:

<rdar://problem/20655729> WebKit should heuristically exclude scrolling touch events from the user gesture category

Reviewed by Benjamin Poulain.

• Platform/spi/ios/UIKitSPI.h:
• Shared/WebEvent.h:

(WebKit::WebTouchEvent::WebTouchEvent):
(WebKit::WebTouchEvent::position):
(WebKit::WebTouchEvent::isPotentialTap):
(WebKit::WebTouchEvent::isGesture):
(WebKit::WebTouchEvent::gestureScale):
(WebKit::WebTouchEvent::gestureRotation):

• Shared/WebEventConversion.cpp:

(WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):

• Shared/ios/NativeWebTouchEventIOS.mm:

(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):

• Shared/ios/WebTouchEventIOS.cpp:

(WebKit::WebTouchEvent::encode):
(WebKit::WebTouchEvent::decode):
Pipe isPotentialTap through.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• Shared/WebEvent.h (modified) (3 diffs)
• Shared/WebEventConversion.cpp (modified) (1 diff)
• Shared/ios/NativeWebTouchEventIOS.mm (modified) (1 diff)
• Shared/ios/WebTouchEventIOS.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-30  Enrica Casucci  <enrica@apple.com>
+
+        <rdar://problem/20655729> WebKit should heuristically exclude scrolling touch events from the user gesture category
+
+        Reviewed by Benjamin Poulain.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * Shared/WebEvent.h:
+        (WebKit::WebTouchEvent::WebTouchEvent):
+        (WebKit::WebTouchEvent::position):
+        (WebKit::WebTouchEvent::isPotentialTap):
+        (WebKit::WebTouchEvent::isGesture):
+        (WebKit::WebTouchEvent::gestureScale):
+        (WebKit::WebTouchEvent::gestureRotation):
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
+        * Shared/ios/NativeWebTouchEventIOS.mm:
+        (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+        * Shared/ios/WebTouchEventIOS.cpp:
+        (WebKit::WebTouchEvent::encode):
+        (WebKit::WebTouchEvent::decode):
+        Pipe isPotentialTap through.
+
 2015-06-30  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -587 +587 @@
     struct _UIWebTouchPoint* touchPoints;
     unsigned touchPointCount;
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+    bool isPotentialTap;
+#endif
 };
 

trunk/Source/WebKit2/Shared/WebEvent.h

@@ -326 +326 @@
 public:
     WebTouchEvent() { }
-    WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector<WebPlatformTouchPoint>& touchPoints, WebCore::IntPoint position, bool isGesture, float gestureScale, float gestureRotation)
+    WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector<WebPlatformTouchPoint>& touchPoints, WebCore::IntPoint position, bool isPotentialTap, bool isGesture, float gestureScale, float gestureRotation)
         : WebEvent(type, modifiers, timestamp)
         , m_touchPoints(touchPoints)
         , m_position(position)
         , m_canPreventNativeGestures(true)
+        , m_isPotentialTap(isPotentialTap)
         , m_isGesture(isGesture)
         , m_gestureScale(gestureScale)
@@ -342 +343 @@
     WebCore::IntPoint position() const { return m_position; }
 
+    bool isPotentialTap() const { return m_isPotentialTap; }
+
     bool isGesture() const { return m_isGesture; }
     float gestureScale() const { return m_gestureScale; }
@@ -359 +362 @@
     WebCore::IntPoint m_position;
     bool m_canPreventNativeGestures;
+    bool m_isPotentialTap;
     bool m_isGesture;
     float m_gestureScale;

trunk/Source/WebKit2/Shared/WebEventConversion.cpp

@@ -333 +333 @@
         m_canPreventNativeGestures = webEvent.canPreventNativeGestures();
         m_isGesture = webEvent.isGesture();
+        m_isPotentialTap = webEvent.isPotentialTap();
         m_position = webEvent.position();
         m_globalPosition = webEvent.position();

trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm

@@ -97 +97 @@
 
 NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
-    : WebTouchEvent(webEventTypeForUIWebTouchEventType(event->type), static_cast<Modifiers>(0), event->timestamp, extractWebTouchPoint(event), positionForCGPoint(event->locationInDocumentCoordinates), event->inJavaScriptGesture, event->scale, event->rotation)
+    : WebTouchEvent(
+        webEventTypeForUIWebTouchEventType(event->type),
+        static_cast<Modifiers>(0),
+        event->timestamp,
+        extractWebTouchPoint(event),
+        positionForCGPoint(event->locationInDocumentCoordinates),
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+        event->isPotentialTap,
+#else
+        true,
+#endif
+        event->inJavaScriptGesture,
+        event->scale,
+        event->rotation)
 {
 }

trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp

@@ -42 +42 @@
     encoder << m_position;
     encoder << m_canPreventNativeGestures;
+    encoder << m_isPotentialTap;
     encoder << m_isGesture;
     encoder << m_gestureScale;
@@ -58 +59 @@
     if (!decoder.decode(result.m_canPreventNativeGestures))
         return false;
+    if (!decoder.decode(result.m_isPotentialTap))
+        return false;
     if (!decoder.decode(result.m_isGesture))
         return false;