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

Unified Diff: content/browser/site_instance_impl.cc

Issue 2913443002: Fix scheme check in SiteInstance::IsSameWebSite for nested URLs. (Closed)
Patch Set: Nick's comments Created 3 years, 7 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 | « no previous file | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/site_instance_impl.cc
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index d8b0d281678937f4cc367cf56d297b584a312683..0e47c20885ad4e5e8b7396062cf192290c32b3fb 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -318,19 +318,11 @@ bool SiteInstance::IsSameWebSite(BrowserContext* browser_context,
return src_origin == dest_origin;
// If the schemes differ, they aren't part of the same site.
- //
- // Note that this happens after the isolated origin check, since blob or
- // filesystem URLs will fail this check even though they might have the
- // same origin.
- //
- // TODO(alexmos): This check seems broken for nested URLs involving
- // non-isolated origins too. See https://crbug.com/726370.
- if (src_url.scheme() != dest_url.scheme())
+ if (src_origin.scheme() != dest_origin.scheme())
return false;
return net::registry_controlled_domains::SameDomainOrHost(
- src_url,
- dest_url,
+ src_origin, dest_origin,
net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
}
« no previous file with comments | « no previous file | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698