Support fullscreen for non-video elements in the WebView.

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.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.content.browser;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 343 matching lines @@
     private float mCurrentTouchOffsetY;
 
     // Offsets for smart clip
     private int mSmartClipOffsetX;
     private int mSmartClipOffsetY;
 
     // Whether the ContentViewCore requires the WebContents to be fullscreen in order to lock the
     // screen orientation.
     private boolean mFullscreenRequiredForOrientationLock = true;
 
+    // The accelerated view for fullscreen video playback.
+    private ContentVideoView mVideoView;
+
     /**
      * Constructs a new ContentViewCore. Embedders must call initialize() after constructing
      * a ContentViewCore and before using it.
      *
      * @param context The context used to create this.
      */
     public ContentViewCore(Context context) {
         mContext = context;
 
         mAdapterInputConnectionFactory = new AdapterInputConnectionFactory();
@@ skipping 12 matching lines @@
         mGestureStateListeners = new ObserverList<GestureStateListener>();
         mGestureStateListenersIterator = mGestureStateListeners.rewindableIterator();
 
         mEditable = Editable.Factory.getInstance().newEditable("");
         Selection.setSelection(mEditable, 0);
     }
 
     /**
      * @return The context used for creating this ContentViewCore.
      */
-    @CalledByNative
     public Context getContext() {
         return mContext;
     }
 
     /**
      * @return The ViewGroup that all view actions of this ContentViewCore should interact with.
      */
     public ViewGroup getContainerView() {
         return mContainerView;
     }
@@ skipping 2364 matching lines @@
      * Sets whether or not we should set accessibility focus on page load.
      * This only applies if an accessibility service like TalkBack is running.
      * This is desirable behavior for a browser window, but not for an embedded
      * WebView.
      */
     public void setShouldSetAccessibilityFocusOnPageLoad(boolean on) {
         mShouldSetAccessibilityFocusOnPageLoad = on;
     }
 
     /**
-     * Inform WebKit that Fullscreen mode has been exited by the user.
+     * Inform WebKit that Fullscreen mode has been exited by the user
+     * or the app (in the case of the WebView).
      */
     public void exitFullscreen() {
         assert mWebContents != null;
         mWebContents.exitFullscreen();
     }
 
     /**
+     * The {@link ContentVideoView} that must be shown when the {@link #onDidEnterFullscreen()}
+     * callback is received.
+     */
+    void setContentVideoView(ContentVideoView videoView) {
+        mVideoView = videoView;
+    }
+
+    @CalledByNative
+    private void onDidEnterFullscreen() {
+        if (mVideoView != null) {
+            getContentVideoViewClient().enterFullscreenVideo(mVideoView);

[qinmin, 2014/10/06 16:55:28]

we call WebMediaPlayer::enterfullscreen() in
FullscreenController::didEnterFullScreen(), that call will create the
mVideoview. So this call has to be called after that call, which can be easily
broken if someone refactor the code.
I think we need to either remove the WebMediaPlayer::enterfullscreen() in
FullscreenController or add a comments in render_widget.cc to indicate the
importance of the ordering.

[Ignacio Solla, 2014/10/07 18:14:43]

I added a comment to render_widget.cc.

As discussed offline, the alternative would be to return a boolean from
FullscreenController.didEnterFullscreen that tells whether the element is a
video, but that would be overkill.

+        } else {
+            getContentViewClient().enterFullscreen();
+        }
+    }
+
+    @CalledByNative
+    private void onDidExitFullscreen() {
+        if (mVideoView != null) {
+            getContentVideoViewClient().exitFullscreenVideo();
+            mVideoView = null;
+        } else {
+            getContentViewClient().exitFullscreen();
+        }
+    }
+
+    /**
      * Changes whether hiding the top controls is enabled.
      *
      * @param enableHiding Whether hiding the top controls should be enabled or not.
      * @param enableShowing Whether showing the top controls should be enabled or not.
      * @param animate Whether the transition should be animated or not.
      */
     public void updateTopControlsState(boolean enableHiding, boolean enableShowing,
             boolean animate) {
         assert mWebContents != null;
         mWebContents.updateTopControlsState(
@@ skipping 86 matching lines @@
         mTouchScrollInProgress = false;
         mPotentiallyActiveFlingCount = 0;
 
         if (touchScrollInProgress) updateGestureStateListener(GestureEventType.SCROLL_END);
         if (potentiallyActiveFlingCount > 0) updateGestureStateListener(GestureEventType.FLING_END);
     }
 
     private native long nativeInit(long webContentsPtr,
             long viewAndroidPtr, long windowAndroidPtr, HashSet<Object> retainedObjectSet);
 
-    @CalledByNative
-    private ContentVideoViewClient getContentVideoViewClient() {
+    ContentVideoViewClient getContentVideoViewClient() {
         return getContentViewClient().getContentVideoViewClient();
     }
 
     @CalledByNative
     private boolean shouldBlockMediaRequest(String url) {
         return getContentViewClient().shouldBlockMediaRequest(url);
     }
 
     @CalledByNative
     private void onNativeFlingStopped() {
@@ skipping 127 matching lines @@
     private native void nativeWasResized(long nativeContentViewCoreImpl);
 
     private native void nativeSetAccessibilityEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }