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

Unified Diff: content/shell/browser/shell_content_browser_client.cc

Issue 2322673005: Fix process transfers for blob urls of sites requiring dedicated processes. (Closed)
Patch Set: Charlie's fixes. Created 4 years, 3 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
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 5fe4483d0466b298b80cedd8bb3cac0c8e8d583b..c3846573f9b815f7c3f7a1991cb85545641b0007 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -145,15 +145,22 @@ BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
bool ShellContentBrowserClient::DoesSiteRequireDedicatedProcess(
BrowserContext* browser_context,
- const GURL& effective_url) {
+ const GURL& effective_site_url) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
DCHECK(command_line->HasSwitch(switches::kIsolateSitesForTesting));
std::string pattern =
command_line->GetSwitchValueASCII(switches::kIsolateSitesForTesting);
- // Practically |origin| is the same as |effective_url.spec()|, except Origin
- // serialization strips the trailing "/", which makes for cleaner patterns.
- std::string origin = url::Origin(effective_url).Serialize();
- return base::MatchPattern(origin, pattern);
+ url::Origin origin(effective_site_url);
+
+ // Schemes like blob or filesystem, which have an embedded origin, should
+ // already have been canonicalized to the origin site.
+ CHECK_EQ(origin.scheme(), effective_site_url.scheme())
+ << "a site url should have the same scheme as its origin.";
+
+ // Practically |origin.Serialize()| is the same as
+ // |effective_site_url.spec()|, except Origin serialization strips the
+ // trailing "/", which makes for cleaner wildcard patterns.
+ return base::MatchPattern(origin.Serialize(), pattern);
}
bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698