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

Unified Diff: content/browser/frame_host/navigation_entry_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/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 8102a4748341027439ce7bdc7faa5cf836baa5ae..02a5a566ff6a8437235ce599f223e7d9c5926428 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -153,6 +153,14 @@ const GURL& NavigationEntryImpl::GetBaseURLForDataURL() const {
return base_url_for_data_url_;
}
+void NavigationEntryImpl::SetDataURLWithBaseURL(const GURL& url) {
+ data_url_with_base_url_ = url;
+}
+
+const GURL& NavigationEntryImpl::GetDataURLWithBaseURL() const {
+ return data_url_with_base_url_;
+}
+
void NavigationEntryImpl::SetReferrer(const Referrer& referrer) {
frame_tree_->frame_entry->set_referrer(referrer);
}
@@ -437,6 +445,7 @@ scoped_ptr<NavigationEntryImpl> NavigationEntryImpl::CloneAndReplace(
copy->extra_headers_ = extra_headers_;
// ResetForCommit: source_site_instance_
copy->base_url_for_data_url_ = base_url_for_data_url_;
+ copy->data_url_with_base_url_ = data_url_with_base_url_;
// ResetForCommit: is_renderer_initiated_
copy->cached_display_title_ = cached_display_title_;
// ResetForCommit: transferred_global_request_id_
@@ -469,7 +478,7 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
return CommonNavigationParams(
dest_url, dest_referrer, GetTransitionType(), navigation_type,
!IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type,
- GetBaseURLForDataURL(), GetHistoryURLForDataURL(), lofi_state,
+ GetDataURLWithBaseURL(), GetHistoryURLForDataURL(), lofi_state,
navigation_start);
}

Powered by Google App Engine
This is Rietveld 408576698