Restructuring NavigationController functionalities from ContentViewCore to NavigationController

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

 // Copyright 2012 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.content.browser;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 58 matching lines @@
 import org.chromium.content.browser.input.PopupTouchHandleDrawable;
 import org.chromium.content.browser.input.PopupTouchHandleDrawable.PopupTouchHandleDrawableDelegate;
 import org.chromium.content.browser.input.SelectPopup;
 import org.chromium.content.browser.input.SelectPopupDialog;
 import org.chromium.content.browser.input.SelectPopupDropdown;
 import org.chromium.content.browser.input.SelectPopupItem;
 import org.chromium.content.browser.input.SelectionEventType;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.content_public.browser.JavaScriptCallback;
+import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.ViewAndroid;
 import org.chromium.ui.base.ViewAndroidDelegate;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ skipping 759 matching lines @@
     }
 
     /**
      * Load url without fixing up the url string. Consumers of ContentView are responsible for
      * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
      * off during user input).
      *
      * @param params Parameters for this load.
      */
     public void loadUrl(LoadUrlParams params) {
-        if (mNativeContentViewCore == 0) return;
-
-        nativeLoadUrl(mNativeContentViewCore,
-                params.mUrl,
-                params.mLoadUrlType,
-                params.mTransitionType,
-                params.getReferrer() != null ? params.getReferrer().getUrl() : null,
-                params.getReferrer() != null ? params.getReferrer().getPolicy() : 0,
-                params.mUaOverrideOption,
-                params.getExtraHeadersString(),
-                params.mPostData,
-                params.mBaseUrlForDataUrl,
-                params.mVirtualUrlForDataUrl,
-                params.mCanLoadLocalResources,
-                params.mIsRendererInitiated);
+        assert mWebContents !=  null;
+        mWebContents.getNavigationController().loadUrl(params);
     }
 
     /**
      * Stops loading the current web contents.
      */
     public void stopLoading() {
         assert mWebContents != null;
         mWebContents.stop();
     }
 
