Title: [112127] trunk/Source
- Revision
- 112127
- Author
- [email protected]
- Date
- 2012-03-26 10:52:44 -0700 (Mon, 26 Mar 2012)
Log Message
[chromium] Change handleGestureFling() to use CCInputHandlerClient::Wheel.
https://bugs.webkit.org/show_bug.cgi?id=82133
Reviewed by James Robinson.
Source/WebCore:
Covered by existing unit tests.
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::scrollBegin):
Source/WebKit/chromium:
* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
* tests/CCLayerTreeHostImplTest.cpp:
(WebKitTests::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112126 => 112127)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 17:48:45 UTC (rev 112126)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 17:52:44 UTC (rev 112127)
@@ -1,3 +1,15 @@
+2012-03-26 W. James MacLean <[email protected]>
+
+ [chromium] Change handleGestureFling() to use CCInputHandlerClient::Wheel.
+ https://bugs.webkit.org/show_bug.cgi?id=82133
+
+ Reviewed by James Robinson.
+
+ Covered by existing unit tests.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::scrollBegin):
+
2012-03-26 Mike Lawther <[email protected]>
CSS3 calc: mixed percent/absolute for box-reflect
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (112126 => 112127)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-03-26 17:48:45 UTC (rev 112126)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-03-26 17:52:44 UTC (rev 112127)
@@ -619,7 +619,7 @@
return ScrollFailed;
}
- if ((type == CCInputHandlerClient::Wheel || type == CCInputHandlerClient::Gesture) && m_scrollLayerImpl->haveWheelEventHandlers()) {
+ if (type == CCInputHandlerClient::Wheel && m_scrollLayerImpl->haveWheelEventHandlers()) {
TRACE_EVENT("scrollBegin Failed wheelEventHandlers", this, 0);
return ScrollFailed;
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (112126 => 112127)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-26 17:48:45 UTC (rev 112126)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-26 17:52:44 UTC (rev 112127)
@@ -1,3 +1,15 @@
+2012-03-26 W. James MacLean <[email protected]>
+
+ [chromium] Change handleGestureFling() to use CCInputHandlerClient::Wheel.
+ https://bugs.webkit.org/show_bug.cgi?id=82133
+
+ Reviewed by James Robinson.
+
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
+ * tests/CCLayerTreeHostImplTest.cpp:
+ (WebKitTests::TEST_F):
+
2012-03-26 Terry Anderson <[email protected]>
[chromium] Allow the viewport meta tag to be disabled for testing purposes
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (112126 => 112127)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-26 17:48:45 UTC (rev 112126)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-26 17:52:44 UTC (rev 112127)
@@ -262,7 +262,7 @@
WebCompositorInputHandlerImpl::EventDisposition WebCompositorInputHandlerImpl::handleGestureFling(const WebGestureEvent& gestureEvent)
{
- CCInputHandlerClient::ScrollStatus scrollStatus = m_inputHandlerClient->scrollBegin(IntPoint(gestureEvent.x, gestureEvent.y), CCInputHandlerClient::Gesture);
+ CCInputHandlerClient::ScrollStatus scrollStatus = m_inputHandlerClient->scrollBegin(IntPoint(gestureEvent.x, gestureEvent.y), CCInputHandlerClient::Wheel);
switch (scrollStatus) {
case CCInputHandlerClient::ScrollStarted: {
TRACE_EVENT_INSTANT0("cc", "WebCompositorInputHandlerImpl::handleGestureFling::started");
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (112126 => 112127)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-03-26 17:48:45 UTC (rev 112126)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2012-03-26 17:52:44 UTC (rev 112127)
@@ -203,9 +203,11 @@
CCLayerImpl* root = m_hostImpl->rootLayer();
root->setHaveWheelEventHandlers(true);
- // With registered event handlers, wheel and gesture scrolls have to go to the main thread.
+ // With registered event handlers, wheel scrolls have to go to the main thread.
EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollFailed);
- EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Gesture), CCInputHandlerClient::ScrollFailed);
+
+ // But gesture scrolls can still be handled.
+ EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Gesture), CCInputHandlerClient::ScrollStarted);
}
TEST_F(CCLayerTreeHostImplTest, shouldScrollOnMainThread)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
