Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1052)

Unified Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 1308273003: Resend unconsumed scroll update from guest back to embedder (WebView Scroll Bubble). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove GestureEventObserver now that we don't forward fling GestureScrollUpdates. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 48491e6c5861af1089e573f46c264eef382ee4e9..7ca6f4a627eeb0e3f153011dea49879ff1816117 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -501,6 +501,18 @@ bool BrowserPlugin::handleInputEvent(const blink::WebInputEvent& event,
if (guest_crashed_ || !attached())
return false;
+ if (event.type == blink::WebInputEvent::MouseWheel) {
+ auto wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
+ if (wheel_event.resendSource == browser_plugin_instance_id_)
+ return false;
+ }
+
+ if (blink::WebInputEvent::isGestureEventType(event.type)) {
+ auto gesture_event = static_cast<const blink::WebGestureEvent&>(event);
+ if (gesture_event.resendSource == browser_plugin_instance_id_)
+ return false;
+ }
+
if (event.type == blink::WebInputEvent::ContextMenu)
return true;
@@ -518,6 +530,12 @@ bool BrowserPlugin::handleInputEvent(const blink::WebInputEvent& event,
view_rect_,
&event));
GetWebKitCursorInfo(cursor_, &cursor_info);
+
+ // Although we forward this event to the guest, we don't report it as consumed
+ // since other targets of this event in Blink never get that chance either.
+ if (event.type == blink::WebInputEvent::GestureFlingStart)
+ return false;
+
return true;
}

Powered by Google App Engine
This is Rietveld 408576698