| 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 94e5e16e51eb967e9a5b4766f8644805c3c36e55..b46cdf8493bf83897ded67b86c41bcc247355aba 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_guest.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_guest.cc
|
| @@ -21,6 +21,7 @@
|
| #include "content/browser/compositor/surface_utils.h"
|
| #include "content/browser/frame_host/render_frame_host_impl.h"
|
| #include "content/browser/frame_host/render_frame_proxy_host.h"
|
| +#include "content/browser/frame_host/render_widget_host_view_child_frame.h"
|
| #include "content/browser/frame_host/render_widget_host_view_guest.h"
|
| #include "content/browser/loader/resource_dispatcher_host_impl.h"
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| @@ -749,6 +750,9 @@ void BrowserPluginGuest::OnWillAttachComplete(
|
| // If a RenderView has already been created for this new window, then we need
|
| // to initialize the browser-side state now so that the RenderFrameHostManager
|
| // does not create a new RenderView on navigation.
|
| + // TODO(wjmaclean): this pathway doesn't seem to ever get hit when using
|
| + // cross-process-frames ... should it be removed? Or am I just missing a
|
| + // use case?
|
| if (!use_cross_process_frames && has_render_view_) {
|
| // This will trigger a callback to RenderViewReady after a round-trip IPC.
|
| static_cast<RenderViewHostImpl*>(GetWebContents()->GetRenderViewHost())
|
| @@ -788,8 +792,9 @@ void BrowserPluginGuest::OnDetach(int browser_plugin_instance_id) {
|
| // it's attached again.
|
| attached_ = false;
|
|
|
| - RenderWidgetHostViewGuest* rwhv = static_cast<RenderWidgetHostViewGuest*>(
|
| - web_contents()->GetRenderWidgetHostView());
|
| + RenderWidgetHostViewChildFrame* rwhv =
|
| + static_cast<RenderWidgetHostViewChildFrame*>(
|
| + web_contents()->GetRenderWidgetHostView());
|
| // If the guest is terminated, our host may already be gone.
|
| if (rwhv)
|
| rwhv->UnregisterSurfaceNamespaceId();
|
|
|