Prepare browser plugin code for swapped out removal.
When swapped out state is removed, there will be no longer creation of
swapped out RenderViews, which browser plugin relies on. This CL makes
the codepath conditional on the IsSwappedOutStateForbidden() result and
makes the switch away from swapped out much cleaner.
BUG=357747
Review URL: https://codereview.chromium.org/1299323003
Cr-Commit-Position: refs/heads/master@{#344528}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index fb770ca..f7505af8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4136,10 +4136,15 @@
}
if (GetBrowserPluginGuest()) {
- // We create a swapped out RenderView 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());
+ // We create a swapped out RenderView or RenderFrameProxyHost for the
+ // embedder in the guest's render process but we intentionally do not
+ // expose the embedder's opener chain to it.
+ if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) {
+ source_web_contents->GetRenderManager()->CreateRenderFrameProxy(
+ GetSiteInstance());
+ } else {
+ source_web_contents->CreateSwappedOutRenderView(GetSiteInstance());
+ }
} else {
RenderFrameHostImpl* source_rfhi =
static_cast<RenderFrameHostImpl*>(source_rfh);
