| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index 3846ba5615ad1175a3b9c569599729fa318657bb..8b77931a43b7fa08fca8642eec507e5168ab4c11 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -3637,6 +3637,8 @@ void WebContentsImpl::RenderViewTerminated(RenderViewHost* rvh,
|
| base::TerminationStatus status,
|
| int error_code) {
|
| if (rvh != GetRenderViewHost()) {
|
| + LOG(ERROR) << "WC[" << this << "]::RenderViewTerminated:"
|
| + << " not a match.";
|
| // The pending page's RenderViewHost is gone.
|
| return;
|
| }
|
| @@ -3923,10 +3925,10 @@ void WebContentsImpl::EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) {
|
|
|
| if (source_web_contents) {
|
| if (GetBrowserPluginGuest()) {
|
| - // We create a swapped out RenderView for the embedder in the guest's
|
| + // We create a RenderFrameProxyHost for the embedder in the guest's
|
| // render process but we intentionally do not expose the embedder's
|
| // opener chain to it.
|
| - source_web_contents->CreateSwappedOutRenderView(GetSiteInstance());
|
| + source_web_contents->GetRenderManager()->CreateRenderFrameProxy(GetSiteInstance());
|
| } else {
|
| RenderFrameHostImpl* source_rfhi =
|
| static_cast<RenderFrameHostImpl*>(source_rfh);
|
| @@ -4135,6 +4137,10 @@ bool WebContentsImpl::CreateRenderViewForRenderManager(
|
| bool for_main_frame_navigation) {
|
| TRACE_EVENT0("browser,navigation",
|
| "WebContentsImpl::CreateRenderViewForRenderManager");
|
| +
|
| + LOG(ERROR) << "WC[" << this << "]::CreateRenderFrameForRenderManager: "
|
| + << " rvh:" << render_view_host;
|
| +
|
| // Can be NULL during tests.
|
| RenderWidgetHostViewBase* rwh_view;
|
| // TODO(kenrb): RenderWidgetHostViewChildFrame special casing is temporary
|
|
|