Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

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

Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index 893fdff624cd83d5cd599ffcea40a6ced86abacc..e99a348c1c9000dca3f2f303c159c22d4631f683 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -5,20 +5,23 @@
 package org.chromium.content.browser;
 
 import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Canvas;
 import android.util.AttributeSet;
-import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.webkit.DownloadListener;
 import android.widget.FrameLayout;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.base.WeakContext;
-import org.chromium.content.app.AppResource;
-import org.chromium.content.common.TraceEvent;
-
-@JNINamespace("content")
-public class ContentView extends FrameLayout {
+/**
+ * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
+ * exposes the various {@link View} functionality to it.
+ *
+ * TODO(joth): Remove any methods overrides from this class that were added for WebView
+ *             compatibility.
+ */
+public class ContentView extends FrameLayout implements ContentViewCore.InternalAccessDelegate {
 
     // The following constants match the ones in chrome/common/page_transition_types.h.
     // Add more if you need them.
@@ -27,14 +30,20 @@ public class ContentView extends FrameLayout {
     public static final int PAGE_TRANSITION_AUTO_BOOKMARK = 2;
     public static final int PAGE_TRANSITION_START_PAGE = 6;
 
-    private static final String TAG = "ContentView";
+    /** Translate the find selection into a normal selection. */
+    public static final int FIND_SELECTION_ACTION_KEEP_SELECTION =
+            ContentViewCore.FIND_SELECTION_ACTION_KEEP_SELECTION;
+    /** Clear the find selection. */
+    public static final int FIND_SELECTION_ACTION_CLEAR_SELECTION =
+            ContentViewCore.FIND_SELECTION_ACTION_CLEAR_SELECTION;
+    /** Focus and click the selected node (for links). */
+    public static final int FIND_SELECTION_ACTION_ACTIVATE_SELECTION =
+            ContentViewCore.FIND_SELECTION_ACTION_ACTIVATE_SELECTION;
 
-    // Personality of the ContentView.
-    private int mPersonality;
     // Used when ContentView implements a standalone View.
-    public static final int PERSONALITY_VIEW = 0;
+    public static final int PERSONALITY_VIEW = ContentViewCore.PERSONALITY_VIEW;
     // Used for Chrome.
-    public static final int PERSONALITY_CHROME = 1;
+    public static final int PERSONALITY_CHROME = ContentViewCore.PERSONALITY_CHROME;
 
     /**
      * Automatically decide the number of renderer processes to use based on device memory class.
@@ -45,40 +54,10 @@ public class ContentView extends FrameLayout {
      */
     public static final int MAX_RENDERERS_SINGLE_PROCESS =
             AndroidBrowserProcess.MAX_RENDERERS_SINGLE_PROCESS;
-
-    // Used to avoid enabling zooming in / out in WebView zoom controls
-    // if resulting zooming will produce little visible difference.
-    private static float WEBVIEW_ZOOM_CONTROLS_EPSILON = 0.007f;
-
-    // content_view_client.cc depends on ContentView.java holding a ref to the current client
-    // instance since the native side only holds a weak pointer to the client. We chose this
-    // solution over the managed object owning the C++ object's memory since it's a lot simpler
-    // in terms of clean up.
-    private ContentViewClient mContentViewClient;
-
-    private ContentSettings mContentSettings;
-
-    // Native pointer to C++ ContentView object which will be set by nativeInit()
-    private int mNativeContentView = 0;
-
-    private ZoomManager mZoomManager;
-
-    // Cached page scale factor from native
-    private float mNativePageScaleFactor = 1.0f;
-    private float mNativeMinimumScale = 1.0f;
-    private float mNativeMaximumScale = 1.0f;
-
-    // TODO(klobag): this is to avoid a bug in GestureDetector. With multi-touch,
-    // mAlwaysInTapRegion is not reset. So when the last finger is up, onSingleTapUp()
-    // will be mistakenly fired.
-    private boolean mIgnoreSingleTap;
-
-    // The legacy webview DownloadListener.
-    private DownloadListener mDownloadListener;
-    // ContentViewDownloadDelegate adds support for authenticated downloads
-    // and POST downloads. Embedders should prefer ContentViewDownloadDelegate
-    // over DownloadListener.
-    private ContentViewDownloadDelegate mDownloadDelegate;
+    /**
+     * Cap on the maximum number of renderer processes that can be requested.
+     */
+    public static final int MAX_RENDERERS_LIMIT = AndroidBrowserProcess.MAX_RENDERERS_LIMIT;
 
     /**
      * Enable multi-process ContentView. This should be called by the application before
@@ -96,69 +75,66 @@ public class ContentView extends FrameLayout {
      * maximum number of allowed renderers is capped by MAX_RENDERERS_LIMIT.
      */
     public static void enableMultiProcess(Context context, int maxRendererProcesses) {
-        AndroidBrowserProcess.initContentViewProcess(context, maxRendererProcesses);
+        ContentViewCore.enableMultiProcess(context, maxRendererProcesses);
     }
 
+    /**
+     * Initialize the process as the platform browser. This must be called before accessing
+     * ContentView in order to treat this as a Chromium browser process.
+     *
+     * @param context Context used to obtain the application context.
+     * @param maxRendererProcesses Same as ContentView.enableMultiProcess()
+     * @hide Only used by the platform browser.
+     */
+    public static void initChromiumBrowserProcess(Context context, int maxRendererProcesses) {
+        ContentViewCore.initChromiumBrowserProcess(context, maxRendererProcesses);
+    }
+
+    private ContentViewCore mContentViewCore;
+
     public ContentView(Context context, int nativeWebContents, int personality) {
         this(context, nativeWebContents, null, android.R.attr.webViewStyle, personality);
     }
 
+    public ContentView(Context context, int nativeWebContents, AttributeSet attrs) {
+        // TODO(klobag): use the WebViewStyle as the default style for now. It enables scrollbar.
+        // When ContentView is moved to framework, we can define its own style in the res.
+        this(context, nativeWebContents, attrs, android.R.attr.webViewStyle);
+    }
+
+    public ContentView(Context context, int nativeWebContents, AttributeSet attrs, int defStyle) {
+        this(context, nativeWebContents, attrs, defStyle, PERSONALITY_VIEW);
+    }
+
     private ContentView(Context context, int nativeWebContents, AttributeSet attrs, int defStyle,
             int personality) {
         super(context, attrs, defStyle);
 
-        WeakContext.initializeWeakContext(context);
-        // By default, ContentView will initialize single process mode. The call to
-        // initContentViewProcess below is ignored if either the ContentView host called
-        // enableMultiProcess() or the platform browser called initChromiumBrowserProcess().
-        AndroidBrowserProcess.initContentViewProcess(context, MAX_RENDERERS_SINGLE_PROCESS);
-
-        initialize(context, nativeWebContents, personality);
+        mContentViewCore = new ContentViewCore(context, this, this, nativeWebContents, personality);
     }
 
-    // TODO(jrg): incomplete; upstream the rest of this method.
-    private void initialize(Context context, int nativeWebContents, int personality) {
-        mNativeContentView = nativeInit(nativeWebContents);
-
-        mPersonality = personality;
-        mContentSettings = new ContentSettings(this, mNativeContentView);
-
-        initGestureDetectors(context);
-
-        Log.i(TAG, "mNativeContentView=0x"+ Integer.toHexString(mNativeContentView));
+    /**
+     * @return The core component of the ContentView that handles JNI communication.  Should only be
+     *         used for passing to native.
+     */
+    public ContentViewCore getContentViewCore() {
+        return mContentViewCore;
     }
 
     /**
      * @return Whether the configured personality of this ContentView is {@link #PERSONALITY_VIEW}.
      */
     boolean isPersonalityView() {
-        switch (mPersonality) {
-            case PERSONALITY_VIEW:
-                return true;
-            case PERSONALITY_CHROME:
-                return false;
-            default:
-                Log.e(TAG, "Unknown ContentView personality: " + mPersonality);
-                return false;
-        }
+        return mContentViewCore.isPersonalityView();
     }
 
-
     /**
      * Destroy the internal state of the WebView. This method may only be called
      * after the WebView has been removed from the view system. No other methods
      * may be called on this WebView after this method has been called.
      */
-    // TODO(jrg): incomplete; upstream the rest of this method.
     public void destroy() {
-        if (mNativeContentView != 0) {
-            nativeDestroy(mNativeContentView);
-            mNativeContentView = 0;
-        }
-        if (mContentSettings != null) {
-            mContentSettings.destroy();
-            mContentSettings = null;
-        }
+        mContentViewCore.destroy();
     }
 
     /**
@@ -166,30 +142,24 @@ public class ContentView extends FrameLayout {
      * It is illegal to call any other public method after destroy().
      */
     public boolean isAlive() {
-        return mNativeContentView != 0;
+        return mContentViewCore.isAlive();
+    }
+
+    /**
+     * For internal use. Throws IllegalStateException if mNativeContentView is 0.
+     * Use this to ensure we get a useful Java stack trace, rather than a native
+     * crash dump, from use-after-destroy bugs in Java code.
+     */
+    void checkIsAlive() throws IllegalStateException {
+        mContentViewCore.checkIsAlive();
     }
 
     public void setContentViewClient(ContentViewClient client) {
-        if (client == null) {
-            throw new IllegalArgumentException("The client can't be null.");
-        }
-        mContentViewClient = client;
-        if (mNativeContentView != 0) {
-            nativeSetClient(mNativeContentView, mContentViewClient);
-        }
+        mContentViewCore.setContentViewClient(client);
     }
 
     ContentViewClient getContentViewClient() {
-        if (mContentViewClient == null) {
-            // We use the Null Object pattern to avoid having to perform a null check in this class.
-            // We create it lazily because most of the time a client will be set almost immediately
-            // after ContentView is created.
-            mContentViewClient = new ContentViewClient();
-            // We don't set the native ContentViewClient pointer here on purpose. The native
-            // implementation doesn't mind a null delegate and using one is better than passing a
-            // Null Object, since we cut down on the number of JNI calls.
-        }
-        return mContentViewClient;
+        return mContentViewCore.getContentViewClient();
     }
 
     /**
@@ -214,33 +184,18 @@ public class ContentView extends FrameLayout {
      *                       omnibox can report suggestions correctly.
      */
     public void loadUrlWithoutUrlSanitization(String url, int pageTransition) {
-        if (mNativeContentView != 0) {
-            if (isPersonalityView()) {
-                nativeLoadUrlWithoutUrlSanitizationWithUserAgentOverride(
-                        mNativeContentView,
-                        url,
-                        pageTransition,
-                        mContentSettings.getUserAgentString());
-            } else {
-                // Chrome stores overridden UA strings in navigation history
-                // items, so they stay the same on going back / forward.
-                nativeLoadUrlWithoutUrlSanitization(
-                        mNativeContentView,
-                        url,
-                        pageTransition);
-            }
-        }
+        mContentViewCore.loadUrlWithoutUrlSanitization(url, pageTransition);
     }
 
     void setAllUserAgentOverridesInHistory() {
-        // TODO(tedchoc): Pass user agent override down to native.
+        mContentViewCore.setAllUserAgentOverridesInHistory();
     }
 
     /**
      * Stops loading the current web contents.
      */
     public void stopLoading() {
-        if (mNativeContentView != 0) nativeStopLoading(mNativeContentView);
+        mContentViewCore.stopLoading();
     }
 
     /**
@@ -249,8 +204,7 @@ public class ContentView extends FrameLayout {
      * @return The URL of the current page.
      */
     public String getUrl() {
-        if (mNativeContentView != 0) return nativeGetURL(mNativeContentView);
-        return null;
+        return mContentViewCore.getUrl();
     }
 
     /**
@@ -259,32 +213,28 @@ public class ContentView extends FrameLayout {
      * @return The title of the current page.
      */
     public String getTitle() {
-        if (mNativeContentView != 0) return nativeGetTitle(mNativeContentView);
-        return null;
+        return mContentViewCore.getTitle();
     }
 
     /**
      * @return The load progress of current web contents (range is 0 - 100).
      */
     public int getProgress() {
-        if (mNativeContentView != 0) {
-            return (int) (100.0 * nativeGetLoadProgress(mNativeContentView));
-        }
-        return 100;
+        return mContentViewCore.getProgress();
     }
 
     /**
      * @return Whether the current WebContents has a previous navigation entry.
      */
     public boolean canGoBack() {
-        return mNativeContentView != 0 && nativeCanGoBack(mNativeContentView);
+        return mContentViewCore.canGoBack();
     }
 
     /**
      * @return Whether the current WebContents has a navigation entry after the current one.
      */
     public boolean canGoForward() {
-        return mNativeContentView != 0 && nativeCanGoForward(mNativeContentView);
+        return mContentViewCore.canGoForward();
     }
 
     /**
@@ -292,7 +242,7 @@ public class ContentView extends FrameLayout {
      * @return Whether we can move in history by given offset
      */
     public boolean canGoToOffset(int offset) {
-        return mNativeContentView != 0 && nativeCanGoToOffset(mNativeContentView, offset);
+        return mContentViewCore.canGoToOffset(offset);
     }
 
     /**
@@ -301,28 +251,28 @@ public class ContentView extends FrameLayout {
      * @param offset The offset into the navigation history.
      */
     public void goToOffset(int offset) {
-        if (mNativeContentView != 0) nativeGoToOffset(mNativeContentView, offset);
+        mContentViewCore.goToOffset(offset);
     }
 
     /**
      * Goes to the navigation entry before the current one.
      */
     public void goBack() {
-        if (mNativeContentView != 0) nativeGoBack(mNativeContentView);
+        mContentViewCore.goBack();
     }
 
     /**
      * Goes to the navigation entry following the current one.
      */
     public void goForward() {
-        if (mNativeContentView != 0) nativeGoForward(mNativeContentView);
+        mContentViewCore.goForward();
     }
 
     /**
      * Reload the current page.
      */
     public void reload() {
-        if (mNativeContentView != 0) nativeReload(mNativeContentView);
+        mContentViewCore.reload();
     }
 
     /**
@@ -330,29 +280,25 @@ public class ContentView extends FrameLayout {
      * directions.
      */
     public void clearHistory() {
-        if (mNativeContentView != 0) nativeClearHistory(mNativeContentView);
+        mContentViewCore.clearHistory();
     }
 
     /**
      * Start pinch zoom. You must call {@link #pinchEnd} to stop.
      */
     void pinchBegin(long timeMs, int x, int y) {
-        if (mNativeContentView != 0) {
-            // TODO(tedchoc): Pass pinch begin to native.
-        }
+        mContentViewCore.pinchBegin(timeMs, x, y);
     }
 
     /**
      * Stop pinch zoom.
      */
     void pinchEnd(long timeMs) {
-        if (mNativeContentView != 0) {
-            // TODO(tedchoc): Pass pinch end to native.
-        }
+        mContentViewCore.pinchEnd(timeMs);
     }
 
     void setIgnoreSingleTap(boolean value) {
-        mIgnoreSingleTap = value;
+        mContentViewCore.setIgnoreSingleTap(value);
     }
 
     /**
@@ -368,9 +314,7 @@ public class ContentView extends FrameLayout {
      *            coordinate.
      */
     void pinchBy(long timeMs, int anchorX, int anchorY, float delta) {
-        if (mNativeContentView != 0) {
-            // TODO(tedchoc): Pass pinch by to native.
-        }
+        mContentViewCore.pinchBy(timeMs, anchorX, anchorY, delta);
     }
 
     /**
@@ -384,26 +328,41 @@ public class ContentView extends FrameLayout {
      *         settings.
      */
     public ContentSettings getContentSettings() {
-        return mContentSettings;
+        return mContentViewCore.getContentSettings();
+    }
+
+    // FrameLayout overrides.
+
+    // Needed by ContentViewCore.InternalAccessDelegate
+    @Override
+    public boolean drawChild(Canvas canvas, View child, long drawingTime) {
+        return super.drawChild(canvas, child, drawingTime);
     }
 
-    private void initGestureDetectors(final Context context) {
-        try {
-            TraceEvent.begin();
-            // TODO(tedchoc): Upstream the rest of the initialization.
-            mZoomManager = new ZoomManager(context, this);
-            mZoomManager.updateMultiTouchSupport();
-        } finally {
-            TraceEvent.end();
-        }
+    // Needed by ContentViewCore.InternalAccessDelegate
+    @Override
+    public void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+    }
+
+    // End FrameLayout overrides.
+
+    @Override
+    public boolean awakenScrollBars(int startDelay, boolean invalidate) {
+        return mContentViewCore.awakenScrollBars(startDelay, invalidate);
+    }
+
+    @Override
+    public boolean awakenScrollBars() {
+        return super.awakenScrollBars();
     }
 
     void updateMultiTouchZoomSupport() {
-        mZoomManager.updateMultiTouchSupport();
+        mContentViewCore.updateMultiTouchZoomSupport();
     }
 
     public boolean isMultiTouchZoomSupported() {
-        return mZoomManager.isMultiTouchZoomSupported();
+        return mContentViewCore.isMultiTouchZoomSupported();
     }
 
     /**
@@ -417,12 +376,12 @@ public class ContentView extends FrameLayout {
     // fact that a ContentViewDownloadDelegate will be used in preference to a
     // DownloadListener.
     public void setDownloadListener(DownloadListener listener) {
-        mDownloadListener = listener;
+        mContentViewCore.setDownloadListener(listener);
     }
 
     // Called by DownloadController.
     DownloadListener downloadListener() {
-        return mDownloadListener;
+        return mContentViewCore.downloadListener();
     }
 
     /**
@@ -433,27 +392,26 @@ public class ContentView extends FrameLayout {
      * @param listener An implementation of ContentViewDownloadDelegate.
      */
     public void setDownloadDelegate(ContentViewDownloadDelegate delegate) {
-        mDownloadDelegate = delegate;
+        mContentViewCore.setDownloadDelegate(delegate);
     }
 
     // Called by DownloadController.
     ContentViewDownloadDelegate getDownloadDelegate() {
-        return mDownloadDelegate;
+        return mContentViewCore.getDownloadDelegate();
     }
 
     /**
      * @return Whether the native ContentView has crashed.
      */
     public boolean isCrashed() {
-        if (mNativeContentView == 0) return false;
-        return nativeCrashed(mNativeContentView);
+        return mContentViewCore.isCrashed();
     }
 
     /**
      * @return Whether a reload happens when this ContentView is activated.
      */
     public boolean needsReload() {
-        return mNativeContentView != 0 && nativeNeedsReload(mNativeContentView);
+        return mContentViewCore.needsReload();
     }
 
     /**
@@ -464,7 +422,7 @@ public class ContentView extends FrameLayout {
     // This method uses the term 'zoom' for legacy reasons, but relates
     // to what chrome calls the 'page scale factor'.
     public boolean canZoomIn() {
-        return mNativeMaximumScale - mNativePageScaleFactor > WEBVIEW_ZOOM_CONTROLS_EPSILON;
+        return mContentViewCore.canZoomIn();
     }
 
     /**
@@ -475,7 +433,7 @@ public class ContentView extends FrameLayout {
     // This method uses the term 'zoom' for legacy reasons, but relates
     // to what chrome calls the 'page scale factor'.
     public boolean canZoomOut() {
-        return mNativePageScaleFactor - mNativeMinimumScale > WEBVIEW_ZOOM_CONTROLS_EPSILON;
+        return mContentViewCore.canZoomOut();
     }
 
     /**
@@ -487,24 +445,7 @@ public class ContentView extends FrameLayout {
     // This method uses the term 'zoom' for legacy reasons, but relates
     // to what chrome calls the 'page scale factor'.
     public boolean zoomIn() {
-        if (!canZoomIn()) {
-            return false;
-        }
-
-        if (mNativeContentView == 0) {
-            return false;
-        }
-
-        long timeMs = System.currentTimeMillis();
-        int x = getWidth() / 2;
-        int y = getHeight() / 2;
-        float delta = 1.25f;
-
-        pinchBegin(timeMs, x, y);
-        pinchBy(timeMs, x, y, delta);
-        pinchEnd(timeMs);
-
-        return true;
+        return mContentViewCore.zoomIn();
     }
 
     /**
@@ -516,93 +457,55 @@ public class ContentView extends FrameLayout {
     // This method uses the term 'zoom' for legacy reasons, but relates
     // to what chrome calls the 'page scale factor'.
     public boolean zoomOut() {
-        if (!canZoomOut()) {
-            return false;
-        }
-
-        if (mNativeContentView == 0) {
-            return false;
-        }
-
-        long timeMs = System.currentTimeMillis();
-        int x = getWidth() / 2;
-        int y = getHeight() / 2;
-        float delta = 0.8f;
-
-        pinchBegin(timeMs, x, y);
-        pinchBy(timeMs, x, y, delta);
-        pinchEnd(timeMs);
-
-        return true;
+        return mContentViewCore.zoomOut();
     }
 
     // Invokes the graphical zoom picker widget for this ContentView.
     public void invokeZoomPicker() {
-        if (mContentSettings.supportZoom()) {
-            mZoomManager.invokeZoomPicker();
-        }
+        mContentViewCore.invokeZoomPicker();
     }
 
     // Unlike legacy WebView getZoomControls which returns external zoom controls,
     // this method returns built-in zoom controls. This method is used in tests.
     public View getZoomControlsForTest() {
-        return mZoomManager.getZoomControlsViewForTest();
+        return mContentViewCore.getZoomControlsForTest();
     }
 
-    @CalledByNative
-    private void startContentIntent(String contentUrl) {
-        getContentViewClient().onStartContentIntent(getContext(), contentUrl);
-    }
-
-
-    /**
-     * Initialize the ContentView native side.
-     * Should be called with a valid native WebContents.
-     * If nativeInitProcess is never called, the first time this method is called, nativeInitProcess
-     * will be called implicitly with the default settings.
-     * @param webContentsPtr the ContentView does not create a new native WebContents and uses
-     *                       the provided one.
-     * @return a native pointer to the native ContentView object.
-     */
-    private native int nativeInit(int webContentsPtr);
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    //              Start Implementation of ContentViewCore.InternalAccessDelegate               //
+    ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    private native void nativeDestroy(int nativeContentViewImpl);
-
-    private native void nativeLoadUrlWithoutUrlSanitization(int nativeContentViewImpl,
-            String url, int pageTransition);
-    private native void nativeLoadUrlWithoutUrlSanitizationWithUserAgentOverride(
-            int nativeContentViewImpl, String url, int pageTransition, String userAgentOverride);
-
-    private native String nativeGetURL(int nativeContentViewImpl);
-
-    private native String nativeGetTitle(int nativeContentViewImpl);
-
-    private native double nativeGetLoadProgress(int nativeContentViewImpl);
-
-    private native boolean nativeIsIncognito(int nativeContentViewImpl);
-
-    // Returns true if the native side crashed so that java side can draw a sad tab.
-    private native boolean nativeCrashed(int nativeContentViewImpl);
-
-    private native boolean nativeCanGoBack(int nativeContentViewImpl);
-
-    private native boolean nativeCanGoForward(int nativeContentViewImpl);
-
-    private native boolean nativeCanGoToOffset(int nativeContentViewImpl, int offset);
-
-    private native void nativeGoToOffset(int nativeContentViewImpl, int offset);
-
-    private native void nativeGoBack(int nativeContentViewImpl);
+    @Override
+    public boolean super_onKeyUp(int keyCode, KeyEvent event) {
+        return super.onKeyUp(keyCode, event);
+    }
 
-    private native void nativeGoForward(int nativeContentViewImpl);
+    @Override
+    public boolean super_dispatchKeyEventPreIme(KeyEvent event) {
+        return super.dispatchKeyEventPreIme(event);
+    }
 
-    private native void nativeStopLoading(int nativeContentViewImpl);
+    @Override
+    public boolean super_dispatchKeyEvent(KeyEvent event) {
+        return super.dispatchKeyEvent(event);
+    }
 
-    private native void nativeReload(int nativeContentViewImpl);
+    @Override
+    public boolean super_onGenericMotionEvent(MotionEvent event) {
+        return super.onGenericMotionEvent(event);
+    }
 
-    private native void nativeSetClient(int nativeContentViewImpl, ContentViewClient client);
+    @Override
+    public void super_onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
 
-    private native boolean nativeNeedsReload(int nativeContentViewImpl);
+    @Override
+    public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
+        return super.awakenScrollBars(startDelay, invalidate);
+    }
 
-    private native void nativeClearHistory(int nativeContentViewImpl);
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    //                End Implementation of ContentViewCore.InternalAccessDelegate               //
+    ///////////////////////////////////////////////////////////////////////////////////////////////
 }