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

Side by Side Diff: content/common/site_isolation_policy.cc

Issue 1199313006: Disable support for swapped out RenderFrame(Host) on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on ToT. Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/site_isolation_policy.h" 5 #include "content/common/site_isolation_policy.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 // static 66 // static
67 bool SiteIsolationPolicy::UseSubframeNavigationEntries() { 67 bool SiteIsolationPolicy::UseSubframeNavigationEntries() {
68 // Enable the new navigation history behavior if any manner of site isolation 68 // Enable the new navigation history behavior if any manner of site isolation
69 // is active. 69 // is active.
70 return AreCrossProcessFramesPossible(); 70 return AreCrossProcessFramesPossible();
71 } 71 }
72 72
73 // static 73 // static
74 bool SiteIsolationPolicy::IsSwappedOutStateForbidden() { 74 bool SiteIsolationPolicy::IsSwappedOutStateForbidden() {
75 // TODO(nasko): Fix Android issues and remove this ifdef.
76 #if defined(OS_ANDROID)
75 return AreCrossProcessFramesPossible(); 77 return AreCrossProcessFramesPossible();
78 #else
79 return true;
80 #endif
76 } 81 }
77 82
78 // static 83 // static
79 bool SiteIsolationPolicy::IsolateAllSitesForTesting() { 84 bool SiteIsolationPolicy::IsolateAllSitesForTesting() {
80 // TODO(nick): Re-enable once https://crbug.com/133403 is fixed. 85 // TODO(nick): Re-enable once https://crbug.com/133403 is fixed.
81 // if (!(g_site_isolation_whitelist == nullptr)) return false; 86 // if (!(g_site_isolation_whitelist == nullptr)) return false;
82 base::CommandLine::ForCurrentProcess()->AppendSwitch( 87 base::CommandLine::ForCurrentProcess()->AppendSwitch(
83 switches::kSitePerProcess); 88 switches::kSitePerProcess);
84 return true; 89 return true;
85 } 90 }
86 91
87 } // namespace content 92 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698