| Index: third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| index 99e6289e54bbce2a714e96c539ca762e1345ea33..b99d5d149b8262a5c0cb681f5625a50a3f8c330d 100644
|
| --- a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| @@ -718,7 +718,9 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event) {
|
| focusPlugin();
|
|
|
| WebCursorInfo cursorInfo;
|
| - if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
|
| + // TODO(nzolghadr): We need to plumb the coalesced event here.
|
| + if (m_webPlugin->handleInputEvent(
|
| + webEvent, std::vector<const WebInputEvent*>(), cursorInfo) !=
|
| WebInputEventResult::NotHandled)
|
| event->setDefaultHandled();
|
|
|
| @@ -768,7 +770,8 @@ void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event) {
|
| return;
|
|
|
| WebCursorInfo cursorInfo;
|
| - if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
|
| + if (m_webPlugin->handleInputEvent(
|
| + webEvent, std::vector<const WebInputEvent*>(), cursorInfo) !=
|
| WebInputEventResult::NotHandled)
|
| event->setDefaultHandled();
|
| }
|
| @@ -816,7 +819,8 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event) {
|
| webFrame->client()->handleCurrentKeyboardEvent();
|
|
|
| WebCursorInfo cursorInfo;
|
| - if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
|
| + if (m_webPlugin->handleInputEvent(
|
| + webEvent, std::vector<const WebInputEvent*>(), cursorInfo) !=
|
| WebInputEventResult::NotHandled)
|
| event->setDefaultHandled();
|
| }
|
| @@ -835,7 +839,9 @@ void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event) {
|
| focusPlugin();
|
|
|
| WebCursorInfo cursorInfo;
|
| - if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
|
| + // TODO(nzolghadr): We need to plumb the coalesced event here.
|
| + if (m_webPlugin->handleInputEvent(
|
| + webEvent, std::vector<const WebInputEvent*>(), cursorInfo) !=
|
| WebInputEventResult::NotHandled)
|
| event->setDefaultHandled();
|
| // FIXME: Can a plugin change the cursor from a touch-event callback?
|
| @@ -855,7 +861,8 @@ void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event) {
|
| if (event->type() == EventTypeNames::gesturetapdown)
|
| focusPlugin();
|
| WebCursorInfo cursorInfo;
|
| - if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
|
| + if (m_webPlugin->handleInputEvent(
|
| + webEvent, std::vector<const WebInputEvent*>(), cursorInfo) !=
|
| WebInputEventResult::NotHandled) {
|
| event->setDefaultHandled();
|
| return;
|
| @@ -871,7 +878,8 @@ void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event) {
|
| return;
|
|
|
| WebCursorInfo cursorInfo;
|
| - if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
|
| + if (m_webPlugin->handleInputEvent(
|
| + webEvent, std::vector<const WebInputEvent*>(), cursorInfo) !=
|
| WebInputEventResult::NotHandled)
|
| event->setDefaultHandled();
|
| }
|
|
|