AVDACodecImages keep a reference to the SurfaceTexture backing them

content/common/gpu/media/android_deferred_rendering_backing_strategy.cc

Index: content/common/gpu/media/android_deferred_rendering_backing_strategy.cc
diff --git a/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc b/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc
index a76c98dece8b5c4c7e32e9d3d3812996963a2929..23cd6e1035d90a824f5b1ccec584ef23625003e0 100644
--- a/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc
+++ b/content/common/gpu/media/android_deferred_rendering_backing_strategy.cc
@@ -21,15 +21,15 @@ namespace content {
 
 AndroidDeferredRenderingBackingStrategy::
     AndroidDeferredRenderingBackingStrategy(AVDAStateProvider* state_provider)
-    : state_provider_(state_provider), media_codec_(nullptr) {}
+    : shared_state_(new AVDASharedState),
+      state_provider_(state_provider),
+      media_codec_(nullptr) {}
 
 AndroidDeferredRenderingBackingStrategy::
     ~AndroidDeferredRenderingBackingStrategy() {}
 
 gfx::ScopedJavaSurface AndroidDeferredRenderingBackingStrategy::Initialize(
     int surface_view_id) {
-  shared_state_ = new AVDASharedState();
-
   gfx::ScopedJavaSurface surface;
   if (surface_view_id != media::VideoDecodeAccelerator::Config::kNoSurfaceID) {
     surface =
@@ -40,6 +40,7 @@ gfx::ScopedJavaSurface AndroidDeferredRenderingBackingStrategy::Initialize(
     surface_texture_ = gfx::SurfaceTexture::Create(0);
     surface_texture_->DetachFromGLContext();
     surface = gfx::ScopedJavaSurface(surface_texture_.get());
+    shared_state_->set_surface_texture(surface_texture_);
   }
 
   // Create a texture for the SurfaceTexture to use.  We don't attach it here
@@ -55,20 +56,7 @@ gfx::ScopedJavaSurface AndroidDeferredRenderingBackingStrategy::Initialize(
 void AndroidDeferredRenderingBackingStrategy::Cleanup(
     bool have_context,
     const AndroidVideoDecodeAccelerator::OutputBufferMap& buffers) {
-  // If we failed before Initialize, then do nothing.
-  if (!shared_state_)
-    return;
-
-  // Make sure that no PictureBuffer textures refer to the SurfaceTexture or to
-  // the service_id that we created for it.
-  for (const std::pair<int, media::PictureBuffer>& entry : buffers)
-    SetImageForPicture(entry.second, nullptr);

[liberato (no reviews please), 2016/02/10 06:39:12]

it's late, and i might very well be missing it, but i don't see how this happens
in this CL.  it has to happen before the glDeleteTextures for the surface
texture service_id.

otherwise, there could be Texture objects that still refer to that service id
after it's deleted.  removing the codec image itself isn't needed, but calling
SetUnownedServiceId(0) on all the picture buffer textures is.

-
-  // Now that no AVDACodecImages refer to the SurfaceTexture's texture, delete
-  // the texture name.
-  GLuint service_id = shared_state_->surface_texture_service_id();
-  if (service_id > 0 && have_context)
-    glDeleteTextures(1, &service_id);
+  CodecChanged(nullptr, buffers);
 }
 
 scoped_refptr<gfx::SurfaceTexture>