Adding BlimpNavigationController to Tab

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.tab;
 
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 21 matching lines @@
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
+import org.chromium.blimp_public.contents.BlimpContents;
+import org.chromium.blimp_public.contents.BlimpContentsObserver;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.FrozenNativePage;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.IntentHandler.TabOpenType;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.SwipeRefreshHandler;
@@ skipping 154 matching lines @@
     /**
      * A list of {@link ContentViewCore} overlay objects that are managed by external components but
      * need to be sized and rendered along side this {@link Tab}s content.
      */
     private final List<ContentViewCore> mOverlayContentViewCores = new ArrayList<ContentViewCore>();
 
     // Content layer Observers and Delegates
     private ContentViewClient mContentViewClient;
     private TabWebContentsObserver mWebContentsObserver;
     private TabWebContentsDelegateAndroid mWebContentsDelegate;
+    private BlimpContents mBlimpContents;
 
     /**
      * If this tab was opened from another tab, store the id of the tab that
      * caused it to be opened so that we can activate it when this tab gets
      * closed.
      */
     private int mParentId = INVALID_TAB_ID;
 
     /**
      * If this tab was opened from another tab in another Activity, this is the Intent that can be
@@ skipping 359 matching lines @@
             // swapped web contents, schedule the enabling of fullscreen now.
             scheduleEnableFullscreenLoadDelayIfNecessary();
 
             if (didFinishLoad) {
                 // Simulate the PAGE_LOAD_FINISHED notification that we did not get.
                 didFinishPageLoad();
             }
         }
     };
 
+    private class TabBlimpContentsObserver implements BlimpContentsObserver {

[nyquist, 2016/08/16 19:09:20]

This doesn't seem to access Tab members. Could this be a static class?

[shaktisahu, 2016/08/16 23:46:13]

Acknowledged.

+        private Tab mTab;
+
+        public TabBlimpContentsObserver(Tab tab) {

[nyquist, 2016/08/16 19:09:20]

I think I'd vote for splitting this out early, if that's OK with you?

[shaktisahu, 2016/08/16 23:46:13]

Done.

+            mTab = tab;
+        }
+        @Override
+        public void onNavigationStateChanged() {
+            mTab.updateTitle();
+            RewindableIterator<TabObserver> observers = mTab.getTabObservers();
+            while (observers.hasNext()) {
+                observers.next().onUrlUpdated(mTab);
+            }
+        }
+    }
+
     private TabDelegateFactory mDelegateFactory;
 
     private TopControlsVisibilityDelegate mTopControlsVisibilityDelegate;
 
     /**
      * Creates an instance of a {@link Tab}.
      *
      * This constructor may be called before the native library has been loaded, so any additions
      * must be vetted for library calls.
      *
@@ skipping 122 matching lines @@
      * @param observer The {@link TabObserver} to remove.
      */
     public void removeObserver(TabObserver observer) {
         mObservers.removeObserver(observer);
     }
 
     /**
      * @return Whether or not this tab has a previous navigation entry.
      */
     public boolean canGoBack() {
-        return getWebContents() != null && getWebContents().getNavigationController().canGoBack();
+        if (isBlimpTab()) {
+            return getBlimpContents() != null
+                    && getBlimpContents().getNavigationController().canGoBack();
+        } else {
+            return getWebContents() != null
+                    && getWebContents().getNavigationController().canGoBack();
+        }
     }
 
     /**
      * @return Whether or not this tab has a navigation entry after the current one.
      */
     public boolean canGoForward() {
-        return getWebContents() != null && getWebContents().getNavigationController()
-                .canGoForward();
+        if (isBlimpTab()) {
+            return getBlimpContents() != null
+                    && getBlimpContents().getNavigationController().canGoForward();
+        } else {
+            return getWebContents() != null
+                    && getWebContents().getNavigationController().canGoForward();
+        }
     }
 
     /**
      * Goes to the navigation entry before the current one.
      */
     public void goBack() {
-        if (getWebContents() != null) getWebContents().getNavigationController().goBack();
+        if (isBlimpTab()) {
+            if (getBlimpContents() != null) getBlimpContents().getNavigationController().goBack();
+        } else {
+            if (getWebContents() != null) getWebContents().getNavigationController().goBack();
+        }
     }
 
     /**
      * Goes to the navigation entry after the current one.
      */
     public void goForward() {
-        if (getWebContents() != null) getWebContents().getNavigationController().goForward();
+        if (isBlimpTab()) {
+            if (getBlimpContents() != null) {
+                getBlimpContents().getNavigationController().goForward();
+            }
+        } else {
+            if (getWebContents() != null) getWebContents().getNavigationController().goForward();
+        }
     }
 
     /**
      * Loads the current navigation if there is a pending lazy load (after tab restore).
      */
     public void loadIfNecessary() {
         if (getWebContents() != null) getWebContents().getNavigationController().loadIfNecessary();
     }
 
     /**
@@ skipping 214 matching lines @@
 
         printingController.setPendingPrint(new TabPrinter(this),
                 new PrintManagerDelegateImpl(getActivity()));
     }
 
     /**
      * Reloads the current page content.
      */
     public void reload() {
         // TODO(dtrainor): Should we try to rebuild the ContentView if it's frozen?
-        if (getWebContents() != null) getWebContents().getNavigationController().reload(true);
+        if (isBlimpTab()) {
+            if (getBlimpContents() != null) {
+                getBlimpContents().getNavigationController().reload();
+            }
+        } else {
+            if (getWebContents() != null) getWebContents().getNavigationController().reload(true);
+        }
     }
 
     /**
      * Reloads the current page content.
      * This version ignores the cache and reloads from the network.
      */
     public void reloadIgnoringCache() {
         if (getWebContents() != null) {
             getWebContents().getNavigationController().reloadBypassingCache(true);
         }
@@ skipping 120 matching lines @@
     }
 
     /**
      * @return The web contents associated with this tab.
      */
     public WebContents getWebContents() {
         return mContentViewCore != null ? mContentViewCore.getWebContents() : null;
     }
 
     /**
+     * @return The blimp contents associated with this tab, if in blimp mode.

[nyquist, 2016/08/16 19:09:20]

{@link BlimpContents}

[shaktisahu, 2016/08/16 23:46:13]

Done.

+     */
+    public BlimpContents getBlimpContents() {
+        return mBlimpContents;
+    }
+
+    /**
+     * @return Whether or not this tab is running in blimp mode.
+     */
+    public boolean isBlimpTab() {
+        return true;

[nyquist, 2016/08/16 19:09:20]

Is this really always true? Or should this only be true for when blimp is
enabled?

[shaktisahu, 2016/08/16 23:46:13]

Left it true accidentally. :(

+    }
+
+    /**
      * @return The profile associated with this tab.
      */
     public Profile getProfile() {
         if (mNativeTabAndroid == 0) return null;
         return nativeGetProfileAndroid(mNativeTabAndroid);
     }
 
     /**
      * For more information about the uniqueness of {@link #getId()} see comments on {@link Tab}.
      * @see Tab
      * @return The id representing this tab.
      */
     @CalledByNative
     public int getId() {
         return mId;
     }
 
     /**
      * @return Whether or not this tab is incognito.
      */
+    @CalledByNative
     public boolean isIncognito() {
         return mIncognito;
     }
 
     /**
      * @return The {@link ContentViewCore} associated with the current page, or {@code null} if
      *         there is no current page or the current page is displayed using a native view.
      */
     public ContentViewCore getContentViewCore() {
         return mNativePage == null ? mContentViewCore : null;
@@ skipping 16 matching lines @@
     }
 
     /**
      * Set whether or not the {@link ContentViewCore} should be using a desktop user agent for the
      * currently loaded page.
      * @param useDesktop     If {@code true}, use a desktop user agent.  Otherwise use a mobile one.
      * @param reloadOnChange Reload the page if the user agent has changed.
      */
     public void setUseDesktopUserAgent(boolean useDesktop, boolean reloadOnChange) {
         if (getWebContents() != null) {
-            getWebContents().getNavigationController()
-                    .setUseDesktopUserAgent(useDesktop, reloadOnChange);
+            getWebContents().getNavigationController().setUseDesktopUserAgent(
+                    useDesktop, reloadOnChange);
         }
     }
 
     /**
      * @return Whether or not the {@link ContentViewCore} is using a desktop user agent.
      */
     public boolean getUseDesktopUserAgent() {
-        return getWebContents() != null && getWebContents().getNavigationController()
-                .getUseDesktopUserAgent();
+        return getWebContents() != null
+                && getWebContents().getNavigationController().getUseDesktopUserAgent();
     }
 
     /**
      * @return The current {@link ConnectionSecurityLevel} for the tab.
      */
     // TODO(tedchoc): Remove this and transition all clients to use ToolbarModel directly.
     public int getSecurityLevel() {
         return SecurityStateModel.getSecurityLevelForWebContents(getWebContents());
     }
 
@@ skipping 231 matching lines @@
             // TODO(dtrainor): Remove this and move to a pull model instead of pushing the layer.
             attachTabContentManager(tabContentManager);
 
             // If there is a frozen WebContents state or a pending lazy load, don't create a new
             // WebContents.
             if (getFrozenContentsState() != null || getPendingLoadParams() != null) {
                 if (unfreeze) unfreezeContents();
                 return;
             }
 
+            if (isBlimpTab() && getBlimpContents() == null) {

[nyquist, 2016/08/16 21:42:24]

Maybe ask BlimpClientContext.isBlimpEnabled()? That can later be backed by our
preference, but for now just return false.

+                nativeInitBlimpContents(mNativeTabAndroid);
+                mBlimpContents = nativeGetBlimpContents(mNativeTabAndroid);
+                getBlimpContents().addObserver(new TabBlimpContentsObserver(this));
+            }
+
             boolean creatingWebContents = webContents == null;
             if (creatingWebContents) {
                 webContents = WebContentsFactory.createWebContents(isIncognito(), initiallyHidden);
             }
 
             ContentViewCore contentViewCore = ContentViewCore.fromWebContents(webContents);
 
             if (contentViewCore == null) {
                 initContentViewCore(webContents);
             } else {
@@ skipping 546 matching lines @@
         if (mTabUma != null) mTabUma.onDestroy();
 
         for (TabObserver observer : mObservers) observer.onDestroyed(this);
         mObservers.clear();
 
         NativePage currentNativePage = mNativePage;
         mNativePage = null;
         destroyNativePageInternal(currentNativePage);
         destroyContentViewCore(true);
 
+        mBlimpContents = null;
+
         // Destroys the native tab after destroying the ContentView but before destroying the
         // InfoBarContainer. The native tab should be destroyed before the infobar container as
         // destroying the native tab cleanups up any remaining infobars. The infobar container
         // expects all infobars to be cleaned up before its own destruction.
         assert mNativeTabAndroid != 0;
         nativeDestroy(mNativeTabAndroid);
         assert mNativeTabAndroid == 0;
 
         if (mInfoBarContainer != null) {
             mInfoBarContainer.destroy();
@@ skipping 14 matching lines @@
         return mIsInitialized;
     }
 
     /**
      * @return The URL associated with the tab.
      */
     @CalledByNative
     public String getUrl() {
         String url = getWebContents() != null ? getWebContents().getUrl() : "";
 
+        if (isBlimpTab()) {

[nyquist, 2016/08/16 19:09:20]

Should this be moved to the top?

[nyquist, 2016/08/16 21:42:25]

Bah. Ignore.

+            url = getBlimpContents() != null ? getBlimpContents().getNavigationController().getUrl()
+                                             : "";
+        }
+
         // If we have a ContentView, or a NativePage, or the url is not empty, we have a WebContents
         // so cache the WebContent's url. If not use the cached version.

[nyquist, 2016/08/16 21:42:24]

Maybe check for BlimpContents as well here?

[shaktisahu, 2016/08/16 23:46:13]

Actually TextUtils.isEmpty(url) will do that for you.

         if (getContentViewCore() != null || getNativePage() != null || !TextUtils.isEmpty(url)) {
             mUrl = url;
         }
 
         return mUrl != null ? mUrl : "";
     }
 
     /**
      * @return The tab title.
      */
     @CalledByNative
     public String getTitle() {
         if (mTitle == null) updateTitle();
         return mTitle;
     }
 
     void updateTitle() {
         if (isFrozen()) return;
 
         // When restoring the tabs, the title will no longer be populated, so request it from the
         // ContentViewCore or NativePage (if present).
         String title = "";
         if (mNativePage != null) {
             title = mNativePage.getTitle();
+        } else if (getBlimpContents() != null) {
+            title = getBlimpContents().getNavigationController().getTitle();
         } else if (getWebContents() != null) {
             title = getWebContents().getTitle();
         }
         updateTitle(title);
     }
 
     /**
      * Cache the title for the current page.
      *
      * {@link ContentViewClient#onUpdateTitle} is unreliable, particularly for navigating backwards
@@ skipping 1155 matching lines @@
         String packageName = ContextUtils.getApplicationContext().getPackageName();
         return getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP
                 && !TextUtils.equals(getAppAssociatedWith(), packageName);
     }
 
     private native void nativeInit();
     private native void nativeDestroy(long nativeTabAndroid);
     private native void nativeInitWebContents(long nativeTabAndroid, boolean incognito,
             WebContents webContents, TabWebContentsDelegateAndroid delegate,
             ContextMenuPopulator contextMenuPopulator);
+    private native void nativeInitBlimpContents(long nativeTabAndroid);
+    private native BlimpContents nativeGetBlimpContents(long nativeTabAndroid);
     private native void nativeUpdateDelegates(long nativeTabAndroid,
             TabWebContentsDelegateAndroid delegate, ContextMenuPopulator contextMenuPopulator);
     private native void nativeDestroyWebContents(long nativeTabAndroid, boolean deleteNative);
     private native Profile nativeGetProfileAndroid(long nativeTabAndroid);
     private native int nativeLoadUrl(long nativeTabAndroid, String url, String extraHeaders,
             ResourceRequestBody postData, int transition, String referrerUrl, int referrerPolicy,
             boolean isRendererInitiated, boolean shoulReplaceCurrentEntry,
             long intentReceivedTimestamp, boolean hasUserGesture);
     private native void nativeSetActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url,
             String title);
@@ skipping 10 matching lines @@
     private native void nativeSetInterceptNavigationDelegate(long nativeTabAndroid,
             InterceptNavigationDelegate delegate);
     private native void nativeAttachToTabContentManager(long nativeTabAndroid,
             TabContentManager tabContentManager);
     private native void nativeAttachOverlayWebContents(
             long nativeTabAndroid, WebContents webContents, boolean visible);
     private native void nativeDetachOverlayWebContents(
             long nativeTabAndroid, WebContents webContents);
     private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
 }