@@ skipping 87 matching lines @@
     public float getContentWidthCss() {
         return mRenderCoordinates.getContentWidthCss();
     }
 
     // TODO(teddchoc): Remove all these navigation controller methods from here and have the
     //                 embedders manage it.
     /**
      * @return Whether the current WebContents has a previous navigation entry.
      */
     public boolean canGoBack() {
-        return mWebContents != null && mWebContents.getNavigationController().canGoBack();
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().canGoBack();
     }
 
     /**
      * @return Whether the current WebContents has a navigation entry after the current one.
      */
     public boolean canGoForward() {
-        return mWebContents != null && mWebContents.getNavigationController().canGoForward();
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().canGoForward();
     }
 
     /**
      * @param offset The offset into the navigation history.
      * @return Whether we can move in history by given offset
      */
     public boolean canGoToOffset(int offset) {
-        return mWebContents != null &&
-                mWebContents.getNavigationController().canGoToOffset(offset);
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().canGoToOffset(offset);
     }
 
     /**
      * Navigates to the specified offset from the "current entry". Does nothing if the offset is out
      * of bounds.
      * @param offset The offset into the navigation history.
      */
     @VisibleForTesting
     public void goToOffset(int offset) {
-        if (mWebContents != null) mWebContents.getNavigationController().goToOffset(offset);
+        assert mWebContents != null;
+        mWebContents.getNavigationController().goToOffset(offset);
     }
 
     @Override
     public void goToNavigationIndex(int index) {
-        if (mWebContents != null) {
-            mWebContents.getNavigationController().goToNavigationIndex(index);
-        }
+        assert mWebContents != null;
+        mWebContents.getNavigationController().goToNavigationIndex(index);
     }
 
     /**
      * Goes to the navigation entry before the current one.
      */
     public void goBack() {
-        if (mWebContents != null) mWebContents.getNavigationController().goBack();
+        assert mWebContents != null;
+        mWebContents.getNavigationController().goBack();
     }
 
     /**
      * Goes to the navigation entry following the current one.
      */
     public void goForward() {
-        if (mWebContents != null) mWebContents.getNavigationController().goForward();
+        assert mWebContents != null;
+        mWebContents.getNavigationController().goForward();
     }
 
     /**
      * Loads the current navigation if there is a pending lazy load (after tab restore).
      */
     public void loadIfNecessary() {
-        if (mWebContents != null) mWebContents.getNavigationController().loadIfNecessary();
+        assert mWebContents != null;
+        mWebContents.getNavigationController().loadIfNecessary();
     }
 
     /**
      * Requests the current navigation to be loaded upon the next call to loadIfNecessary().
      */
     public void requestRestoreLoad() {
-        if (mWebContents != null) mWebContents.getNavigationController().requestRestoreLoad();
+        assert mWebContents != null;
+        mWebContents.getNavigationController().requestRestoreLoad();
     }
 
     /**
      * Reload the current page.
      */
     public void reload(boolean checkForRepost) {
+        assert mWebContents != null;
         mAccessibilityInjector.addOrRemoveAccessibilityApisIfNecessary();
-        if (mWebContents != null) mWebContents.getNavigationController().reload(checkForRepost);
+        mWebContents.getNavigationController().reload(checkForRepost);
     }
 
     /**
      * Reload the current page, ignoring the contents of the cache.
      */
     public void reloadIgnoringCache(boolean checkForRepost) {
+        assert mWebContents != null;
         mAccessibilityInjector.addOrRemoveAccessibilityApisIfNecessary();
-        if (mWebContents != null) mWebContents.getNavigationController().reloadIgnoringCache(
+        mWebContents.getNavigationController().reloadIgnoringCache(
                 checkForRepost);
     }
 
     /**
      * Cancel the pending reload.
      */
     public void cancelPendingReload() {
-        if (mWebContents != null) mWebContents.getNavigationController().cancelPendingReload();
+        assert mWebContents != null;
+        mWebContents.getNavigationController().cancelPendingReload();
     }
 
     /**
      * Continue the pending reload.
      */
     public void continuePendingReload() {
-        if (mWebContents != null) mWebContents.getNavigationController().continuePendingReload();
+        assert mWebContents != null;
+        mWebContents.getNavigationController().continuePendingReload();
     }
 
     /**
      * Clears the ContentViewCore's page history in both the backwards and
      * forwards directions.
      */
     public void clearHistory() {
-        if (mNativeContentViewCore != 0) nativeClearHistory(mNativeContentViewCore);
+        assert mWebContents != null;
+        mWebContents.getNavigationController().clearHistory();
     }
 
     /**
      * @return The selected text (empty if no text selected).
      */
     public String getSelectedText() {
         return mHasSelection ? mLastSelectedText : "";
     }
 
     /**
@@ skipping 1068 matching lines @@
                 hidePastePopup();
                 break;
 
             default:
                 assert false : "Invalid selection event type.";
         }
         getContentViewClient().onSelectionEvent(eventType);
     }
 
     public boolean getUseDesktopUserAgent() {
-        if (mNativeContentViewCore != 0) {
-            return nativeGetUseDesktopUserAgent(mNativeContentViewCore);
-        }
-        return false;
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().getUseDesktopUserAgent();
     }
 
     /**
      * Set whether or not we're using a desktop user agent for the currently loaded page.
      * @param override If true, use a desktop user agent.  Use a mobile one otherwise.
      * @param reloadOnChange Reload the page if the UA has changed.
      */
     public void setUseDesktopUserAgent(boolean override, boolean reloadOnChange) {
-        if (mNativeContentViewCore != 0) {
-            nativeSetUseDesktopUserAgent(mNativeContentViewCore, override, reloadOnChange);
-        }
+        assert mWebContents != null;
+        mWebContents.getNavigationController().setUseDesktopUserAgent(override,
+                reloadOnChange);
     }
 
     public void clearSslPreferences() {
-        if (mNativeContentViewCore != 0) nativeClearSslPreferences(mNativeContentViewCore);
+        assert mWebContents != null;
+        mWebContents.getNavigationController().clearSslPreferences();
     }
 
     private void hideTextHandles() {
         mHasSelection = false;
         mHasInsertion = false;
         if (mNativeContentViewCore != 0) nativeHideTextHandles(mNativeContentViewCore);
     }
 
     /**
      * Shows the IME if the focused widget could accept text input.
@@ skipping 745 matching lines @@
      * @param animate Whether the transition should be animated or not.
      */
     public void updateTopControlsState(boolean enableHiding, boolean enableShowing,
             boolean animate) {
         assert mWebContents != null;
         mWebContents.updateTopControlsState(
                 enableHiding, enableShowing, animate);
     }
 
     /**
-     * Callback factory method for nativeGetNavigationHistory().
-     */
-    @CalledByNative
-    private void addToNavigationHistory(Object history, int index, String url, String virtualUrl,
-            String originalUrl, String title, Bitmap favicon) {
-        NavigationEntry entry = new NavigationEntry(
-                index, url, virtualUrl, originalUrl, title, favicon);
-        ((NavigationHistory) history).addEntry(entry);
-    }
-
-    /**
      * Get a copy of the navigation history of the view.
      */
     public NavigationHistory getNavigationHistory() {
-        NavigationHistory history = new NavigationHistory();
-        if (mNativeContentViewCore != 0) {
-            int currentIndex = nativeGetNavigationHistory(mNativeContentViewCore, history);
-            history.setCurrentEntryIndex(currentIndex);
-        }
-        return history;
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().getNavigationHistory();
     }
 
     @Override
     public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
-        NavigationHistory history = new NavigationHistory();
-        if (mNativeContentViewCore != 0) {
-            nativeGetDirectedNavigationHistory(
-                mNativeContentViewCore, history, isForward, itemLimit);
-        }
-        return history;
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().getDirectedNavigationHistory(
+                isForward, itemLimit);
     }
 
     /**
      * @return The original request URL for the current navigation entry, or null if there is no
      *         current entry.
      */
     public String getOriginalUrlForActiveNavigationEntry() {
-        if (mNativeContentViewCore != 0) {
-            return nativeGetOriginalUrlForActiveNavigationEntry(mNativeContentViewCore);
-        }
-        return "";
+        assert mWebContents != null;
+        return mWebContents.getNavigationController().
+                getOriginalUrlForVisibleNavigationEntry();
     }
 
     /**
      * @return The cached copy of render positions and scales.
      */
     public RenderCoordinates getRenderCoordinates() {
         return mRenderCoordinates;
     }
 
     @CalledByNative
