Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184281 => 184282)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 07:21:39 UTC (rev 184281)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 08:26:55 UTC (rev 184282)
@@ -1,5 +1,24 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r184028.
+
+ 2015-05-08 Beth Dakin <[email protected]>
+
+ 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-13 Babak Shafiei <[email protected]>
+
Merge r184241.
2015-05-12 Jon Honeycutt <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/NativeWebTouchEvent.h (184281 => 184282)
--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/NativeWebTouchEvent.h 2015-05-13 07:21:39 UTC (rev 184281)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/NativeWebTouchEvent.h 2015-05-13 08:26:55 UTC (rev 184282)
@@ -56,6 +56,10 @@
#endif
private:
+#if PLATFORM(IOS)
+ Vector<WebPlatformTouchPoint> extractWebTouchPoint(const _UIWebTouchEvent*);
+#endif
+
#if PLATFORM(GTK)
GUniquePtr<GdkEvent> m_nativeEvent;
#elif PLATFORM(EFL)
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebEvent.h (184281 => 184282)
--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebEvent.h 2015-05-13 07:21:39 UTC (rev 184281)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebEvent.h 2015-05-13 08:26:55 UTC (rev 184282)
@@ -299,6 +299,10 @@
TouchPointState phase() const { return static_cast<TouchPointState>(m_phase); }
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&);
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebEventConversion.cpp (184281 => 184282)
--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebEventConversion.cpp 2015-05-13 07:21:39 UTC (rev 184281)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/WebEventConversion.cpp 2015-05-13 08:26:55 UTC (rev 184282)
@@ -238,6 +238,9 @@
}
}
+#if ENABLE(IOS_TOUCH_EVENTS)
+#include <WebKitAdditions/WebEventConversionIOS.cpp>
+#else
class WebKit2PlatformTouchPoint : public WebCore::PlatformTouchPoint {
public:
WebKit2PlatformTouchPoint(const WebPlatformTouchPoint& webTouchPoint)
@@ -245,6 +248,8 @@
{
}
};
+#endif // ENABLE(IOS_TOUCH_EVENTS)
+
#else
class WebKit2PlatformTouchPoint : public WebCore::PlatformTouchPoint {
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (184281 => 184282)
--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-05-13 07:21:39 UTC (rev 184281)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-05-13 08:26:55 UTC (rev 184282)
@@ -75,7 +75,10 @@
return WebCore::IntPoint(position);
}
-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;
@@ -90,6 +93,7 @@
}
return touchPointList;
}
+#endif
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)
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp (184281 => 184282)
--- branches/safari-601.1.32-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2015-05-13 07:21:39 UTC (rev 184281)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2015-05-13 08:26:55 UTC (rev 184282)
@@ -35,6 +35,9 @@
namespace WebKit {
+#if ENABLE(IOS_TOUCH_EVENTS)
+#import <WebKitAdditions/WebPlatformTouchPointIOS.cpp>
+#else
void WebPlatformTouchPoint::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << m_identifier;
@@ -52,6 +55,7 @@
return false;
return true;
}
+#endif // ENABLE(IOS_TOUCH_EVENTS)
} // namespace WebKit
