Leak instead of deadlock if executeHardwareAction fails

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

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 832e907200321cd42dd710cb3a134a9cc43d91c3..f6eaa03d8489672c89a226c1365aa98c6c420a89 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -1615,16 +1615,16 @@ public class AwContents {
         mIsAttachedToWindow = false;
         hideAutofillPopup();
         if (mNativeAwContents != 0) {
-            if (mContainerView.isHardwareAccelerated()) {
-                boolean result = mInternalAccessAdapter.executeHardwareAction(new Runnable() {
-                    @Override
-                    public void run() {
-                        nativeReleaseHardwareDrawOnRenderThread(mNativeAwContents);
-                    }
-                });
-                if (!result) {
-                    Log.d(TAG, "executeHardwareAction failed");
+            Runnable releaseHardware = new Runnable() {
+                @Override
+                public void run() {
+                    nativeReleaseHardwareDrawOnRenderThread(mNativeAwContents);
                 }
+            };
+            boolean result = mInternalAccessAdapter.executeHardwareAction(releaseHardware);
+            if (!result) {
+                Log.e(TAG, "May leak or deadlock. Leaked window?");
+                releaseHardware.run();
             }
 
             nativeOnDetachedFromWindow(mNativeAwContents);