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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 2023453003: Make RenderFrameHostImpl::GetRenderWidgetHost() always return an object (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing creis' comments Created 4 years, 7 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 9bd0df203d2d3eb192f6d516d5d3ddb9446c70ab..acf820c80884aacda3de034fa8429048a29fde94 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -440,8 +440,8 @@ void BrowserPluginGuest::ResendEventToEmbedder(
return;
DCHECK(browser_plugin_instance_id_);
- RenderWidgetHostImpl* host =
- embedder_web_contents()->GetMainFrame()->GetRenderWidgetHost();
+ RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
+ embedder_web_contents()->GetMainFrame()->GetView());
gfx::Vector2d offset_from_embedder = guest_window_rect_.OffsetFromOrigin();
if (event.type == blink::WebInputEvent::GestureScrollUpdate) {
@@ -452,14 +452,14 @@ void BrowserPluginGuest::ResendEventToEmbedder(
// 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);
+ view->ProcessGestureEvent(resent_gesture_event, ui::LatencyInfo());
} 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);
+ view->ProcessMouseWheelEvent(resent_wheel_event);
} else {
NOTIMPLEMENTED();
}

Powered by Google App Engine
This is Rietveld 408576698