chrome/android/java/src/org/chromium/chrome/browser/TabBase.java - 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/android/java/src/org/chromium/chrome/browser/TabBase.java

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

Patch Set: sync 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/TabBase.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java

index ef424bf535b53ebfbde9e4b56ab78c347c3005cb..af617c8b23cb2285de941b160adece3260d7a6f6 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java

@@ -830,7 +830,8 @@ public abstract class TabBase implements NavigationClient {

/** This is currently called when committing a pre-rendered page. */

@CalledByNative

- private void swapWebContents(final long newWebContents) {

+ private void swapWebContents(

+ final long newWebContents, boolean didStartLoad, boolean didFinishLoad) {

if (mContentViewCore != null) mContentViewCore.onHide();

destroyContentView(false);

NativePage previousNativePage = mNativePage;

@@ -840,7 +841,9 @@ public abstract class TabBase implements NavigationClient {

mContentViewCore.attachImeAdapter();

for (TabObserver observer : mObservers) observer.onContentChanged(this);

destroyNativePageInternal(previousNativePage);

- for (TabObserver observer : mObservers) observer.onWebContentsSwapped(this);

+ for (TabObserver observer : mObservers) {

+ observer.onWebContentsSwapped(this, didStartLoad, didFinishLoad);

+ }

}

@CalledByNative