Request video element to enter fullscreen when playing protected content

content/browser/media/android/browser_media_player_manager.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/browser/media/android/browser_media_player_manager.h"
 
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/common/content_switches.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_source_player.h"
 #include "media/base/media_switches.h"
 
 using media::MediaDrmBridge;
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
 using media::MediaSourcePlayer;
@@ skipping 288 matching lines @@
     return;
   }
 
   // If the player is pending approval, wait for the approval to happen.
   if (media_keys_ids_pending_approval_.end() !=
       media_keys_ids_pending_approval_.find(player_id)) {
     pending_fullscreen_player_id_ = player_id;
     return;
   }
 
-  OnEnterFullscreen(player_id);
+  // Request the video element to enter fullscreen if there is no gesture
+  // requirement.
+  // TODO(qinmin): make this flag default on android.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableGestureRequirementForMediaFullscreen)) {
+    Send(new MediaPlayerMsg_RequestFullscreen(routing_id(), player_id));
+  }

[xhwang, 2013/10/25 18:21:59]

newbie question: How is this related to OnEnterFullscreen on l.403? Also we have
DisableFullscreenEncryptedMediaPlayback(). Can we have some doc/notes about how
the fullscreen workflow works in different scenarios?

[qinmin, 2013/10/25 20:06:13]

So when this IPC gets sent to the render process, it allows blink go through all
the renderFullscreen code path to make sure we are using the correct rendering
mode for the video. And onEnterFullscreen() will be called afterwards.

DisableFullscreenEncryptedMediaPlayback() is a temporary thing. If it is called
before OnEnterFullscreen(), we will wait until GenerateKeyIfAllowed() to retry
the whole fullscreen logic. If it is called after OnEnterFullscreen(), then the
player will enter fullscreen first, and then quit afterwards.

updated the comments above.
On 2013/10/25 18:21:59, xhwang wrote:

 }
 
 void BrowserMediaPlayerManager::OnKeyAdded(int media_keys_id,
                                            const std::string& session_id) {
   Send(new MediaKeysMsg_KeyAdded(routing_id(), media_keys_id, session_id));
 }
 
 void BrowserMediaPlayerManager::OnKeyError(
     int media_keys_id,
     const std::string& session_id,
@@ skipping 343 matching lines @@
   if (pending_fullscreen_player_id_ != media_keys_id)
     return;
 
   pending_fullscreen_player_id_ = -1;
   MediaPlayerAndroid* player = GetPlayer(media_keys_id);
   if (player->IsPlaying())
     OnProtectedSurfaceRequested(media_keys_id);
 }
 
 }  // namespace content