chrome/browser/sessions/session_restore_android.cc - Issue 143463012: Pass rendering state on swapping in a prerendered page.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sessions/session_restore_android.cc

Issue 143463012: Pass rendering state on swapping in a prerendered page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dev

Patch Set: . Created 6 years, 11 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

« chrome/android/java/src/org/chromium/chrome/browser/TabBase.java ('K') | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/session_restore_android.cc

diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc

index 95e772c01e9caf66c3952d9b7cd49e37635cc79a..d5f8dec7cecb5ed2504155802399a4c2d27be7e7 100644

--- a/chrome/browser/sessions/session_restore_android.cc

+++ b/chrome/browser/sessions/session_restore_android.cc

@@ -42,7 +42,7 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(

TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents);

DCHECK(current_tab);

if (disposition == CURRENT_TAB) {

- current_tab->SwapTabContents(web_contents, new_web_contents);

+ current_tab->SwapTabContents(web_contents, new_web_contents, false);

Ted C 2014/01/28 18:11:44 Previously, this wasn't resulting in a page load s

Shuhei Takahashi (google) 2014/01/29 05:58:10 Added another boolean flag didStartLoad to disting

delete web_contents;

} else {

DCHECK(disposition == NEW_FOREGROUND_TAB ||