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

Unified Diff: content/browser/child_process_security_policy_impl.cc

Issue 11772005: Implement a prototype to render cross-site iframes in a separate process from their parent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT. Created 7 years, 11 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/child_process_security_policy_impl.cc
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index d5fd09fda6da5d15c3273c61e4553a2cf8e31311..b8981ce7f0c93b21f7e88f830f7718cce0cc4b42 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -515,15 +515,9 @@ bool ChildProcessSecurityPolicyImpl::CanLoadPage(
// stronger security restrictions on page navigation.
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) &&
ResourceType::IsFrame(resource_type)) {
- // TODO(irobert): This currently breaks some WebUI page such as
- // "chrome://extensions/" (belongs to site chrome://chrome/) which
- // will load an iframe for the page "chrome://uber-frame/"
- // (belongs to site chrome://uber-frame/).
- base::AutoLock lock(lock_);
- SecurityStateMap::iterator state = security_state_.find(child_id);
- if (state == security_state_.end())
- return false;
- return state->second->CanLoadPage(url);
+ // TODO(nasko): Do the proper check for site-per-process, once
+ // out-of-process iframes is ready to go.
+ return true;
}
return true;
}
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_embedder.cc ('k') | content/browser/loader/resource_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698