Delete SurfaceTexturePeer

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 <utility>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/singleton.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/media/android/media_throttler.h"
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_frame_host.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 "gpu/ipc/common/android/surface_texture_peer.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_url_interceptor.h"
 #include "media/base/media_content_type.h"
 
 #if !defined(USE_AURA)
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #endif
 
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
 
 namespace content {
 
-namespace {
-
-class BrowserSurfaceTexturePeer : public gpu::SurfaceTexturePeer {
- public:
-  static BrowserSurfaceTexturePeer* GetInstance();
-
- private:
-  friend struct base::DefaultSingletonTraits<BrowserSurfaceTexturePeer>;
-
-  BrowserSurfaceTexturePeer();
-  ~BrowserSurfaceTexturePeer() override;
-
-  void EstablishSurfaceTexturePeer(
-      base::ProcessHandle render_process_handle,
-      scoped_refptr<gl::SurfaceTexture> surface_texture,
-      int render_frame_id,
-      int player_id) override;
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserSurfaceTexturePeer);
-};
-
-// static
-BrowserSurfaceTexturePeer* BrowserSurfaceTexturePeer::GetInstance() {
-  return base::Singleton<
-      BrowserSurfaceTexturePeer,
-      base::LeakySingletonTraits<BrowserSurfaceTexturePeer>>::get();
-}
-
-BrowserSurfaceTexturePeer::BrowserSurfaceTexturePeer() {
-  gpu::SurfaceTexturePeer::InitInstance(this);
-}
-
-BrowserSurfaceTexturePeer::~BrowserSurfaceTexturePeer() {
-  gpu::SurfaceTexturePeer::InitInstance(nullptr);
-}
-
-void BrowserSurfaceTexturePeer::EstablishSurfaceTexturePeer(
-    base::ProcessHandle render_process_handle,
-    scoped_refptr<gl::SurfaceTexture> surface_texture,
-    int render_frame_id,
-    int player_id) {
-  if (!surface_texture.get())
-    return;
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&BrowserMediaPlayerManager::SetSurfacePeer, surface_texture,
-                 render_process_handle, render_frame_id, player_id));
-}
-
-}  // namespace
-
 // Threshold on the number of media players per renderer before we start
 // attempting to release inactive media players.
 const int kMediaPlayerThreshold = 1;
 const int kInvalidMediaPlayerId = -1;
 
 static BrowserMediaPlayerManager::Factory g_factory = NULL;
 static media::MediaUrlInterceptor* media_url_interceptor_ = NULL;
 
 // static
 void BrowserMediaPlayerManager::RegisterFactory(Factory factory) {
   // TODO(aberent) nullptr test is a temporary fix to simplify upstreaming Cast.
   // Until Cast is fully upstreamed we want the downstream factory to take
   // priority over the upstream factory. The downstream call happens first,
   // so this will ensure that it does.
   if (g_factory == nullptr)
     g_factory = factory;
 }
 
 // static
 void BrowserMediaPlayerManager::RegisterMediaUrlInterceptor(
     media::MediaUrlInterceptor* media_url_interceptor) {
   media_url_interceptor_ = media_url_interceptor;
 }
 
 // static
-void BrowserMediaPlayerManager::InitSurfaceTexturePeer() {
-  BrowserSurfaceTexturePeer::GetInstance();
-}
-
-// static
-void BrowserMediaPlayerManager::SetSurfacePeer(
-    scoped_refptr<gl::SurfaceTexture> surface_texture,
-    base::ProcessHandle render_process_handle,
-    int render_frame_id,
-    int player_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  int render_process_id = 0;
-  RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
-  while (!it.IsAtEnd()) {
-    if (it.GetCurrentValue()->GetHandle() == render_process_handle) {
-      render_process_id = it.GetCurrentValue()->GetID();
-      break;
-    }
-    it.Advance();
-  }
-  if (!render_process_id) {
-    DVLOG(1) << "Cannot find render process for render_process_handle "
-             << render_process_handle;
-    return;
-  }
-
-  RenderFrameHostImpl* frame =
-      RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
-  if (!frame) {
-    DVLOG(1) << "Cannot find frame for render_frame_id " << render_frame_id;
-    return;
-  }
-
-  BrowserMediaPlayerManager* player_manager =
-      MediaWebContentsObserverAndroid::FromWebContents(
-          WebContents::FromRenderFrameHost(frame))
-          ->GetMediaPlayerManager(frame);
-  if (!player_manager) {
-    DVLOG(1) << "Cannot find the media player manager for frame " << frame;
-    return;
-  }
-
-  media::MediaPlayerAndroid* player = player_manager->GetPlayer(player_id);
-  if (!player) {
-    DVLOG(1) << "Cannot find media player for player_id " << player_id;
-    return;
-  }
-
-  if (player != player_manager->GetFullscreenPlayer()) {
-    gl::ScopedJavaSurface scoped_surface(surface_texture.get());
-    player->SetVideoSurface(std::move(scoped_surface));
-  }
-}
-
-// static
 BrowserMediaPlayerManager* BrowserMediaPlayerManager::Create(
     RenderFrameHost* rfh) {
   if (g_factory)
     return g_factory(rfh);
   return new BrowserMediaPlayerManager(rfh);
 }
 
 #if !defined(USE_AURA)
 ContentViewCore* BrowserMediaPlayerManager::GetContentViewCore() const {
   return ContentViewCoreImpl::FromWebContents(web_contents());
@@ skipping 480 matching lines @@
   if (!player)
     return;
   player->Start();
   if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {
     video_view_->OpenVideo();
     fullscreen_player_is_released_ = false;
   }
 }
 
 }  // namespace content