Title: [111806] trunk/Source/WebKit/chromium
- Revision
- 111806
- Author
- [email protected]
- Date
- 2012-03-22 18:54:09 -0700 (Thu, 22 Mar 2012)
Log Message
[chromium] Halt in progress flings on receipt of key events
https://bugs.webkit.org/show_bug.cgi?id=81988
Patch by Robert Kroeger <[email protected]> on 2012-03-22
Reviewed by Adrienne Walker.
* src/WebCompositorInputHandlerImpl.cpp:
(WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::keyEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (111805 => 111806)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-23 01:51:35 UTC (rev 111805)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-23 01:54:09 UTC (rev 111806)
@@ -1,3 +1,15 @@
+2012-03-22 Robert Kroeger <[email protected]>
+
+ [chromium] Halt in progress flings on receipt of key events
+ https://bugs.webkit.org/show_bug.cgi?id=81988
+
+ Reviewed by Adrienne Walker.
+
+ * src/WebCompositorInputHandlerImpl.cpp:
+ (WebKit::WebCompositorInputHandlerImpl::handleInputEventInternal):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::keyEvent):
+
2012-03-22 Dana Jansens <[email protected]>
[chromium] Skip frames when checkerboarding an animation
Modified: trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (111805 => 111806)
--- trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-23 01:51:35 UTC (rev 111805)
+++ trunk/Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp 2012-03-23 01:54:09 UTC (rev 111806)
@@ -248,6 +248,8 @@
} else if (event.type == WebInputEvent::GestureFlingCancel) {
if (cancelCurrentFling())
return DidHandle;
+ } else if (WebInputEvent::isKeyboardEventType(event.type)) {
+ cancelCurrentFling();
}
return DidNotHandle;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (111805 => 111806)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-23 01:51:35 UTC (rev 111805)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-23 01:54:09 UTC (rev 111806)
@@ -690,6 +690,10 @@
|| (event.type == WebInputEvent::KeyDown)
|| (event.type == WebInputEvent::KeyUp));
+ // Halt an in-progress fling on a key event.
+ if (m_gestureAnimation)
+ m_gestureAnimation.clear();
+
// Please refer to the comments explaining the m_suppressNextKeypressEvent
// member.
// The m_suppressNextKeypressEvent is set if the KeyDown is handled by
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
