Title: [167893] trunk/Source/WebKit2
- Revision
- 167893
- Author
- simon.fra...@apple.com
- Date
- 2014-04-28 10:38:33 -0700 (Mon, 28 Apr 2014)
Log Message
Fix the iOS buld.
* UIProcess/WebPageProxy.cpp:
(WebKit::areAllTouchPointsReleased):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167892 => 167893)
--- trunk/Source/WebKit2/ChangeLog 2014-04-28 17:28:13 UTC (rev 167892)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-28 17:38:33 UTC (rev 167893)
@@ -1,3 +1,10 @@
+2014-04-28 Simon Fraser <simon.fra...@apple.com>
+
+ Fix the iOS buld.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::areAllTouchPointsReleased):
+
2014-04-24 Simon Fraser <simon.fra...@apple.com>
[iOS WK2] Make subview rebuilding more incremental
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167892 => 167893)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-28 17:28:13 UTC (rev 167892)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-28 17:38:33 UTC (rev 167893)
@@ -1493,18 +1493,15 @@
return true;
}
+#endif
+
+#if ENABLE(IOS_TOUCH_EVENTS)
+
static bool areAllTouchPointsReleased(const WebTouchEvent& event)
{
- for (const auto& touchPoint : event.touchPoints()) {
- if (touchPoint.state() != WebPlatformTouchPoint::TouchReleased && touchPoint.state() != WebPlatformTouchPoint::TouchCancelled)
- return false;
- }
-
- return true;
+ return event.type() == WebEvent::TouchEnd || event.type() != WebEvent::TouchCancel;
}
-#endif
-#if ENABLE(IOS_TOUCH_EVENTS)
void WebPageProxy::handleTouchEventSynchronously(const NativeWebTouchEvent& event)
{
if (!isValid())
@@ -1542,7 +1539,19 @@
if (areAllTouchPointsReleased(event))
m_isTrackingTouchEvents = false;
}
+
#elif ENABLE(TOUCH_EVENTS)
+
+static bool areAllTouchPointsReleased(const WebTouchEvent& event)
+{
+ for (const auto& touchPoint : event.touchPoints()) {
+ if (touchPoint.state() != WebPlatformTouchPoint::TouchReleased && touchPoint.state() != WebPlatformTouchPoint::TouchCancelled)
+ return false;
+ }
+
+ return true;
+}
+
void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
{
if (!isValid())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
