| 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 081ec32cb6fb79d701ad1585ba93848517a47937..f4ff43396e1b12aa5206eff54b43cfa0939d34e4 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 CoalescedWebInputEvent& coalescedEvent,
|
| LocalFrame* root) {
|
| + const WebInputEvent& event = coalescedEvent.event();
|
| if (event.modifiers & WebInputEvent::IsTouchAccessibility &&
|
| WebInputEvent::isMouseEventType(event.type)) {
|
| PlatformMouseEventBuilder pme(root->view(),
|
| @@ -145,7 +146,8 @@ WebInputEventResult PageWidgetDelegate::handleInputEvent(
|
| case WebInputEvent::MouseMove:
|
| if (!root || !root->view())
|
| return WebInputEventResult::HandledSuppressed;
|
| - handler.handleMouseMove(*root, static_cast<const WebMouseEvent&>(event));
|
| + handler.handleMouseMove(*root, static_cast<const WebMouseEvent&>(event),
|
| + coalescedEvent.getCoalescedEventsPointers());
|
| return WebInputEventResult::HandledSystem;
|
| case WebInputEvent::MouseLeave:
|
| if (!root || !root->view())
|
| @@ -201,8 +203,9 @@ WebInputEventResult PageWidgetDelegate::handleInputEvent(
|
| case WebInputEvent::TouchScrollStarted:
|
| if (!root || !root->view())
|
| return WebInputEventResult::NotHandled;
|
| - return handler.handleTouchEvent(*root,
|
| - static_cast<const WebTouchEvent&>(event));
|
| + return handler.handleTouchEvent(
|
| + *root, static_cast<const WebTouchEvent&>(event),
|
| + coalescedEvent.getCoalescedEventsPointers());
|
| case WebInputEvent::GesturePinchBegin:
|
| case WebInputEvent::GesturePinchEnd:
|
| case WebInputEvent::GesturePinchUpdate:
|
| @@ -218,10 +221,13 @@ WebInputEventResult PageWidgetDelegate::handleInputEvent(
|
| // ----------------------------------------------------------------
|
| // Default handlers for PageWidgetEventHandler
|
|
|
| -void PageWidgetEventHandler::handleMouseMove(LocalFrame& mainFrame,
|
| - const WebMouseEvent& event) {
|
| +void PageWidgetEventHandler::handleMouseMove(
|
| + LocalFrame& mainFrame,
|
| + const WebMouseEvent& event,
|
| + const std::vector<const WebInputEvent*>& coalescedEvents) {
|
| mainFrame.eventHandler().handleMouseMoveEvent(
|
| - PlatformMouseEventBuilder(mainFrame.view(), event));
|
| + PlatformMouseEventBuilder(mainFrame.view(), event),
|
| + createPlatformMouseEventVector(mainFrame.view(), coalescedEvents));
|
| }
|
|
|
| void PageWidgetEventHandler::handleMouseLeave(LocalFrame& mainFrame,
|
| @@ -251,9 +257,11 @@ WebInputEventResult PageWidgetEventHandler::handleMouseWheel(
|
|
|
| WebInputEventResult PageWidgetEventHandler::handleTouchEvent(
|
| LocalFrame& mainFrame,
|
| - const WebTouchEvent& event) {
|
| + const WebTouchEvent& event,
|
| + const std::vector<const WebInputEvent*>& coalescedEvents) {
|
| return mainFrame.eventHandler().handleTouchEvent(
|
| - PlatformTouchEventBuilder(mainFrame.view(), event));
|
| + PlatformTouchEventBuilder(mainFrame.view(), event),
|
| + createPlatformTouchEventVector(mainFrame.view(), coalescedEvents));
|
| }
|
|
|
| } // namespace blink
|
|
|