Disable video overlay for WebView

android_webview/java/src/org/chromium/android_webview/AwSettings.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.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Handler;
@@ skipping 69 matching lines @@
     private boolean mUseWideViewport = false;
     private boolean mZeroLayoutHeightDisablesViewportQuirk = false;
     private boolean mForceZeroLayoutHeight = false;
     private boolean mLoadWithOverviewMode = false;
     private boolean mMediaPlaybackRequiresUserGesture = true;
     private String mDefaultVideoPosterURL;
     private float mInitialPageScalePercent = 0;
     private boolean mSpatialNavigationEnabled;  // Default depends on device features.
     private boolean mEnableSupportedHardwareAcceleratedFeatures = false;
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
-    private boolean mVideoOverlayForEmbeddedVideoEnabled = false;
+
     private boolean mForceVideoOverlayForTests = false;
     private boolean mOffscreenPreRaster = false;
     private int mDisabledMenuItems = MENU_ITEM_NONE;
 
     // Although this bit is stored on AwSettings it is actually controlled via the CookieManager.
     private boolean mAcceptThirdPartyCookies = false;
 
     private final boolean mSupportLegacyQuirks;
     private final boolean mAllowEmptyDocumentPersistence;
     private final boolean mAllowGeolocationOnInsecureOrigins;
@@ skipping 1593 matching lines @@
                 mDisabledMenuItems = menuItems;
             }
         }
     }
 
     /**
      * Sets whether to use the video overlay for the embedded video.
      * @param flag whether to enable the video overlay for the embedded video.
      */
     public void setVideoOverlayForEmbeddedVideoEnabled(final boolean enabled) {
-        synchronized (mAwSettingsLock) {
-            if (mVideoOverlayForEmbeddedVideoEnabled != enabled) {
-                mVideoOverlayForEmbeddedVideoEnabled = enabled;
-                mEventHandler.runOnUiThreadBlockingAndLocked(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (mNativeAwSettings != 0) {
-                            nativeUpdateRendererPreferencesLocked(mNativeAwSettings);
-                        }
-                    }
-                });
-            }
-        }
+        // No-op, see http://crbug.com/616583
     }
 
     /**
      * Gets whether to use the video overlay for the embedded video.
      * @return true if the WebView enables the video overlay for the embedded video.
      */
     public boolean getVideoOverlayForEmbeddedVideoEnabled() {
-        synchronized (mAwSettingsLock) {
-            return getVideoOverlayForEmbeddedVideoEnabledLocked();
-        }
+        // Always false, see http://crbug.com/616583
+        return false;
     }
 
     @CalledByNative
     private boolean getVideoOverlayForEmbeddedVideoEnabledLocked() {
-        assert Thread.holdsLock(mAwSettingsLock);
-        return mVideoOverlayForEmbeddedVideoEnabled;
+        // Always false, see http://crbug.com/616583
+        return false;
     }
 
     @VisibleForTesting
     public void setForceVideoOverlayForTests(final boolean enabled) {
         synchronized (mAwSettingsLock) {
             if (mForceVideoOverlayForTests != enabled) {
                 mForceVideoOverlayForTests = enabled;
                 mEventHandler.runOnUiThreadBlockingAndLocked(new Runnable() {
                     @Override
                     public void run() {
@@ skipping 104 matching lines @@
     private native void nativeUpdateWebkitPreferencesLocked(long nativeAwSettings);
 
     private static native String nativeGetDefaultUserAgent();
 
     private native void nativeUpdateFormDataPreferencesLocked(long nativeAwSettings);
 
     private native void nativeUpdateRendererPreferencesLocked(long nativeAwSettings);
 
     private native void nativeUpdateOffscreenPreRasterLocked(long nativeAwSettings);
 }