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

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

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: Addressed comments. 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/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 5740af67acbee9231ed9620e601cc8be1848aa9a..d76d5d6bf7f979b48083fb9079ebc7ce05a0e8ba 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -146,10 +146,10 @@ void NavigatorImpl::DidStartProvisionalLoad(
const base::TimeTicks& navigation_start) {
bool is_main_frame = render_frame_host->frame_tree_node()->IsMainFrame();
bool is_error_page = (url.spec() == kUnreachableWebDataURL);
- bool is_iframe_srcdoc = (url.spec() == kAboutSrcDocURL);
GURL validated_url(url);
RenderProcessHost* render_process_host = render_frame_host->GetProcess();
- render_process_host->FilterURL(false, &validated_url);
+ if (validated_url != GURL(content::kAboutSrcDocURL))
nasko 2016/11/15 17:15:23 Remove this check as FilterURL now handles it corr
arthursonzogni 2016/11/17 17:04:58 Done.
+ render_process_host->FilterURL(false, &validated_url);
// Do not allow browser plugin guests to navigate to non-web URLs, since they
// cannot swap processes or grant bindings.
@@ -169,7 +169,7 @@ void NavigatorImpl::DidStartProvisionalLoad(
if (delegate_) {
// Notify the observer about the start of the provisional load.
delegate_->DidStartProvisionalLoad(render_frame_host, validated_url,
- is_error_page, is_iframe_srcdoc);
+ is_error_page);
}
if (is_error_page || IsBrowserSideNavigationEnabled())
@@ -208,7 +208,6 @@ void NavigatorImpl::DidStartProvisionalLoad(
validated_url, render_frame_host->frame_tree_node(),
is_renderer_initiated,
false, // is_same_page
- is_iframe_srcdoc, // is_srcdoc
navigation_start, pending_nav_entry_id, started_from_context_menu));
}

Powered by Google App Engine
This is Rietveld 408576698