Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

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 199 matching lines @@
     }
 
     /**
      * An interface that allows the embedder to be notified when the results of
      * extractSmartClipData are available.
      */
     public interface SmartClipDataListener {
         public void onSmartClipDataExtracted(String text, String html, Rect clipRect);
     }
 
-    /**
-     * An interface that allows the embedder to be notified of navigation transition
-     * related events and respond to them.
-     */
-    public interface NavigationTransitionDelegate {
-        /**
-         * Called when the navigation is deferred immediately after the response started.
-         *
-         * @param enteringColor The background color of the entering document, as a String
-         *                      representing a legal CSS color value. This is inserted into
-         *                      the transition layer's markup after the entering stylesheets
-         *                      have been applied.
-         */
-        public void didDeferAfterResponseStarted(
-                String markup, String cssSelector, String enteringColor);
-
-        /**
-         * Called when a navigation transition has been detected, and we need to check
-         * if it's supported.
-         */
-        public boolean willHandleDeferAfterResponseStarted();
-
-        /**
-         * Called when the navigation is deferred immediately after the response
-         * started.
-         */
-        public void addEnteringStylesheetToTransition(String stylesheet);
-
-        /**
-         * Notifies that a navigation transition is started for a given frame.
-         * @param frameId A positive, non-zero integer identifying the navigating frame.
-         */
-        public void didStartNavigationTransitionForFrame(long frameId);
-    }
-
     private final Context mContext;
     private ViewGroup mContainerView;
     private InternalAccessDelegate mContainerViewInternals;
     private WebContents mWebContents;
     private WebContentsObserverAndroid mWebContentsObserver;
 
     private ContentViewClient mContentViewClient;
 
     private ContentSettings mContentSettings;
 
@@ skipping 83 matching lines @@
     private boolean mTouchScrollInProgress;
 
     // The outstanding fling start events that hasn't got fling end yet. It may be > 1 because
     // onNativeFlingStopped() is called asynchronously.
     private int mPotentiallyActiveFlingCount;
 
     private ViewAndroid mViewAndroid;
 
     private SmartClipDataListener mSmartClipDataListener = null;
 
-    private NavigationTransitionDelegate mNavigationTransitionDelegate = null;
-
     // This holds the state of editable text (e.g. contents of <input>, contenteditable) of
     // a focused element.
     // Every time the user, IME, javascript (Blink), autofill etc. modifies the content, the new
     //  state must be reflected to this to keep consistency.
     private final Editable mEditable;
 
     /**
      * PID used to indicate an invalid render process.
      */
     // Keep in sync with the value returned from ContentViewCoreImpl::GetCurrentRendererProcessId()
@@ skipping 521 matching lines @@
                 params.mBaseUrlForDataUrl,
                 params.mVirtualUrlForDataUrl,
                 params.mCanLoadLocalResources,
                 params.mIsRendererInitiated);
     }
 
     /**
      * Stops loading the current web contents.
      */
     public void stopLoading() {
-        if (mWebContents != null) mWebContents.stop();
+        assert mWebContents != null;
+        mWebContents.stop();
     }
 
     /**
      * Get the URL of the current page.
      *
      * @return The URL of the current page.
      */
     public String getUrl() {
-        if (mNativeContentViewCore != 0) return nativeGetURL(mNativeContentViewCore);
-        return null;
+        assert mWebContents != null;
+        return mWebContents.getUrl();
     }
 
     /**
      * Get the title of the current page.
      *
      * @return The title of the current page.
      */
     public String getTitle() {
-        return mWebContents == null ? null : mWebContents.getTitle();
+        assert mWebContents != null;
+        return mWebContents.getTitle();
     }
 
     /**
      * Shows an interstitial page driven by the passed in delegate.
      *
      * @param url The URL being blocked by the interstitial.
      * @param delegate The delegate handling the interstitial.
      */
     @VisibleForTesting
     public void showInterstitialPage(
@@ skipping 429 matching lines @@
                 default:
                     break;
             }
         }
     }
 
     /**
      * Inserts the provided markup sandboxed into the frame.
      */
     public void setupTransitionView(String markup) {
-        if (mNativeContentViewCore == 0) return;
-        nativeSetupTransitionView(mNativeContentViewCore, markup);
+        assert mWebContents != null;
+        mWebContents.setupTransitionView(markup);
     }
 
     /**
      * Hides transition elements specified by the selector, and activates any
      * exiting-transition stylesheets.
      */
     public void beginExitTransition(String cssSelector) {
-        if (mNativeContentViewCore == 0) return;
-        nativeBeginExitTransition(mNativeContentViewCore, cssSelector);
+        assert mWebContents != null;
+        mWebContents.beginExitTransition(cssSelector);
     }
 
     /**
      * Requests the renderer insert a link to the specified stylesheet in the
      * main frame's document.
      */
     public void addStyleSheetByURL(String url) {
         assert mWebContents != null;
         mWebContents.addStyleSheetByURL(url);
     }
@@ skipping 714 matching lines @@
                 if (getContentViewClient().doesPerformWebSearch()) return true;
                 Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
                 intent.putExtra(SearchManager.EXTRA_NEW_SEARCH, true);
                 return getContext().getPackageManager().queryIntentActivities(intent,
                         PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
             }
         };
         mActionMode = null;
         // On ICS, startActionMode throws an NPE when getParent() is null.
         if (mContainerView.getParent() != null) {
+            assert mWebContents != null;
             mActionMode = mContainerView.startActionMode(
                     getContentViewClient().getSelectActionModeCallback(getContext(), actionHandler,
-                            nativeIsIncognito(mNativeContentViewCore)));
+                            mWebContents.isIncognito()));
         }
         mUnselectAllOnActionModeDismiss = true;
         if (mActionMode == null) {
             // There is no ActionMode, so remove the selection.
             mImeAdapter.unselect();
         } else {
             getContentViewClient().onContextualActionBarShown();
         }
     }
 
