Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / android_webview / java / src / org / chromium / android_webview / AwContentViewClient.java

diff --git a/src/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java b/src/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
index a091d77..4d8b275 100644 (file)
--- a/src/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
+++ b/src/android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java
@@ -11,69 +11,21 @@ import android.webkit.URLUtil;
 import android.webkit.WebChromeClient;
 import android.widget.FrameLayout;
 
-import org.chromium.content.browser.ContentVideoView;
 import org.chromium.content.browser.ContentVideoViewClient;
 import org.chromium.content.browser.ContentViewClient;
 
 /**
  * ContentViewClient implementation for WebView
  */
-public class AwContentViewClient extends ContentViewClient {
-
-    private class AwContentVideoViewClient implements ContentVideoViewClient {
-        @Override
-        public boolean onShowCustomView(View view) {
-            final FrameLayout viewGroup = new FrameLayout(mContext);
-            viewGroup.addView(view);
-            viewGroup.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
-                @Override
-                public void onViewDetachedFromWindow(View v) {
-                    // Intentional no-op (see onDestroyContentVideoView).
-                }
-
-                @Override
-                public void onViewAttachedToWindow(View v) {
-                    if (mAwContents.isFullScreen()) {
-                        return;
-                    }
-                    View fullscreenView = mAwContents.enterFullScreen();
-                    if (fullscreenView != null) {
-                        viewGroup.addView(fullscreenView);
-                    }
-                }
-            });
-            WebChromeClient.CustomViewCallback cb = new WebChromeClient.CustomViewCallback() {
-                @Override
-                public void onCustomViewHidden() {
-                    ContentVideoView contentVideoView = ContentVideoView.getContentVideoView();
-                    if (contentVideoView != null)
-                        contentVideoView.exitFullscreen(false);
-                }
-            };
-            mAwContentsClient.onShowCustomView(viewGroup, cb);
-            return true;
-        }
-
-        @Override
-        public void onDestroyContentVideoView() {
-            mAwContents.exitFullScreen();
-            mAwContentsClient.onHideCustomView();
-        }
-
-        @Override
-        public View getVideoLoadingProgressView() {
-            return mAwContentsClient.getVideoLoadingProgressView();
-        }
-    }
-
-    private AwContentsClient mAwContentsClient;
-    private AwSettings mAwSettings;
-    private AwContents mAwContents;
-    private Context mContext;
-
-    public AwContentViewClient(
-            AwContentsClient awContentsClient, AwSettings awSettings, AwContents awContents,
-            Context context) {
+public class AwContentViewClient extends ContentViewClient implements ContentVideoViewClient {
+    private final AwContentsClient mAwContentsClient;
+    private final AwSettings mAwSettings;
+    private final AwContents mAwContents;
+    private final Context mContext;
+    private FrameLayout mCustomView;
+
+    public AwContentViewClient(AwContentsClient awContentsClient, AwSettings awSettings,
+            AwContents awContents, Context context) {
         mAwContentsClient = awContentsClient;
         mAwSettings = awSettings;
         mAwContents = awContents;
@@ -103,12 +55,71 @@ public class AwContentViewClient extends ContentViewClient {
 
     @Override
     public final ContentVideoViewClient getContentVideoViewClient() {
-        return new AwContentVideoViewClient();
+        return this;
     }
 
     @Override
     public boolean shouldBlockMediaRequest(String url) {
-        return mAwSettings != null ?
-                mAwSettings.getBlockNetworkLoads() && URLUtil.isNetworkUrl(url) : true;
+        return mAwSettings != null
+                ? mAwSettings.getBlockNetworkLoads() && URLUtil.isNetworkUrl(url) : true;
+    }
+
+    @Override
+    public void enterFullscreenVideo(View videoView) {
+        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);
+    }
+
+    @Override
+    public void exitFullscreenVideo() {
+        // Intentional no-op
+    }
+
+    @Override
+    public View getVideoLoadingProgressView() {
+        return mAwContentsClient.getVideoLoadingProgressView();
+    }
+
+    /**
+     * Called to show the web contents in fullscreen mode.
+     *
+     * <p>If entering fullscreen on a video element the web contents will contain just
+     * the html5 video controls. {@link #enterFullscreenVideo(View)} will be called later
+     * once the ContentVideoView, which contains the hardware accelerated fullscreen video,
+     * is ready to be shown.
+     */
+    public void enterFullscreen() {
+        if (mAwContents.isFullScreen()) {
+            return;
+        }
+        View fullscreenView = mAwContents.enterFullScreen();
+        if (fullscreenView == null) {
+            return;
+        }
+        WebChromeClient.CustomViewCallback cb = new WebChromeClient.CustomViewCallback() {
+            @Override
+            public void onCustomViewHidden() {
+                mAwContents.requestExitFullscreen();
+            }
+        };
+        mCustomView = new FrameLayout(mContext);
+        mCustomView.addView(fullscreenView);
+        mAwContentsClient.onShowCustomView(mCustomView, cb);
+    }
+
+    /**
+     * Called to show the web contents in embedded mode.
+     */
+    public void exitFullscreen() {
+        if (mCustomView != null) {
+            mAwContents.exitFullScreen();
+            mAwContentsClient.onHideCustomView();
+            mCustomView = null;
+        }
     }
 }