[Android] Refactor NativeView to be able to use it for AutofillDialog.

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

 // Copyright (c) 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.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ skipping 33 matching lines @@
 import org.chromium.content.browser.ContentViewGestureHandler.MotionEventDelegate;
 import org.chromium.content.browser.accessibility.AccessibilityInjector;
 import org.chromium.content.browser.input.AdapterInputConnection;
 import org.chromium.content.browser.input.HandleView;
 import org.chromium.content.browser.input.ImeAdapter;
 import org.chromium.content.browser.input.ImeAdapter.AdapterInputConnectionFactory;
 import org.chromium.content.browser.input.InsertionHandleController;
 import org.chromium.content.browser.input.SelectPopupDialog;
 import org.chromium.content.browser.input.SelectionHandleController;
 import org.chromium.content.common.TraceEvent;
-import org.chromium.ui.gfx.NativeWindow;
+import org.chromium.ui.ViewAndroidDelegate;
+import org.chromium.ui.ViewAndroid;
+import org.chromium.ui.gfx.WindowAndroid;
 
 import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
 /**
  * Provides a Java-side 'wrapper' around a WebContent (native) instance.
  * Contains all the major functionality necessary to manage the lifecycle of a ContentView without
  * being tied to the view system.
@@ skipping 176 matching lines @@
     private final Rect mFocusPreOSKViewportRect = new Rect();
 
     private boolean mNeedUpdateOrientationChanged;
 
     // Used to keep track of whether we should try to undo the last zoom-to-textfield operation.
     private boolean mScrolledAndZoomedFocusedEditableNode = false;
 
     // Whether we use hardware-accelerated drawing.
     private boolean mHardwareAccelerated = false;
 
+    private ViewAndroid mViewAndroid;
+
     /**
      * Constructs a new ContentViewCore. Embedders must call initialize() after constructing
      * a ContentViewCore and before using it.
      *
      * @param context The context used to create this.
      * @param personality The type of ContentViewCore being created.
      */
     public ContentViewCore(Context context, int personality) {
         mContext = context;
 
@@ skipping 41 matching lines @@
 
     /**
      * Returns a delegate that can be used to add and remove views from the ContainerView.
      *
      * NOTE: Use with care, as not all ContentViewCore users setup their ContainerView in the same
      * way. In particular, the Android WebView has limitations on what implementation details can
      * be provided via a child view, as they are visible in the API and could introduce
      * compatibility breaks with existing applications. If in doubt, contact the
      * android_webview/OWNERS
      *
-     * @return A ContainerViewDelegate that can be used to add and remove views.
+     * @return A ViewAndroidDelegate that can be used to add and remove views.
      */
-    @CalledByNative
-    public ContainerViewDelegate getContainerViewDelegate() {
-        return new ContainerViewDelegate() {
+    @VisibleForTesting
+    public ViewAndroidDelegate getViewAndroidDelegate() {
+        return new ViewAndroidDelegate() {
             @Override
             public void addViewToContainerView(View view) {
                 mContainerView.addView(view);
             }
 
             @Override
             public void removeViewFromContainerView(View view) {
                 mContainerView.removeView(view);
             }
 
@@ skipping 117 matching lines @@
         }
         return false;
     }
 
     /**
      *
      * @param containerView The view that will act as a container for all views created by this.
      * @param internalDispatcher Handles dispatching all hidden or super methods to the
      *                           containerView.
      * @param nativeWebContents A pointer to the native web contents.
-     * @param nativeWindow An instance of the NativeWindow.
+     * @param windowAndroid An instance of the WindowAndroid.
+     * @param shouldCreateViewAndroid Whether ContentViewCore creates a ViewAndroid object. WebView
+     *                                currently does not create ViewAndroid. If that should change,
+     *                                ViewAndroid should be rewritten to use CleanupReference.
      * @param isAccessFromFileURLsGrantedByDefault Default WebSettings configuration.
      */
     // Perform important post-construction set up of the ContentViewCore.
     // We do not require the containing view in the constructor to allow embedders to create a
     // ContentViewCore without having fully created its containing view. The containing view
     // is a vital component of the ContentViewCore, so embedders must exercise caution in what
     // they do with the ContentViewCore before calling initialize().
     // We supply the nativeWebContents pointer here rather than in the constructor to allow us
     // to set the private browsing mode at a later point for the WebView implementation.
     // Note that the caller remains the owner of the nativeWebContents and is responsible for
     // deleting it after destroying the ContentViewCore.
     public void initialize(ViewGroup containerView, InternalAccessDelegate internalDispatcher,
-            int nativeWebContents, NativeWindow nativeWindow,
+            int nativeWebContents, WindowAndroid windowAndroid, boolean shouldCreateViewAndroid,

[joth, 2013/04/18 01:41:17]

Seems odd to pass in the window here, along with bool on whether to pass the
view.
Couldn't we just pass ViewAndroid, and ask that for its window if needed? the
getViewAndroidDelegate() method could be moved to ContentView just fine (it's
only a wrapper around ContentView, after all) and so ContentView will pass in
the ViewAndroidDelegate() instance.

We need to solve the fact that the windowAndroid will then be null for WebView
too, but that's actually nicer and brings it in line with viewAndroid. We'll
pass NULL across to native side for both, and just deal with the null-pointers
at point of use.

the do-nothing AwWindowAndroid can then be deleted :-)

[aurimas (slooooooooow), 2013/04/18 02:49:57]

Does WebView support JavascriptAppModalDialog or SelectFileDialog? It not I can
go ahead an start passing NULL for windowAndroid and delete AwWindow. 

             boolean isAccessFromFileURLsGrantedByDefault) {
         // Check whether to use hardware acceleration. This is a bit hacky, and
         // only works if the Context is actually an Activity (as it is in the
         // Chrome application).
         //
         // What we're doing here is checking whether the app has *requested*
         // hardware acceleration by setting the appropriate flags. This does not
         // necessarily mean we're going to *get* hardware acceleration -- that's
         // up to the Android framework.
         //
         // TODO(husky): Once the native code has been updated so that the
         // HW acceleration flag can be set dynamically (Grace is doing this),
         // move this check into onAttachedToWindow(), where we can test for
         // HW support directly.
         mHardwareAccelerated = hasHardwareAcceleration(mContext);
 
         // Input events are delivered at vsync time on JB+.
         boolean inputEventsDeliveredAtVSync =
                 (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN);
 
         mContainerView = containerView;
+
+        int viewAndroidNativePointer = 0;
+        if (shouldCreateViewAndroid) {
+            mViewAndroid = new ViewAndroid(windowAndroid, getViewAndroidDelegate());
+            viewAndroidNativePointer = mViewAndroid.getNativePointer();
+        }
+
         mNativeContentViewCore = nativeInit(mHardwareAccelerated, inputEventsDeliveredAtVSync,
-                nativeWebContents, nativeWindow.getNativePointer());
+                nativeWebContents, viewAndroidNativePointer, windowAndroid.getNativePointer());
         mContentSettings = new ContentSettings(
                 this, mNativeContentViewCore, isAccessFromFileURLsGrantedByDefault);
         initializeContainerView(internalDispatcher);
         if (mPersonality == PERSONALITY_VIEW) {
             setAllUserAgentOverridesInHistory();
         }
 
         mAccessibilityInjector = AccessibilityInjector.newInstance(this);
         mAccessibilityInjector.addOrRemoveAccessibilityApisIfNecessary();
 
@@ skipping 131 matching lines @@
     /**
      * Destroy the internal state of the ContentView. This method may only be
      * called after the ContentView has been removed from the view system. No
      * other methods may be called on this ContentView after this method has
      * been called.
      */
     public void destroy() {
         if (mNativeContentViewCore != 0) {
             nativeOnJavaContentViewCoreDestroyed(mNativeContentViewCore);
         }
+        if (mViewAndroid != null) mViewAndroid.destroy();
         mNativeContentViewCore = 0;
         mContentSettings = null;
         mJavaScriptInterfaces.clear();
         mRetainedJavaScriptObjects.clear();
     }
 
     /**
      * Returns true initially, false after destroy() has been called.
      * It is illegal to call any other public method after destroy().
      */
@@ skipping 1984 matching lines @@
             nativeDetachExternalVideoSurface(mNativeContentViewCore, playerId);
         }
     }
 
     @CalledByNative
     private void requestExternalVideoSurface(int playerId) {
         getContentViewClient().onExternalVideoSurfaceRequested(playerId);
     }
 
     private native int nativeInit(boolean hardwareAccelerated, boolean inputEventsDeliveredAtVSync,
-            int webContentsPtr, int windowAndroidPtr);
+            int webContentsPtr, int viewAndroidPtr, int windowAndroidPtr);
 
     private native void nativeOnJavaContentViewCoreDestroyed(int nativeContentViewCoreImpl);
 
     private native void nativeLoadUrl(
             int nativeContentViewCoreImpl,
             String url,
             int loadUrlType,
             int transitionType,
             int uaOverrideOption,
             String extraHeaders,
@@ skipping 148 matching lines @@
             boolean enableHiding, boolean enableShowing, boolean animate);
 
     private native void nativeShowImeIfNeeded(int nativeContentViewCoreImpl);
 
     private native void nativeAttachExternalVideoSurface(
             int nativeContentViewCoreImpl, int playerId, Surface surface);
 
     private native void nativeDetachExternalVideoSurface(
             int nativeContentViewCoreImpl, int playerId);
 }