Changeset 189868 in webkit

Timestamp:

Sep 16, 2015 10:24:07 AM (9 years ago)

Author:

mitz@apple.com

Message:

[iOS] Unifiy WebKit2PlatformTouchPoint definition
​https://bugs.webkit.org/show_bug.cgi?id=149221

Reviewed by Darin Adler.

• Shared/WebEventConversion.cpp:

(WebKit::touchEventType):
(WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebEventConversion.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-16  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Unifiy WebKit2PlatformTouchPoint definition
+        https://bugs.webkit.org/show_bug.cgi?id=149221
+
+        Reviewed by Darin Adler.
+
+        * Shared/WebEventConversion.cpp:
+        (WebKit::touchEventType):
+        (WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):
+
 2015-09-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Shared/WebEventConversion.cpp

@@ -223 +223 @@
 
 #if PLATFORM(IOS)
+
 static WebCore::PlatformTouchPoint::TouchPhaseType touchEventType(const WebPlatformTouchPoint& webTouchPoint)
 {
@@ -239 +240 @@
 }
 
-#if ENABLE(IOS_TOUCH_EVENTS)
-#include <WebKitAdditions/WebEventConversionIOS.cpp>
-#else
 class WebKit2PlatformTouchPoint : public WebCore::PlatformTouchPoint {
 public:
 WebKit2PlatformTouchPoint(const WebPlatformTouchPoint& webTouchPoint)
-    : PlatformTouchPoint(webTouchPoint.identifier(), webTouchPoint.location(), touchEventType(webTouchPoint))
-{
-}
-};
-#endif // ENABLE(IOS_TOUCH_EVENTS)
+    : PlatformTouchPoint(webTouchPoint.identifier(), webTouchPoint.location(), touchEventType(webTouchPoint)
+#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+    , webTouchPoint.force()
+#endif
+    )
+{
+}
+};
 
 #else