Changeset 184028 in webkit

Timestamp:

May 8, 2015, 4:18:21 PM (11 years ago)

Author:

Beth Dakin

Message:

Shuffle touch-related code to keep the internal builds working
​https://bugs.webkit.org/show_bug.cgi?id=144812

Reviewed by Benjamin Poulain.

• Shared/NativeWebTouchEvent.h:
• Shared/WebEvent.h:
• Shared/WebEventConversion.cpp:
• Shared/ios/NativeWebTouchEventIOS.mm:

(WebKit::NativeWebTouchEvent::extractWebTouchPoint):
(WebKit::extractWebTouchPoint): Deleted.

• Shared/ios/WebPlatformTouchPointIOS.cpp:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/NativeWebTouchEvent.h (modified) (1 diff)
• Shared/WebEvent.h (modified) (1 diff)
• Shared/WebEventConversion.cpp (modified) (2 diffs)
• Shared/ios/NativeWebTouchEventIOS.mm (modified) (2 diffs)
• Shared/ios/WebPlatformTouchPointIOS.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-08  Beth Dakin  <bdakin@apple.com>
+
+        Shuffle touch-related code to keep the internal builds working
+        https://bugs.webkit.org/show_bug.cgi?id=144812
+
+        Reviewed by Benjamin Poulain.
+
+        * Shared/NativeWebTouchEvent.h:
+        * Shared/WebEvent.h:
+        * Shared/WebEventConversion.cpp:
+        * Shared/ios/NativeWebTouchEventIOS.mm:
+        (WebKit::NativeWebTouchEvent::extractWebTouchPoint):
+        (WebKit::extractWebTouchPoint): Deleted.
+        * Shared/ios/WebPlatformTouchPointIOS.cpp:
+
 2015-05-08  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h

@@ -57 +57 @@
 
 private:
+#if PLATFORM(IOS)
+    Vector<WebPlatformTouchPoint> extractWebTouchPoint(const _UIWebTouchEvent*);
+#endif
+
 #if PLATFORM(GTK)
     GUniquePtr<GdkEvent> m_nativeEvent;

trunk/Source/WebKit2/Shared/WebEvent.h

@@ -300 +300 @@
     TouchPointState state() const { return phase(); }
 
+#if ENABLE(IOS_TOUCH_EVENTS)
+#include <WebKitAdditions/WebEventIOS.h>
+#endif
+
     void encode(IPC::ArgumentEncoder&) const;
     static bool decode(IPC::ArgumentDecoder&, WebPlatformTouchPoint&);

trunk/Source/WebKit2/Shared/WebEventConversion.cpp

@@ -239 +239 @@
 }
 
+#if ENABLE(IOS_TOUCH_EVENTS)
+#include <WebKitAdditions/WebEventConversionIOS.cpp>
+#else
 class WebKit2PlatformTouchPoint : public WebCore::PlatformTouchPoint {
 public:
@@ -246 +249 @@
 }
 };
+#endif // ENABLE(IOS_TOUCH_EVENTS)
+
 #else
 

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

@@ -76 +76 @@
 }
 
-static inline Vector<WebPlatformTouchPoint> extractWebTouchPoint(const _UIWebTouchEvent* event)
+#if ENABLE(IOS_TOUCH_EVENTS)
+#import <WebKitAdditions/NativeWebTouchEventIOS.mm>
+#else
+Vector<WebPlatformTouchPoint> NativeWebTouchEvent::extractWebTouchPoint(const _UIWebTouchEvent* event)
 {
     unsigned touchCount = event->touchPointCount;
@@ -91 +94 @@
     return touchPointList;
 }
+#endif
 
 NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)

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

@@ -36 +36 @@
 namespace WebKit {
 
+#if ENABLE(IOS_TOUCH_EVENTS)
+#import <WebKitAdditions/WebPlatformTouchPointIOS.cpp>
+#else
 void WebPlatformTouchPoint::encode(IPC::ArgumentEncoder& encoder) const
 {
@@ -53 +56 @@
     return true;
 }
+#endif // ENABLE(IOS_TOUCH_EVENTS)
 
 } // namespace WebKit