Title: [163526] trunk/Source/WebKit2
- Revision
- 163526
- Author
- [email protected]
- Date
- 2014-02-06 01:01:29 -0800 (Thu, 06 Feb 2014)
Log Message
Fix the build after r163516 for !ENABLE(ASYNC_SCROLLING) platforms
https://bugs.webkit.org/show_bug.cgi?id=128299
Reviewed by Antti Koivisto.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::handleTouchEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163525 => 163526)
--- trunk/Source/WebKit2/ChangeLog 2014-02-06 08:38:24 UTC (rev 163525)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-06 09:01:29 UTC (rev 163526)
@@ -1,3 +1,13 @@
+2014-02-06 Csaba Osztrogonác <[email protected]>
+
+ Fix the build after r163516 for !ENABLE(ASYNC_SCROLLING) platforms
+ https://bugs.webkit.org/show_bug.cgi?id=128299
+
+ Reviewed by Antti Koivisto.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::handleTouchEvent):
+
2014-02-05 Gavin Barraclough <[email protected]>
Change Page, FocusController to use ViewState
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163525 => 163526)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-06 08:38:24 UTC (rev 163525)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-06 09:01:29 UTC (rev 163526)
@@ -1373,6 +1373,7 @@
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(ASYNC_SCROLLING)
static bool anyTouchIsInNonFastScrollableRegion(RemoteScrollingCoordinatorProxy& scrollingCoordinator, const WebTouchEvent& event)
{
for (auto touchPoint : event.touchPoints()) {
@@ -1382,6 +1383,7 @@
return false;
}
+#endif // ENABLE(ASYNC_SCROLLING)
void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
{
@@ -1392,9 +1394,12 @@
// and animation on the page itself (kinetic scrolling, tap to zoom) etc, then
// we do not send any of the events to the page even if is has listeners.
if (!m_isPageSuspended) {
+
+#if ENABLE(ASYNC_SCROLLING)
// FIXME: we should only do this check for the start of a touch gesture.
if (!anyTouchIsInNonFastScrollableRegion(*m_scrollingCoordinatorProxy, event))
return;
+#endif
m_touchEventQueue.append(event);
m_process->responsivenessTimer()->start();
@@ -1416,7 +1421,7 @@
}
}
}
-#endif
+#endif // ENABLE(TOUCH_EVENTS)
void WebPageProxy::scrollBy(ScrollDirection direction, ScrollGranularity granularity)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
