Remove StreamTextureManager

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 144 matching lines @@
   }
 }
 
 WebMediaPlayerAndroid::~WebMediaPlayerAndroid() {
   SetVideoFrameProviderClient(NULL);
   client_->setWebLayer(NULL);
 
   if (proxy_)
     proxy_->DestroyPlayer(player_id_);
 
-  if (stream_id_)
-    stream_texture_factory_->DestroyStreamTexture(texture_id_);
+  if (stream_id_) {
+    DCHECK(texture_id_);
+    stream_texture_factory_->DestroyStreamTexture(stream_id_, texture_id_);
+  }
 
   if (manager_)
     manager_->UnregisterMediaPlayer(player_id_);
 
   if (base::MessageLoop::current())
     base::MessageLoop::current()->RemoveDestructionObserver(this);
 
   if (source_type_ == MediaPlayerAndroid::SOURCE_TYPE_MSE && delegate_)
     delegate_->PlayerGone(this);
 
@@ skipping 600 matching lines @@
 }
 
 void WebMediaPlayerAndroid::WillDestroyCurrentMessageLoop() {
   if (manager_)
     manager_->UnregisterMediaPlayer(player_id_);
   Detach();
 }
 
 void WebMediaPlayerAndroid::Detach() {
   if (stream_id_) {
-    stream_texture_factory_->DestroyStreamTexture(texture_id_);
+    DCHECK(texture_id_);
+    stream_texture_factory_->DestroyStreamTexture(stream_id_, texture_id_);
     stream_id_ = 0;
   }
 
   media_source_delegate_.reset();
   current_frame_ = NULL;
   manager_ = NULL;
   proxy_ = NULL;
 }
 
 void WebMediaPlayerAndroid::ReallocateVideoFrame() {
@@ skipping 47 matching lines @@
 }
 
 void WebMediaPlayerAndroid::PutCurrentFrame(
     const scoped_refptr<media::VideoFrame>& frame) {
 }
 
 void WebMediaPlayerAndroid::EstablishSurfaceTexturePeer() {
   if (media_source_delegate_ && stream_texture_factory_) {
     // MediaCodec will release the old surface when it goes away, we need to
     // recreate a new one each time this is called.
-    stream_texture_factory_->DestroyStreamTexture(texture_id_);
+    DCHECK(stream_id_ && texture_id_);
+    stream_texture_factory_->DestroyStreamTexture(stream_id_, texture_id_);
     stream_id_ = 0;
     texture_id_ = 0;
     texture_mailbox_ = gpu::Mailbox();
     texture_mailbox_sync_point_ = 0;
     stream_id_ = stream_texture_factory_->CreateStreamTexture(
         kGLTextureExternalOES,
         &texture_id_,
         &texture_mailbox_,
         &texture_mailbox_sync_point_);
     ReallocateVideoFrame();
@@ skipping 298 matching lines @@
 
 void WebMediaPlayerAndroid::exitFullscreen() {
   proxy_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace content