| Index: content/renderer/browser_plugin/browser_plugin.cc
|
| diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
|
| index 248b36b1b203f00cdf854ae0652388790a3a634f..15df3bb18a7d65232f62fb8f43e1ce311649a219 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin.cc
|
| @@ -28,8 +28,8 @@
|
| #include "content/renderer/drop_data_builder.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "content/renderer/sad_plugin.h"
|
| +#include "third_party/WebKit/public/platform/CoalescedWebInputEvent.h"
|
| #include "third_party/WebKit/public/platform/WebGestureEvent.h"
|
| -#include "third_party/WebKit/public/platform/WebInputEvent.h"
|
| #include "third_party/WebKit/public/platform/WebRect.h"
|
| #include "third_party/WebKit/public/web/WebAXObject.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| @@ -439,11 +439,13 @@ void BrowserPlugin::updateVisibility(bool visible) {
|
| }
|
|
|
| blink::WebInputEventResult BrowserPlugin::handleInputEvent(
|
| - const blink::WebInputEvent& event,
|
| + const blink::CoalescedWebInputEvent& coalescedEvent,
|
| blink::WebCursorInfo& cursor_info) {
|
| if (guest_crashed_ || !attached())
|
| return blink::WebInputEventResult::NotHandled;
|
|
|
| + const blink::WebInputEvent& event = coalescedEvent.event();
|
| +
|
| DCHECK(!blink::WebInputEvent::isTouchEventType(event.type));
|
|
|
| if (event.type == blink::WebInputEvent::MouseWheel) {
|
|
|