Implement clearView to match classic

android_webview/java/src/org/chromium/android_webview/AwContents.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.android_webview;
 
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ skipping 162 matching lines @@
 
     private DefaultVideoPosterRequestHandler mDefaultVideoPosterRequestHandler;
 
     // Bound method for suppling Picture instances to the AwContentsClient. Will be null if the
     // picture listener API has not yet been enabled, or if it is using invalidation-only mode.
     private Callable<Picture> mPictureListenerContentProvider;
 
     private boolean mContainerViewFocused;
     private boolean mWindowFocused;
 
+    private boolean mClearViewActive;
+    private boolean mPictureListenerEnabled;
+
     private AwAutofillManagerDelegate mAwAutofillManagerDelegate;
 
     private static final class DestroyRunnable implements Runnable {
         private int mNativeAwContents;
         private DestroyRunnable(int nativeAwContents) {
             mNativeAwContents = nativeAwContents;
         }
         @Override
         public void run() {
             // This is a no-op if not currently attached.
@@ skipping 494 matching lines @@
     // Only valid within onDraw().
     private final Rect mClipBoundsTemporary = new Rect();
 
     public void onDraw(Canvas canvas) {
         if (mNativeAwContents == 0) {
             canvas.drawColor(getEffectiveBackgroundColor());
             return;
         }
 
         mScrollOffsetManager.syncScrollOffsetFromOnDraw();
+        canvas.getClipBounds(mClipBoundsTemporary);
 
-        canvas.getClipBounds(mClipBoundsTemporary);
-        if (!nativeOnDraw(mNativeAwContents, canvas, canvas.isHardwareAccelerated(),
-                    mContainerView.getScrollX(), mContainerView.getScrollY(),
-                    mClipBoundsTemporary.left, mClipBoundsTemporary.top,
-                    mClipBoundsTemporary.right, mClipBoundsTemporary.bottom)) {
+        if (mClearViewActive) {
+            canvas.drawColor(getEffectiveBackgroundColor());
+        } else if (!nativeOnDraw(mNativeAwContents, canvas, canvas.isHardwareAccelerated(),
+                mContainerView.getScrollX(), mContainerView.getScrollY(),
+                mClipBoundsTemporary.left, mClipBoundsTemporary.top,
+                mClipBoundsTemporary.right, mClipBoundsTemporary.bottom)) {
             Log.w(TAG, "nativeOnDraw failed; clearing to background color.");
             canvas.drawColor(getEffectiveBackgroundColor());
         }
 
         if (mOverScrollGlow != null && mOverScrollGlow.drawEdgeGlows(canvas,
                     mScrollOffsetManager.computeMaximumHorizontalScrollOffset(),
                     mScrollOffsetManager.computeMaximumVerticalScrollOffset())) {
             mContainerView.invalidate();
         }
     }
 
     public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         mLayoutSizer.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
     public int getContentHeightCss() {
         return (int) Math.ceil(mContentViewCore.getContentHeightCss());
     }
 
     public int getContentWidthCss() {
         return (int) Math.ceil(mContentViewCore.getContentWidthCss());
     }
 
     public Picture capturePicture() {
         return new AwPicture(nativeCapturePicture(mNativeAwContents,
                     mScrollOffsetManager.computeHorizontalScrollRange(),
                     mScrollOffsetManager.computeVerticalScrollRange()));
     }
 
+    public void clearView() {
+        mClearViewActive = true;
+        nativeEnableOnNewPicture(mNativeAwContents, true);

[joth, 2013/08/16 21:41:04]

invalidate();

[Kristian Monsen, 2013/08/16 22:57:10]

Done.

+    }
+
     /**
      * Enable the onNewPicture callback.
      * @param enabled Flag to enable the callback.
      * @param invalidationOnly Flag to call back only on invalidation without providing a picture.
      */
     public void enableOnNewPicture(boolean enabled, boolean invalidationOnly) {
         if (invalidationOnly) {
             mPictureListenerContentProvider = null;
         } else if (enabled && mPictureListenerContentProvider == null) {
             mPictureListenerContentProvider = new Callable<Picture>() {
                 @Override
                 public Picture call() {
                     return capturePicture();
                 }
             };
         }
+        mPictureListenerEnabled = enabled;
+        if (mClearViewActive) {
+            enabled = true;
+        }
         nativeEnableOnNewPicture(mNativeAwContents, enabled);

[joth, 2013/08/16 21:41:04]

suggest collecting all three nativeEnableOnNewPicture() calls into a single
make-it-so method:

syncOnNewPictureStateToNative() {
  nativeEnableOnNewPicture(mNativeAwContents, mPictureListenerEnabled ||
mClearViewActive);

[Kristian Monsen, 2013/08/16 22:57:10]

Done.

     }
 
     public void findAllAsync(String searchString) {
         if (mNativeAwContents == 0) return;
         nativeFindAllAsync(mNativeAwContents, searchString);
     }
 
     public void findNext(boolean forward) {
         if (mNativeAwContents == 0) return;
         nativeFindNext(mNativeAwContents, forward);
@@ skipping 919 matching lines @@
     }
 
     @CalledByNative
     public void onFindResultReceived(int activeMatchOrdinal, int numberOfMatches,
             boolean isDoneCounting) {
         mContentsClient.onFindResultReceived(activeMatchOrdinal, numberOfMatches, isDoneCounting);
     }
 
     @CalledByNative
     public void onNewPicture() {
+        // Clear up any results from a previous clearView call
+        mClearViewActive = false;

[joth, 2013/08/16 21:41:04]

if (mClearViewActive) {
  invalidate();
  mClearViewActive = false;
  syncOnNewPictureStateToNative();
}

could even change the last line to:
  if (!mPictureListenerEnabled) {
    syncOnNewPictureStateToNative();
    return;
  }

[Kristian Monsen, 2013/08/16 22:57:10]

Done.

+        nativeEnableOnNewPicture(mNativeAwContents, mPictureListenerEnabled);
+
         // Don't call capturePicture() here but instead defer it until the posted task runs within
         // the callback helper, to avoid doubling back into the renderer compositor in the middle
         // of the notification it is sending up to here.
         mContentsClient.getCallbackHelper().postOnNewPicture(mPictureListenerContentProvider);
     }
 
     // Called as a result of nativeUpdateLastHitTestData.
     @CalledByNative
     private void updateHitTestData(
             int type, String extra, String href, String anchorText, String imgSrc) {
@@ skipping 170 matching lines @@
     private native void nativeFocusFirstNode(int nativeAwContents);
     private native void nativeSetBackgroundColor(int nativeAwContents, int color);
 
     private native int nativeGetAwDrawGLViewContext(int nativeAwContents);
     private native int nativeCapturePicture(int nativeAwContents, int width, int height);
     private native void nativeEnableOnNewPicture(int nativeAwContents, boolean enabled);
 
     private native void nativeInvokeGeolocationCallback(
             int nativeAwContents, boolean value, String requestingFrame);
 }