@@ skipping 895 matching lines @@
     public void setSmartClipDataListener(SmartClipDataListener listener) {
         mSmartClipDataListener = listener;
     }
 
     public void setBackgroundOpaque(boolean opaque) {
         if (mNativeContentViewCore != 0) {
             nativeSetBackgroundOpaque(mNativeContentViewCore, opaque);
         }
     }
 
-    @CalledByNative
-    private void didDeferAfterResponseStarted(String markup, String cssSelector,
-            String enteringColor) {
-        if (mNavigationTransitionDelegate != null ) {
-            mNavigationTransitionDelegate.didDeferAfterResponseStarted(markup,
-                cssSelector, enteringColor);
-        }
-    }
-
-    @CalledByNative
-    public void didStartNavigationTransitionForFrame(long frameId) {
-        if (mNavigationTransitionDelegate != null ) {
-            mNavigationTransitionDelegate.didStartNavigationTransitionForFrame(frameId);
-        }
-    }
-
-    @CalledByNative
-    private boolean willHandleDeferAfterResponseStarted() {
-        if (mNavigationTransitionDelegate == null) return false;
-        return mNavigationTransitionDelegate.willHandleDeferAfterResponseStarted();
-    }
-
     @VisibleForTesting
     void setHasPendingNavigationTransitionForTesting() {

[Yaron, 2014/08/12 17:37:04]

Nit: please remove this accessor and update the test to use WebContents
directly. It's part of the same feature for which you moved all the underlying
code to WebContents.

[AKVT, 2014/08/13 07:11:16]

Done. Thanks.

-        if (mNativeContentViewCore == 0) return;
-        nativeSetHasPendingNavigationTransitionForTesting(mNativeContentViewCore);
-    }
-
-    public void setNavigationTransitionDelegate(NavigationTransitionDelegate delegate) {
-        mNavigationTransitionDelegate = delegate;
-    }
-
-    @CalledByNative
-    private void addEnteringStylesheetToTransition(String stylesheet) {
-        if (mNavigationTransitionDelegate != null ) {
-            mNavigationTransitionDelegate.addEnteringStylesheetToTransition(stylesheet);
-        }
+        assert mWebContents != null;
+        mWebContents.setHasPendingNavigationTransitionForTesting();
     }
 
     /**
      * Offer a long press gesture to the embedding View, primarily for WebView compatibility.
      *
      * @return true if the embedder handled the event.
      */
     private boolean offerLongPressToEmbedder() {
         return mContainerView.performLongClick();
     }
@@ skipping 37 matching lines @@
         mPotentiallyActiveFlingCount--;
         updateGestureStateListener(GestureEventType.FLING_END);
     }
 
     @Override
     public void onScreenOrientationChanged(int orientation) {
         sendOrientationChangeEvent(orientation);
     }
 
     public void resumeResponseDeferredAtStart() {
-        if (mNativeContentViewCore == 0) return;
-        nativeResumeResponseDeferredAtStart(mNativeContentViewCore);
+        assert mWebContents != null;
+        mWebContents.resumeResponseDeferredAtStart();
     }
 
     /**
      * Set whether the ContentViewCore requires the WebContents to be fullscreen in order to lock
      * the screen orientation.
      */
     public void setFullscreenRequiredForOrientationLock(boolean value) {
         mFullscreenRequiredForOrientationLock = value;
     }
 
@@ skipping 14 matching lines @@
             String referrerUrl,
             int referrerPolicy,
             int uaOverrideOption,
             String extraHeaders,
             byte[] postData,
             String baseUrlForDataUrl,
             String virtualUrlForDataUrl,
             boolean canLoadLocalResources,
             boolean isRendererInitiated);
 
-    private native String nativeGetURL(long nativeContentViewCoreImpl);
-
-    private native boolean nativeIsIncognito(long nativeContentViewCoreImpl);
-
     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 42 matching lines @@
             float anchorX, float anchorY, float deltaScale);
 
     private native void nativeSelectBetweenCoordinates(
             long nativeContentViewCoreImpl, float x1, float y1, float x2, float y2);
 
     private native void nativeMoveCaret(long nativeContentViewCoreImpl, float x, float y);
 
     private native void nativeHideTextHandles(long nativeContentViewCoreImpl);
 
     private native void nativeResetGestureDetection(long nativeContentViewCoreImpl);
+
     private native void nativeSetDoubleTapSupportEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
+
     private native void nativeSetMultiTouchZoomSupportEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeSelectPopupMenuItems(long nativeContentViewCoreImpl, int[] indices);
 
     private native void nativeClearHistory(long nativeContentViewCoreImpl);
 
     private native void nativeEvaluateJavaScript(long nativeContentViewCoreImpl,
             String script, JavaScriptCallback callback, boolean startRenderer);
 
     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);
-    private native void nativeSetupTransitionView(long nativeContentViewCoreImpl, String markup);
-    private native void nativeBeginExitTransition(long nativeContentViewCoreImpl,
-            String cssSelector);
-
-    private native void nativeResumeResponseDeferredAtStart(
-            long nativeContentViewCoreImpl);
-    private native void nativeSetHasPendingNavigationTransitionForTesting(
-            long nativeContentViewCoreImpl);
 }