Make the video layer visibility configurable in OverlayFullscreenVideo mode

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 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.
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 1029 matching lines @@
     TryCreateStreamTextureProxyIfNeeded();
     EstablishSurfaceTexturePeer();
     suppress_deleting_texture_ = true;
   }
 
 #if defined(VIDEO_HOLE)
   if (!paused() && needs_external_surface_)
     player_manager_->RequestExternalSurface(player_id_, last_computed_rect_);
 #endif  // defined(VIDEO_HOLE)
   is_fullscreen_ = false;
-  ReallocateVideoFrame();
   client_->repaint();
 }
 
 void WebMediaPlayerAndroid::OnMediaPlayerPlay() {
   // The MediaPlayer might request the video to be played after it lost its
   // stream texture proxy or the peer connection, for example, if the video was
   // paused while fullscreen then fullscreen state was left.
   TryCreateStreamTextureProxyIfNeeded();
   if (needs_establish_peer_)
     EstablishSurfaceTexturePeer();
@@ skipping 140 matching lines @@
       canvas_size,
       base::Bind(&StreamTextureFactory::ContextGL,
                  stream_texture_factory_)));
   if (!new_frame)
     return;
   SetCurrentFrameInternal(new_frame);
 }
 
 void WebMediaPlayerAndroid::ReallocateVideoFrame() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-
-  if (is_fullscreen_) return;
   if (needs_external_surface_) {
     // VideoFrame::CreateHoleFrame is only defined under VIDEO_HOLE.
 #if defined(VIDEO_HOLE)
     if (!natural_size_.isEmpty()) {
       // Now we finally know that "stream texture" and "video frame" won't
       // be needed. EME uses "external surface" and "video hole" instead.
       RemoveSurfaceTextureAndProxy();
       scoped_refptr<VideoFrame> new_frame =
           VideoFrame::CreateHoleFrame(natural_size_);
       SetCurrentFrameInternal(new_frame);
@@ skipping 402 matching lines @@
   // media pipeline since we initialize audio and video decoders in sequence.
   // But WebMediaPlayerAndroid should not depend on media pipeline's
   // implementation detail.
   DCHECK(cdm_ready_cb_.is_null());
   cdm_ready_cb_ = cdm_ready_cb;
 
   if (cdm_context_)
     SetCdmInternal(base::Bind(&media::IgnoreCdmAttached));
 }
 
-bool WebMediaPlayerAndroid::supportsOverlayFullscreenVideo() {
-  return true;
+WebMediaPlayer::OverlayFullscreenVideoMode
+WebMediaPlayerAndroid::getOverlayFullscreenVideoMode() {
+  return WebMediaPlayer::OverlayFullscreenVideoMode::VideoLayerInvisible;
 }
 
 void WebMediaPlayerAndroid::enteredFullscreen() {
   if (is_player_initialized_)
     player_manager_->EnterFullscreen(player_id_);
   SetNeedsEstablishPeer(false);
   is_fullscreen_ = true;
   suppress_deleting_texture_ = false;
-
-  // Create a transparent video frame. Blink will already have made the
-  // background transparent because we returned true from
-  // supportsOverlayFullscreenVideo(). By making the video frame transparent,
-  // as well, everything in the LayerTreeView will be transparent except for
-  // media controls. The video will be on visible on the underlaid surface.
-  if (!fullscreen_frame_)
-    fullscreen_frame_ = VideoFrame::CreateTransparentFrame(gfx::Size(1, 1));
-  SetCurrentFrameInternal(fullscreen_frame_);
-  client_->repaint();
 }
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   const GURL& url = redirected_url_.is_empty() ? url_ : redirected_url_;
   return media::MediaCodecUtil::IsHLSURL(url);
 }
 
 void WebMediaPlayerAndroid::ReportHLSMetrics() const {
   if (player_type_ != MEDIA_PLAYER_TYPE_URL)
     return;
@@ skipping 15 matching lines @@
     result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
   } else if (is_hls_url == is_hls) {
     result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
       result, PREDICTION_RESULT_MAX);
 }
 
 }  // namespace content