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 f33ab48beccb01e0eadcdf23da167851415ba37f..6ad74c86b4bb892651b894f3d6074b21be1a57ba 100644 |
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java |
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java |
@@ -663,7 +663,11 @@ public class AwContents { |
* in the WebView. |
*/ |
void exitFullScreen() { |
- assert isFullScreen(); |
+ if (!isFullScreen()) |
+ // exitFullScreen() can be called without a prior call to enterFullScreen() if a |
+ // "misbehave" app overrides onShowCustomView but does not add the custom view to |
+ // the window. Exiting avoids a crash. |
+ return; |
// Detach to tear down the GL functor if this is still associated with the old |
// container view. It will be recreated during the next call to onDraw attached to |