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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.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: Don't require GestureScrollBegin for touch-pad GestureFlingStart. 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/browser/browser_plugin/browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index bb41b7e34347d8c758b9070b78dae2314bf9bcc9..00529ffab22904afb2517c11d4d8eac2b82d20e6 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -459,6 +459,37 @@ bool BrowserPluginGuest::StopFinding(StopFindAction action) {
return delegate_->StopFinding(action);
}
+void BrowserPluginGuest::ResendEventToEmbedder(
+ const blink::WebInputEvent& event) {
+ if (!attached() || !owner_web_contents_)
+ return;
+
+ DCHECK(browser_plugin_instance_id_);
+ RenderWidgetHostImpl* host =
+ embedder_web_contents()->GetMainFrame()->GetRenderWidgetHost();
+
+ gfx::Vector2d offset_from_embedder = guest_window_rect_.OffsetFromOrigin();
+ if (event.type == blink::WebInputEvent::GestureScrollUpdate) {
+ blink::WebGestureEvent resent_gesture_event;
+ memcpy(&resent_gesture_event, &event, sizeof(blink::WebGestureEvent));
+ resent_gesture_event.x += offset_from_embedder.x();
+ resent_gesture_event.y += offset_from_embedder.y();
+ // Mark the resend source with the browser plugin's instance id, so the
+ // correct browser_plugin will know to ignore the event.
+ resent_gesture_event.resendingPluginId = browser_plugin_instance_id_;
+ host->ForwardGestureEvent(resent_gesture_event);
+ } else if (event.type == blink::WebInputEvent::MouseWheel) {
+ blink::WebMouseWheelEvent resent_wheel_event;
+ memcpy(&resent_wheel_event, &event, sizeof(blink::WebMouseWheelEvent));
+ resent_wheel_event.x += offset_from_embedder.x();
+ resent_wheel_event.y += offset_from_embedder.y();
+ resent_wheel_event.resendingPluginId = browser_plugin_instance_id_;
+ host->ForwardWheelEvent(resent_wheel_event);
+ } else {
+ NOTIMPLEMENTED();
+ }
+}
+
WebContentsImpl* BrowserPluginGuest::GetWebContents() const {
return static_cast<WebContentsImpl*>(web_contents());
}
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | content/browser/frame_host/render_widget_host_view_guest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698