aw: Fix HardwareView for instrumentation tests

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

Index: android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
index 3c64b658c3acc7f3fda1337de1376fe3a0a691b3..34094efb5b6790f4f51b10ce42ef6310f9d324d2 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
@@ -52,6 +52,7 @@ public class AwTestContainerView extends FrameLayout {
         // and drawGL on the rendering thread. The variables following
         // are protected by it.
         private final Object mSyncLock = new Object();
+        private boolean mFunctorAttached = false;
         private boolean mNeedsProcessGL = false;
         private boolean mNeedsDrawGL = false;
         private boolean mWaitForCompletion = false;
@@ -135,9 +136,19 @@ public class AwTestContainerView extends FrameLayout {
             }
         }
 
+        public void detachGLFunctor() {
+            synchronized (mSyncLock) {
+                mFunctorAttached = false;
+                mNeedsProcessGL = false;
+                mNeedsDrawGL = false;
+                mWaitForCompletion = false;
+            }
+        }
+
         public void requestRender(Canvas canvas, boolean waitForCompletion) {
             synchronized (mSyncLock) {
                 super.requestRender();
+                mFunctorAttached = true;
                 mWaitForCompletion = waitForCompletion;
                 if (canvas == null) {
                     mNeedsProcessGL = true;
@@ -173,6 +184,11 @@ public class AwTestContainerView extends FrameLayout {
             final boolean waitForCompletion;
 
             synchronized (mSyncLock) {
+                if (!mFunctorAttached) {
+                    mSyncLock.notifyAll();
+                    return;
+                }
+
                 draw = mNeedsDrawGL;
                 process = mNeedsProcessGL;
                 waitForCompletion = mWaitForCompletion;
@@ -204,14 +220,25 @@ public class AwTestContainerView extends FrameLayout {
         }
     }
 
+    private static boolean sCreatedOnce = false;
+    private HardwareView createHardwareViewOnlyOnce(Context context) {
+        if (sCreatedOnce) return null;
+        sCreatedOnce = true;
+        return new HardwareView(context);
+    }
+
     public AwTestContainerView(Context context, boolean hardwareAccelerated) {

[hush (inactive), 2014/09/23 20:41:02]

so even you pass hardwareAccelerated to be true here, you may not get a hardware
enabled AwTestContainerView returned to you.
I'm not sure if there are any current instrumentation tests that assume hardware
acceleration to be on that will be broken by this.

[boliu, 2014/09/23 20:42:32]

All instrumentation tests are software only right now:
https://code.google.com/p/chromium/codesearch#chromium/src/android_webview/ja...

         super(context);
         if (hardwareAccelerated) {
-            mHardwareView = new HardwareView(context);
+            mHardwareView = createHardwareViewOnlyOnce(context);
+        }
+        if (mHardwareView != null) {
             addView(mHardwareView,
                     new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
+        } else {
+          setLayerType(LAYER_TYPE_SOFTWARE, null);
         }
         mNativeGLDelegate = new NativeGLDelegate();
         mInternalAccessDelegate = new InternalAccessAdapter();
@@ -396,7 +423,7 @@ public class AwTestContainerView extends FrameLayout {
 
         @Override
         public void detachGLFunctor() {
-            // Intentional no-op.
+            if (mHardwareView != null) mHardwareView.detachGLFunctor();
         }
     }