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

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

Issue 1255103003: Fix race when reloading original URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 years, 5 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 | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/frame_host/navigation_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5e47912398bed6bf721136e8b2ae7b979241052d..904a9bf080f35625e24d2e2ea1fce88f89b2fd29 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -435,6 +435,8 @@ scoped_ptr<NavigationEntryImpl> NavigationEntryImpl::CloneAndReplace(
}
CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
+ const GURL& dest_url,
+ const Referrer& dest_referrer,
const FrameNavigationEntry& frame_entry,
FrameMsg_Navigate_Type::Value navigation_type) const {
FrameMsg_UILoadMetricsReportType::Value report_type =
@@ -447,9 +449,9 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
#endif
return CommonNavigationParams(
- frame_entry.url(), frame_entry.referrer(), GetTransitionType(),
- navigation_type, !IsViewSourceMode(), ui_timestamp, report_type,
- GetBaseURLForDataURL(), GetHistoryURLForDataURL());
+ dest_url, dest_referrer, GetTransitionType(), navigation_type,
+ !IsViewSourceMode(), ui_timestamp, report_type, GetBaseURLForDataURL(),
+ GetHistoryURLForDataURL());
}
StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/frame_host/navigation_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698