Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / android / java / src / org / chromium / chrome / browser / Tab.java

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/src/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index 0793671..b3bb1b7 100644 (file)
--- a/src/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/src/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -1010,18 +1010,19 @@ public class Tab implements NavigationClient {
     private void swapWebContents(
             final long newWebContents, boolean didStartLoad, boolean didFinishLoad) {
         swapContentView(ContentView.newInstance(mContext, newWebContents, getWindowAndroid()),
-                false);
-        for (TabObserver observer : mObservers) {
-            observer.onWebContentsSwapped(this, didStartLoad, didFinishLoad);
-        }
+                false, didStartLoad, didFinishLoad);
     }
 
     /**
      * Called to swap out the current view with the one passed in.
      * @param view The content view that should be swapped into the tab.
      * @param deleteOldNativeWebContents Whether to delete the native web contents of old view.
+     * @param didStartLoad Whether WebContentsObserver::DidStartProvisionalLoadForFrame() has
+     *     already been called.
+     * @param didFinishLoad Whether WebContentsObserver::DidFinishLoad() has already been called.
      */
-    protected void swapContentView(ContentView view, boolean deleteOldNativeWebContents) {
+    protected void swapContentView(ContentView view, boolean deleteOldNativeWebContents,
+            boolean didStartLoad, boolean didFinishLoad) {
         int originalWidth = 0;
         int originalHeight = 0;
         if (mContentViewCore != null) {
@@ -1043,6 +1044,9 @@ public class Tab implements NavigationClient {
         mContentViewCore.attachImeAdapter();
         for (TabObserver observer : mObservers) observer.onContentChanged(this);
         destroyNativePageInternal(previousNativePage);
+        for (TabObserver observer : mObservers) {
+            observer.onWebContentsSwapped(this, didStartLoad, didFinishLoad);
+        }
     }
 
     @CalledByNative