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

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

Issue 2942903002: Remove AreCrossProcessFramesPossible on Android (Closed)
Patch Set: Comment removed. Created 3 years, 6 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/feature_list.h" 8 #include "base/feature_list.h"
alexmos 2017/06/19 16:45:48 Might as well remove this and the next two headers
kenrb 2017/06/26 16:19:01 We still need feature_list.h and content_features.
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/common/content_features.h" 10 #include "content/public/common/content_features.h"
11 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 // static 15 // static
16 bool SiteIsolationPolicy::AreCrossProcessFramesPossible() { 16 bool SiteIsolationPolicy::AreCrossProcessFramesPossible() {
17 // Before turning this on for Android, input event routing needs to be
18 // completed there, and perf regressions in https://crbug.com/690229 need to be
19 // investigated.
20 #if defined(OS_ANDROID)
21 return UseDedicatedProcessesForAllSites() ||
22 IsTopDocumentIsolationEnabled() || AreIsolatedOriginsEnabled() ||
23 GetContentClient()->IsSupplementarySiteIsolationModeEnabled() ||
24 base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames);
25 #else
26 return true; 17 return true;
27 #endif
28 } 18 }
29 19
30 // static 20 // static
31 bool SiteIsolationPolicy::UseDedicatedProcessesForAllSites() { 21 bool SiteIsolationPolicy::UseDedicatedProcessesForAllSites() {
32 return base::CommandLine::ForCurrentProcess()->HasSwitch( 22 return base::CommandLine::ForCurrentProcess()->HasSwitch(
33 switches::kSitePerProcess); 23 switches::kSitePerProcess);
34 } 24 }
35 25
36 // static 26 // static
37 bool SiteIsolationPolicy::IsTopDocumentIsolationEnabled() { 27 bool SiteIsolationPolicy::IsTopDocumentIsolationEnabled() {
38 // --site-per-process trumps --top-document-isolation. 28 // --site-per-process trumps --top-document-isolation.
39 if (UseDedicatedProcessesForAllSites()) 29 if (UseDedicatedProcessesForAllSites())
40 return false; 30 return false;
41 31
42 return base::FeatureList::IsEnabled(::features::kTopDocumentIsolation); 32 return base::FeatureList::IsEnabled(::features::kTopDocumentIsolation);
43 } 33 }
44 34
45 // static 35 // static
46 bool SiteIsolationPolicy::AreIsolatedOriginsEnabled() { 36 bool SiteIsolationPolicy::AreIsolatedOriginsEnabled() {
47 // TODO(alexmos): This currently assumes that isolated origins are only added 37 // TODO(alexmos): This currently assumes that isolated origins are only added
48 // via the command-line switch, which may not be true in the future. Remove 38 // via the command-line switch, which may not be true in the future. Remove
49 // this function when AreCrossProcessFramesPossible becomes true on Android 39 // this function when AreCrossProcessFramesPossible becomes true on Android
50 // above. 40 // above.
51 return base::CommandLine::ForCurrentProcess()->HasSwitch( 41 return base::CommandLine::ForCurrentProcess()->HasSwitch(
52 switches::kIsolateOrigins); 42 switches::kIsolateOrigins);
53 } 43 }
54 44
55 } // namespace content 45 } // 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