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

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

Issue 2479123003: WIP Add getCoalescedEvents API using vector of WebInputEvents (Closed)
Patch Set: Created 4 years, 1 month 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 9faff29cc1d9fd8146e0e7018a8816800c5b7f8c..1ca296aca5ee74a0688561c281f0eb2d86cb3285 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -982,7 +982,7 @@ WebInputEventResult WebViewImpl::handleSyntheticWheelFromTouchpadPinchEvent(
wheelEvent.wheelTicksX = 0;
wheelEvent.wheelTicksY = pinchEvent.data.pinchUpdate.scale > 1 ? 1 : -1;
- return handleInputEvent(wheelEvent);
+ return handleInputEvent(wheelEvent, std::vector<const WebInputEvent*>());
}
void WebViewImpl::transferActiveWheelFlingAnimation(
@@ -2107,7 +2107,8 @@ bool WebViewImpl::hasVerticalScrollbar() {
const WebInputEvent* WebViewImpl::m_currentInputEvent = nullptr;
WebInputEventResult WebViewImpl::handleInputEvent(
- const WebInputEvent& inputEvent) {
+ const WebInputEvent& inputEvent,
+ const std::vector<const WebInputEvent*>& webCoalescedEvents) {
// 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.
@@ -2141,7 +2142,7 @@ WebInputEventResult WebViewImpl::handleInputEvent(
return WebInputEventResult::HandledSuppressed;
if (InspectorOverlay* overlay = inspectorOverlay()) {
- if (overlay->handleInputEvent(inputEvent))
+ if (overlay->handleInputEvent(inputEvent, webCoalescedEvents))
return WebInputEventResult::HandledSuppressed;
}
@@ -2210,7 +2211,7 @@ WebInputEventResult WebViewImpl::handleInputEvent(
// FIXME: This should take in the intended frame, not the local frame root.
WebInputEventResult result = PageWidgetDelegate::handleInputEvent(
- *this, inputEvent, mainFrameImpl()->frame());
+ *this, inputEvent, webCoalescedEvents, mainFrameImpl()->frame());
if (result != WebInputEventResult::NotHandled)
return result;

Powered by Google App Engine
This is Rietveld 408576698