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

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

Issue 2576013002: Introducing WebCoalescedInputEvent and inclusion in content/common (Closed)
Patch Set: Fix a few DCHECK hits 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/PageWidgetDelegate.cpp
diff --git a/third_party/WebKit/Source/web/PageWidgetDelegate.cpp b/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
index e16d29ea8b0d5fc3041af772c21c477136107d12..c22f795e939c632523afa752720a8375e59a0241 100644
--- a/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
+++ b/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
@@ -114,8 +114,9 @@ void PageWidgetDelegate::paintIgnoringCompositing(Page& page,
WebInputEventResult PageWidgetDelegate::handleInputEvent(
PageWidgetEventHandler& handler,
- const WebInputEvent& event,
+ const WebCoalescedInputEvent& coalescedEvent,
LocalFrame* root) {
+ const WebInputEvent& event = coalescedEvent.event();
if (event.modifiers & WebInputEvent::IsTouchAccessibility &&
WebInputEvent::isMouseEventType(event.type)) {
PlatformMouseEventBuilder pme(root->view(),
@@ -146,7 +147,7 @@ WebInputEventResult PageWidgetDelegate::handleInputEvent(
if (!root || !root->view())
return WebInputEventResult::HandledSuppressed;
handler.handleMouseMove(*root, static_cast<const WebMouseEvent&>(event),
- std::vector<const WebInputEvent*>());
+ coalescedEvent.getCoalescedEventsPointers());
return WebInputEventResult::HandledSystem;
case WebInputEvent::MouseLeave:
if (!root || !root->view())
@@ -202,9 +203,9 @@ WebInputEventResult PageWidgetDelegate::handleInputEvent(
case WebInputEvent::TouchScrollStarted:
if (!root || !root->view())
return WebInputEventResult::NotHandled;
- return handler.handleTouchEvent(*root,
- static_cast<const WebTouchEvent&>(event),
- std::vector<const WebInputEvent*>());
+ return handler.handleTouchEvent(
+ *root, static_cast<const WebTouchEvent&>(event),
+ coalescedEvent.getCoalescedEventsPointers());
case WebInputEvent::GesturePinchBegin:
case WebInputEvent::GesturePinchEnd:
case WebInputEvent::GesturePinchUpdate:

Powered by Google App Engine
This is Rietveld 408576698