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

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: . 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
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..c8e0ea72ce8503534a5083a6b698e2b1aff92910 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,7 @@ 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 didFinishLoad) {
if (mContentViewCore != null) mContentViewCore.onHide();
destroyContentView(false);
NativePage previousNativePage = mNativePage;
@@ -840,7 +840,8 @@ 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, didFinishLoad);
Ted C 2014/01/28 18:11:44 in java land, braces are required unless the whole
Shuhei Takahashi (google) 2014/01/29 05:58:10 Done.
}
@CalledByNative

Powered by Google App Engine
This is Rietveld 408576698