| 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..e16d29ea8b0d5fc3041af772c21c477136107d12 100644
|
| --- a/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
|
| +++ b/third_party/WebKit/Source/web/PageWidgetDelegate.cpp
|
| @@ -145,7 +145,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),
|
| + std::vector<const WebInputEvent*>());
|
| return WebInputEventResult::HandledSystem;
|
| case WebInputEvent::MouseLeave:
|
| if (!root || !root->view())
|
| @@ -202,7 +203,8 @@ WebInputEventResult PageWidgetDelegate::handleInputEvent(
|
| if (!root || !root->view())
|
| return WebInputEventResult::NotHandled;
|
| return handler.handleTouchEvent(*root,
|
| - static_cast<const WebTouchEvent&>(event));
|
| + static_cast<const WebTouchEvent&>(event),
|
| + std::vector<const WebInputEvent*>());
|
| case WebInputEvent::GesturePinchBegin:
|
| case WebInputEvent::GesturePinchEnd:
|
| case WebInputEvent::GesturePinchUpdate:
|
| @@ -218,10 +220,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 +256,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
|
|
|