Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2621303004: Keep track of coalesced events in main thread event queue (Closed)
Patch Set: Rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index ab8025e66cc5816381fc962a8e66a62a0439bf61..5aefab4a47c2325a1980e994e7dad4e50bb1b936 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -961,7 +961,7 @@ WebInputEventResult WebViewImpl::handleSyntheticWheelFromTouchpadPinchEvent(
wheelEvent.wheelTicksX = 0;
wheelEvent.wheelTicksY = pinchEvent.data.pinchUpdate.scale > 1 ? 1 : -1;
- return handleInputEvent(wheelEvent);
+ return handleInputEvent(blink::WebCoalescedInputEvent(wheelEvent));
}
void WebViewImpl::transferActiveWheelFlingAnimation(
@@ -2104,7 +2104,8 @@ bool WebViewImpl::hasVerticalScrollbar() {
const WebInputEvent* WebViewImpl::m_currentInputEvent = nullptr;
WebInputEventResult WebViewImpl::handleInputEvent(
- const WebInputEvent& inputEvent) {
+ const WebCoalescedInputEvent& coalescedEvent) {
+ const WebInputEvent& inputEvent = coalescedEvent.event();
// TODO(dcheng): The fact that this is getting called when there is no local
// main frame is problematic and probably indicates a bug in the input event
// routing code.
@@ -2208,7 +2209,7 @@ WebInputEventResult WebViewImpl::handleInputEvent(
// FIXME: This should take in the intended frame, not the local frame root.
WebInputEventResult result = PageWidgetDelegate::handleInputEvent(
- *this, WebCoalescedInputEvent(inputEvent), mainFrameImpl()->frame());
+ *this, coalescedEvent, mainFrameImpl()->frame());
if (result != WebInputEventResult::NotHandled)
return result;
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698