Add requestDrawGL method in InternalAccessDelegate

so, compositor (via AwContents) can request a GL functor callback outside of draw cycle.

BUG=233284

Review URL: https://chromiumcodereview.appspot.com/13877017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195746 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -91,6 +91,17 @@ public interface InternalAccessDelegate extends ContentViewCore.InternalAccessDe
          * @see View#setMeasuredDimension(int, int)
          */
         void setMeasuredDimension(int measuredWidth, int measuredHeight);
+
+        /**
+         * Requests a callback on the native DrawGL method (see getAwDrawGLFunction)
+         * if called from within onDraw, |canvas| will be non-null and hardware accelerated.
+         * otherwise, |canvas| will be null, and the container view itself will be hardware
+         * accelerated.
+         *
+         * @return false indicates the GL draw request was not accepted, and the caller
+         *         should fallback to the SW path.
+         */
+        boolean requestDrawGL(Canvas canvas);
     }
 
     private int mNativeAwContents;
@@ -390,6 +401,7 @@ public int getAwDrawGLViewContext() {
         return nativeGetAwDrawGLViewContext(mNativeAwContents);
     }
 
+    // TODO(michaelbai) : Remove this method once it is not called.
     public boolean onPrepareDrawGL(Canvas canvas) {
         if (mNativeAwContents == 0) return false;
         nativeSetScrollForHWFrame(mNativeAwContents,
@@ -401,6 +413,10 @@ public boolean onPrepareDrawGL(Canvas canvas) {
 
     public void onDraw(Canvas canvas) {
         if (mNativeAwContents == 0) return;
+        if (canvas.isHardwareAccelerated() && onPrepareDrawGL(canvas) &&
+                mInternalAccessAdapter.requestDrawGL(canvas)) {
+            return;
+        }
         Rect clip = canvas.getClipBounds();
         if (!nativeDrawSW(mNativeAwContents, canvas, clip.left, clip.top,
                 clip.right - clip.left, clip.bottom - clip.top)) {

android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java

@@ -173,5 +173,10 @@ public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
         public void setMeasuredDimension(int measuredWidth, int measuredHeight) {
             AwTestContainerView.super.setMeasuredDimension(measuredWidth, measuredHeight);
         }
+
+        @Override
+        public boolean requestDrawGL(Canvas canvas) {
+            return false;
+        }
     }
 }