Index: content/renderer/pepper/pepper_plugin_instance_impl.cc |
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
index d2e21155e1e718b1ba0dd1f6a85ce59cf672b171..bddc0aa5007dde1f22ee2316c2b00f8b5d6af86c 100644 |
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc |
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
@@ -97,6 +97,7 @@ |
#include "printing/features/features.h" |
#include "skia/ext/platform_canvas.h" |
#include "third_party/WebKit/public/platform/URLConversion.h" |
+#include "third_party/WebKit/public/platform/WebCoalescedInputEvent.h" |
#include "third_party/WebKit/public/platform/WebCursorInfo.h" |
#include "third_party/WebKit/public/platform/WebFloatRect.h" |
#include "third_party/WebKit/public/platform/WebInputEvent.h" |
@@ -1115,6 +1116,22 @@ gfx::Rect PepperPluginInstanceImpl::GetCaretBounds() const { |
return caret; |
} |
+bool PepperPluginInstanceImpl::HandleCoalescedInputEvent( |
+ const blink::WebCoalescedInputEvent& event, |
+ WebCursorInfo* cursor_info) { |
+ if (blink::WebInputEvent::IsTouchEventType(event.Event().GetType()) && |
+ ((filtered_input_event_mask_ & PP_INPUTEVENT_CLASS_COALESCED_TOUCH) || |
+ (input_event_mask_ & PP_INPUTEVENT_CLASS_COALESCED_TOUCH))) { |
+ bool result = false; |
+ for (size_t i = 0; i < event.CoalescedEventSize(); ++i) { |
+ result |= HandleInputEvent(event.CoalescedEvent(i), cursor_info); |
+ } |
+ return result; |
+ } else { |
+ return HandleInputEvent(event.Event(), cursor_info); |
+ } |
+} |
+ |
bool PepperPluginInstanceImpl::HandleInputEvent( |
const blink::WebInputEvent& event, |
WebCursorInfo* cursor_info) { |