@@ skipping 109 matching lines @@
 
     @CalledByNative
     private boolean isFullscreenRequiredForOrientationLock() {
         return mFullscreenRequiredForOrientationLock;
     }
 
     private native WebContents nativeGetWebContentsAndroid(long nativeContentViewCoreImpl);
 
     private native void nativeOnJavaContentViewCoreDestroyed(long nativeContentViewCoreImpl);
 
-    private native void nativeLoadUrl(
-            long nativeContentViewCoreImpl,
-            String url,
-            int loadUrlType,
-            int transitionType,
-            String referrerUrl,
-            int referrerPolicy,
-            int uaOverrideOption,
-            String extraHeaders,
-            byte[] postData,
-            String baseUrlForDataUrl,
-            String virtualUrlForDataUrl,
-            boolean canLoadLocalResources,
-            boolean isRendererInitiated);
-
     private native void nativeSetFocus(long nativeContentViewCoreImpl, boolean focused);
 
     private native void nativeSendOrientationChangeEvent(
             long nativeContentViewCoreImpl, int orientation);
 
     // All touch events (including flings, scrolls etc) accept coordinates in physical pixels.
     private native boolean nativeOnTouchEvent(
             long nativeContentViewCoreImpl, MotionEvent event,
             long timeMs, int action, int pointerCount, int historySize, int actionIndex,
             float x0, float y0, float x1, float y1,
@@ skipping 54 matching lines @@
 
     private native void nativeSetDoubleTapSupportEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeSetMultiTouchZoomSupportEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeSelectPopupMenuItems(long nativeContentViewCoreImpl,
             long nativeSelectPopupSourceFrame, int[] indices);
 
-    private native void nativeClearHistory(long nativeContentViewCoreImpl);
 
     private native void nativePostMessageToFrame(long nativeContentViewCoreImpl, String frameId,
             String message, String sourceOrigin, String targetOrigin);
 
     private native long nativeGetNativeImeAdapter(long nativeContentViewCoreImpl);
 
     private native int nativeGetCurrentRenderProcessId(long nativeContentViewCoreImpl);
 
-    private native void nativeSetUseDesktopUserAgent(long nativeContentViewCoreImpl,
-            boolean enabled, boolean reloadOnChange);
-
-    private native boolean nativeGetUseDesktopUserAgent(long nativeContentViewCoreImpl);
-
-    private native void nativeClearSslPreferences(long nativeContentViewCoreImpl);
-
     private native void nativeSetAllowJavascriptInterfacesInspection(
             long nativeContentViewCoreImpl, boolean allow);
 
     private native void nativeAddJavascriptInterface(long nativeContentViewCoreImpl, Object object,
             String name, Class requiredAnnotation);
 
     private native void nativeRemoveJavascriptInterface(long nativeContentViewCoreImpl,
             String name);
 
-    private native int nativeGetNavigationHistory(long nativeContentViewCoreImpl, Object context);
-
-    private native void nativeGetDirectedNavigationHistory(long nativeContentViewCoreImpl,
-            Object context, boolean isForward, int maxEntries);
-
-    private native String nativeGetOriginalUrlForActiveNavigationEntry(
-            long nativeContentViewCoreImpl);
-
     private native void nativeWasResized(long nativeContentViewCoreImpl);
 
     private native void nativeSetAccessibilityEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }