summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 14:44:34 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 14:44:34 +0000
commit45fb823aebbb91546dc7a4c0dfd31b3dbc15f4e6 (patch)
tree100aa2785cb252bc0e484702aa43ead005754907 /android_webview
parent5c90af297328b3c317c6aba18699fe95f4a10aac (diff)
downloadchromium_src-45fb823aebbb91546dc7a4c0dfd31b3dbc15f4e6.zip
chromium_src-45fb823aebbb91546dc7a4c0dfd31b3dbc15f4e6.tar.gz
chromium_src-45fb823aebbb91546dc7a4c0dfd31b3dbc15f4e6.tar.bz2
Fix a new fullscreen video crash if ContentVideoView cannot be created.
Test url: http://m.discovery.com/tv-shows/dual-survival/videos/change-is-coming-to-dual-survival Sometimes clicking on a video will open up a new tab. In this case, the old tab will lose its fullscreen manager. If the video also tries to enter fullscreen on the same click, then onShowCustomView() will fail to find the fullscreen manager. We should let the video exit fullscreen in this case, this matches the behavior of that of the old fullscreen video. BUG=366192 Review URL: https://codereview.chromium.org/250853005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java3
1 files changed, 2 insertions, 1 deletions
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 6ed4911..55afba5 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
@@ -21,7 +21,7 @@ public class AwContentViewClient extends ContentViewClient {
private class AwContentVideoViewClient implements ContentVideoViewClient {
@Override
- public void onShowCustomView(View view) {
+ public boolean onShowCustomView(View view) {
WebChromeClient.CustomViewCallback cb = new WebChromeClient.CustomViewCallback() {
@Override
public void onCustomViewHidden() {
@@ -31,6 +31,7 @@ public class AwContentViewClient extends ContentViewClient {
}
};
mAwContentsClient.onShowCustomView(view, cb);
+ return true;
}
@Override