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

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 757723002: [Tests not passing yet] Remove prerender sessionStorage namespace merging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 9d12d4566a29a8fa0ff4d6a438e63fe2e8d8e750..77d11b70655a8a523151df791227e2cea3c6184f 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -621,15 +621,11 @@ void Navigate(NavigateParams* params) {
// same as the source.
DCHECK(params->source_contents);
params->target_contents = params->source_contents;
- }
- // Note: at this point, if |params->disposition| is not CURRENT_TAB,
- // |params->target_contents| has not been attached to a Browser yet. (That
- // happens later in this function.) However, in that case, the
- // sessionStorage namespace could not match, so prerender will use the
- // asynchronous codepath and still swap.
- DCHECK(params->target_contents);
- swapped_in_prerender = SwapInPrerender(params->url, params);
+ // Prerender can only swap in CURRENT_TAB navigations; others have
+ // different sessionStorage namespaces.
+ swapped_in_prerender = SwapInPrerender(params->url, params);
+ }
if (user_initiated)
params->target_contents->UserGestureDone();
« no previous file with comments | « chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698