Changeset 163526 in webkit

Timestamp:

Feb 6, 2014 1:01:29 AM (10 years ago)

Author:

Csaba Osztrogonác

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-06  Csaba Osztrogonác  <ossy@webkit.org>
+
+        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  <barraclough@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1374 +1374 @@
 
 #if ENABLE(TOUCH_EVENTS)
+#if ENABLE(ASYNC_SCROLLING)
 static bool anyTouchIsInNonFastScrollableRegion(RemoteScrollingCoordinatorProxy& scrollingCoordinator, const WebTouchEvent& event)
 {
@@ -1383 +1384 @@
     return false;
 }
+#endif // ENABLE(ASYNC_SCROLLING)
 
 void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
@@ -1393 +1395 @@
     // 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);
@@ -1417 +1422 @@
     }
 }
-#endif
+#endif // ENABLE(TOUCH_EVENTS)
 
 void WebPageProxy::scrollBy(ScrollDirection direction, ScrollGranularity granularity)