AVDACodecImages keep their backing SurfaceTexture alive

media/gpu/avda_codec_image.cc

Index: media/gpu/avda_codec_image.cc
diff --git a/media/gpu/avda_codec_image.cc b/media/gpu/avda_codec_image.cc
index 44d7b736e15dea6660759fa6489ed7b4dadc0370..f769f5e3165c12e90c180791a166d6293927a9fe 100644
--- a/media/gpu/avda_codec_image.cc
+++ b/media/gpu/avda_codec_image.cc
@@ -8,8 +8,6 @@
 
 #include <memory>
 
-#include "gpu/command_buffer/service/context_group.h"
-#include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "media/gpu/avda_shared_state.h"
@@ -22,7 +20,7 @@ namespace media {
 AVDACodecImage::AVDACodecImage(
     int picture_buffer_id,
     const scoped_refptr<AVDASharedState>& shared_state,
-    media::VideoCodecBridge* codec,
+    media::MediaCodecBridge* codec,
     const base::WeakPtr<gpu::gles2::GLES2Decoder>& decoder,
     const scoped_refptr<gfx::SurfaceTexture>& surface_texture)
     : shared_state_(shared_state),
@@ -69,10 +67,11 @@ bool AVDACodecImage::CopyTexImage(unsigned target) {
 
   GLint bound_service_id = 0;
   glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &bound_service_id);
-  // We insist that the currently bound texture is the right one.  We could
-  // make a new glimage from a 2D image.
-  if (bound_service_id != shared_state_->surface_texture_service_id())
+  // We insist that the currently bound texture is the right one.
+  if (bound_service_id !=
+      static_cast<GLint>(shared_state_->surface_texture_service_id())) {
     return false;
+  }
 
   // Make sure that we have the right image in the front buffer.  Note that the
   // bound_service_id is guaranteed to be equal to the surface texture's client
@@ -170,7 +169,6 @@ void AVDACodecImage::UpdateSurfaceInternal(
   if (update_mode != UpdateMode::RENDER_TO_FRONT_BUFFER)
     return;
 
-  DCHECK(shared_state_->surface_texture_is_attached());
   UpdateSurfaceTexture(attached_bindings_mode);
 }