Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2676)

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java

Issue 667143002: [aw] Software mode tests for fullscreen API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fixPowerBlockerNonMedia
Patch Set: Rebase and move check for real Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
index d13195c5b0a0607d7fe5658abb8144fb0dd99bbe..4d8b2759200d33adf714d93891b2272a5efa43f7 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
@@ -66,8 +66,12 @@ public class AwContentViewClient extends ContentViewClient implements ContentVid
@Override
public void enterFullscreenVideo(View videoView) {
- // enterFullscreenVideo will only be called after enterFullscreen.
- assert mCustomView != null;
+ if (mCustomView == null) {
+ // enterFullscreenVideo will only be called after enterFullscreen, but
+ // in this case exitFullscreen has been invoked in between them.
+ // TODO(igsolla): Fix http://crbug/425926 and replace with assert.
+ return;
+ }
mCustomView.addView(videoView, 0);
}
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698