Diff
Modified: tags/Safari-601.1.38/Source/WebKit2/ChangeLog (186169 => 186170)
--- tags/Safari-601.1.38/Source/WebKit2/ChangeLog 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/ChangeLog 2015-07-01 06:18:38 UTC (rev 186170)
@@ -1,3 +1,7 @@
+2015-06-30 Babak Shafiei <[email protected]>
+
+ Roll out r186148.
+
2015-06-30 Simon Fraser <[email protected]>
Fix CoordinatedGraphics.
Modified: tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (186169 => 186170)
--- tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-01 06:18:38 UTC (rev 186170)
@@ -586,10 +586,6 @@
struct _UIWebTouchPoint* touchPoints;
unsigned touchPointCount;
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
- bool isPotentialTap;
-#endif
};
@protocol UIWebTouchEventsGestureRecognizerDelegate
Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h (186169 => 186170)
--- tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h 2015-07-01 06:18:38 UTC (rev 186170)
@@ -325,12 +325,11 @@
class WebTouchEvent : public WebEvent {
public:
WebTouchEvent() { }
- WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector<WebPlatformTouchPoint>& touchPoints, WebCore::IntPoint position, bool isPotentialTap, bool isGesture, float gestureScale, float gestureRotation)
+ WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector<WebPlatformTouchPoint>& touchPoints, WebCore::IntPoint position, 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)
, m_gestureRotation(gestureRotation)
@@ -342,8 +341,6 @@
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; }
float gestureRotation() const { return m_gestureRotation; }
@@ -361,7 +358,6 @@
WebCore::IntPoint m_position;
bool m_canPreventNativeGestures;
- bool m_isPotentialTap;
bool m_isGesture;
float m_gestureScale;
float m_gestureRotation;
Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp (186169 => 186170)
--- tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp 2015-07-01 06:18:38 UTC (rev 186170)
@@ -332,7 +332,6 @@
m_gestureRotation = webEvent.gestureRotation();
m_canPreventNativeGestures = webEvent.canPreventNativeGestures();
m_isGesture = webEvent.isGesture();
- m_isPotentialTap = webEvent.isPotentialTap();
m_position = webEvent.position();
m_globalPosition = webEvent.position();
#else
Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (186169 => 186170)
--- tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-07-01 06:18:38 UTC (rev 186170)
@@ -96,20 +96,7 @@
#endif
NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
- : 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)
+ : WebTouchEvent(webEventTypeForUIWebTouchEventType(event->type), static_cast<Modifiers>(0), event->timestamp, extractWebTouchPoint(event), positionForCGPoint(event->locationInDocumentCoordinates), event->inJavaScriptGesture, event->scale, event->rotation)
{
}
Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp (186169 => 186170)
--- tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2015-07-01 06:18:38 UTC (rev 186170)
@@ -41,7 +41,6 @@
encoder << m_touchPoints;
encoder << m_position;
encoder << m_canPreventNativeGestures;
- encoder << m_isPotentialTap;
encoder << m_isGesture;
encoder << m_gestureScale;
encoder << m_gestureRotation;
@@ -58,8 +57,6 @@
return false;
if (!decoder.decode(result.m_canPreventNativeGestures))
return false;
- if (!decoder.decode(result.m_isPotentialTap))
- return false;
if (!decoder.decode(result.m_isGesture))
return false;
if (!decoder.decode(result.m_gestureScale))
