Android: Never automatically enter fullscreen when media playback starts.

media/base/android/media_source_player.cc

 // Copyright (c) 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 "media/base/android/media_source_player.h"
 
 #include <limits>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 103 matching lines @@
   // values at millisecond resolution.
   return duration_ <
          base::TimeDelta::FromMilliseconds(std::numeric_limits<int32>::max());
 }
 
 void MediaSourcePlayer::Start() {
   DVLOG(1) << __FUNCTION__;
 
   playing_ = true;
 
-  bool request_fullscreen = IsProtectedSurfaceRequired();
-#if defined(VIDEO_HOLE)
-  // Skip to request fullscreen when hole-punching is used.
-  request_fullscreen = request_fullscreen &&
-      !manager()->ShouldUseVideoOverlayForEmbeddedEncryptedVideo();
-#endif  // defined(VIDEO_HOLE)
-  if (request_fullscreen)
-    manager()->RequestFullScreen(player_id());
-
   StartInternal();
 }
 
 void MediaSourcePlayer::Pause(bool is_media_related_action) {
   DVLOG(1) << __FUNCTION__;
 
   // Since decoder jobs have their own thread, decoding is not fully paused
   // until all the decoder jobs call MediaDecoderCallback(). It is possible
   // that Start() is called while the player is waiting for
   // MediaDecoderCallback(). In that case, decoding will continue when
@@ skipping 534 matching lines @@
   }
 
   timeout = std::max(timeout, kMinStarvationTimeout);
 
   decoder_starvation_callback_.Reset(
       base::Bind(&MediaSourcePlayer::OnDecoderStarved, weak_this_));
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, decoder_starvation_callback_.callback(), timeout);
 }
 
-bool MediaSourcePlayer::IsProtectedSurfaceRequired() {
-  return video_decoder_job_->is_content_encrypted() &&
-      drm_bridge_ && drm_bridge_->IsProtectedSurfaceRequired();
-}
-
 void MediaSourcePlayer::OnPrefetchDone() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!audio_decoder_job_->is_decoding());
   DCHECK(!video_decoder_job_->is_decoding());
 
   // A previously posted OnPrefetchDone() could race against a Release(). If
   // Release() won the race, we should no longer have decoder jobs.
   // TODO(qinmin/wolenetz): Maintain channel state to not double-request data
   // or drop data received across Release()+Start(). See http://crbug.com/306314
   // and http://crbug.com/304234.
@@ skipping 114 matching lines @@
   // support setMediaKeys(0) (see http://crbug.com/330324), or when we release
   // MediaDrm when the video is paused, or when the device goes to sleep (see
   // http://crbug.com/272421).
   audio_decoder_job_->SetDrmBridge(NULL);
   video_decoder_job_->SetDrmBridge(NULL);
   cdm_registration_id_ = 0;
   drm_bridge_ = NULL;
 }
 
 }  // namespace media