Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager.

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/cdm_messages.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/android/external_video_surface_container.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/content_browser_client.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_client.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"
@@ skipping 402 matching lines @@
         gfx::ScopedJavaSurface::AcquireExternalSurface(surface));
   }
 }
 
 void BrowserMediaPlayerManager::DetachExternalVideoSurface(int player_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player)
     player->SetVideoSurface(gfx::ScopedJavaSurface());
 }
 
+void BrowserMediaPlayerManager::OnFrameInfoUpdated() {

[boliu, 2014/04/11 01:52:10]

How much of the new code in this file need to be behind VIDEO_HOLE?

[ycheo (away), 2014/04/11 05:05:46]

The remained parts are to control to enable or disable the hole-punching.
And it's just checking the boolean flag.

+  if (external_video_surface_container_) {
+    external_video_surface_container_->OnFrameInfoUpdated();
+  }
+}
+
 void BrowserMediaPlayerManager::OnNotifyExternalSurface(
     int player_id, bool is_request, const gfx::RectF& rect) {
   if (!web_contents_)
     return;
 
-  ExternalVideoSurfaceContainer::CreateForWebContents(web_contents_);
-  ExternalVideoSurfaceContainer* surface_container =
-      ExternalVideoSurfaceContainer::FromWebContents(web_contents_);
-  if (!surface_container)
-    return;
-
   if (is_request) {
+    if (!external_video_surface_container_) {
+      external_video_surface_container_.reset(
+          GetContentClient()->browser()->CreateExternalVideoSurfaceContainer(
+              web_contents_));
+    }
     // It's safe to use base::Unretained(this), because the callbacks will not
     // be called after running ReleaseExternalVideoSurface().
-    surface_container->RequestExternalVideoSurface(
+    external_video_surface_container_->RequestExternalVideoSurface(

[boliu, 2014/04/11 01:52:10]

Need to handle the case when  CreateExternalVideoSurfaceContainer returns null.

[ycheo (away), 2014/04/11 05:05:46]

Done.

         player_id,
         base::Bind(&BrowserMediaPlayerManager::AttachExternalVideoSurface,
                    base::Unretained(this)),
         base::Bind(&BrowserMediaPlayerManager::DetachExternalVideoSurface,
                    base::Unretained(this)));
   }
-  surface_container->OnExternalVideoSurfacePositionChanged(player_id, rect);
+  if (external_video_surface_container_) {
+    external_video_surface_container_->OnExternalVideoSurfacePositionChanged(
+        player_id, rect);
+  }
 }
 #endif  // defined(VIDEO_HOLE)
 
 void BrowserMediaPlayerManager::DisableFullscreenEncryptedMediaPlayback() {
   if (fullscreen_player_id_ == -1)
     return;
 
   // If the fullscreen player is not playing back encrypted video, do nothing.
   MediaDrmBridge* drm_bridge = GetDrmBridge(fullscreen_player_id_);
   if (!drm_bridge)
     return;
 
   // Exit fullscreen.
   pending_fullscreen_player_id_ = fullscreen_player_id_;
   OnExitFullscreen(fullscreen_player_id_);
 }
 
 void BrowserMediaPlayerManager::OnEnterFullscreen(int player_id) {
   DCHECK_EQ(fullscreen_player_id_, -1);
   if (cdm_ids_pending_approval_.find(player_id) !=
       cdm_ids_pending_approval_.end()) {
     return;
   }
 
 #if defined(VIDEO_HOLE)
-  ExternalVideoSurfaceContainer* surface_container =
-      ExternalVideoSurfaceContainer::FromWebContents(web_contents_);
-  if (surface_container)
-    surface_container->ReleaseExternalVideoSurface(player_id);
+  if (external_video_surface_container_)
+    external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
 #endif  // defined(VIDEO_HOLE)
   if (video_view_.get()) {
     fullscreen_player_id_ = player_id;
     video_view_->OpenVideo();
   } else if (!ContentVideoView::GetInstance()) {
     // In Android WebView, two ContentViewCores could both try to enter
     // fullscreen video, we just ignore the second one.
     fullscreen_player_id_ = player_id;
     video_view_.reset(new ContentVideoView(this));
   }
@@ skipping 365 matching lines @@
           routing_id(), (*it)->player_id()));
     }
   }
 }
 
 void BrowserMediaPlayerManager::OnMediaResourcesReleased(int player_id) {
 #if defined(VIDEO_HOLE)
   MediaPlayerAndroid* player = GetPlayer(player_id);
   if (player && player->IsSurfaceInUse())
     return;
-  ExternalVideoSurfaceContainer* surface_container =
-      ExternalVideoSurfaceContainer::FromWebContents(web_contents_);
-  if (surface_container)
-    surface_container->ReleaseExternalVideoSurface(player_id);
+  if (external_video_surface_container_)
+    external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
 #endif  // defined(VIDEO_HOLE)
 }
 
 }  // namespace content