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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1785153005: Remove SiteIsolationPolicy::IsSwappedOutStateForbidden(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/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 17e4875da9c03244cd432c0eb68f07a05241f8d9..8500eb131664a65e480d37b8a38768e423a3ace1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4343,15 +4343,11 @@ void WebContentsImpl::EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) {
}
if (this != source_web_contents && GetBrowserPluginGuest()) {
- // 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());
- }
+ // 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->GetRenderManager()->CreateRenderFrameProxy(
+ GetSiteInstance());
} else {
RenderFrameHostImpl* source_rfhi =
static_cast<RenderFrameHostImpl*>(source_rfh);
@@ -4374,13 +4370,7 @@ bool WebContentsImpl::AddMessageToConsole(int32_t level,
int WebContentsImpl::CreateSwappedOutRenderView(
Charlie Reis 2016/03/11 21:56:56 Looks like there's no remaining callers of this?
nasko 2016/03/11 22:35:33 Thanks for catching this! Added to the list of thi
SiteInstance* instance) {
int render_view_routing_id = MSG_ROUTING_NONE;
- if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) {
- GetRenderManager()->CreateRenderFrameProxy(instance);
- } else {
- GetRenderManager()->CreateRenderFrame(
- instance, CREATE_RF_SWAPPED_OUT | CREATE_RF_HIDDEN,
- &render_view_routing_id);
- }
+ GetRenderManager()->CreateRenderFrameProxy(instance);
return render_view_routing_id;
}

Powered by Google App Engine
This is Rietveld 408576698