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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: Created 4 years, 1 month 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/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index e174e54d379ca834c1016b919b53d5325fb0ce0d..91a2a832bdc067d4b4e2f29aa06021c42c32fc5f 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1401,12 +1401,13 @@ RenderFrameHostManager::DetermineSiteInstanceForURL(
SiteInstanceRelation::UNRELATED);
}
- // Use the source SiteInstance in case of data URLs or about:blank pages,
- // because the content is then controlled and/or scriptable by the source
- // SiteInstance.
+ // Use the source SiteInstance in case of data URLs, about:srcdoc pages and
+ // about:blank pages because the content is then controlled and/or scriptable
+ // by the source SiteInstance.
GURL about_blank(url::kAboutBlankURL);
- if (source_instance &&
- (dest_url == about_blank || dest_url.scheme() == url::kDataScheme)) {
+ GURL about_srcdoc(content::kAboutSrcDocURL);
+ if (source_instance && (dest_url == about_srcdoc || dest_url == about_blank ||
Charlie Reis 2016/11/11 22:53:24 Good catch-- that seems right to me. (I suppose t
arthursonzogni 2016/11/15 16:37:09 FYI, this modification fixes the test: FrameTreeBr
Charlie Reis 2016/11/16 18:20:22 I'm not sure if that ever gets called for subframe
+ dest_url.scheme() == url::kDataScheme)) {
return SiteInstanceDescriptor(source_instance);
}

Powered by Google App Engine
This is Rietveld 408576698