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

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

Issue 1449793002: data_with_base_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 5 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_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 9a8810b3aa9a45c2ec8424f30fbbff6800fe5421..4727bd50ca6cceefc6e52c78eb21c934be4e0222 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2274,12 +2274,12 @@ void RenderFrameHostImpl::UpdatePermissionsForNavigation(
if (!GetProcess()->IsForGuestsOnly()) {
ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL(
GetProcess()->GetID(), common_params.url);
- if (common_params.url.SchemeIs(url::kDataScheme) &&
- common_params.base_url_for_data_url.SchemeIs(url::kFileScheme)) {
+ if (common_params.url.SchemeIs(url::kFileScheme) &&
+ common_params.data_url_with_base_url.SchemeIs(url::kDataScheme)) {
// If 'data:' is used, and we have a 'file:' base url, grant access to
// local files.
ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL(
- GetProcess()->GetID(), common_params.base_url_for_data_url);
+ GetProcess()->GetID(), common_params.url);
}
}

Powered by Google App Engine
This is Rietveld 408576698