StreamTextureImages can now override a Texture's service id

media/gpu/avda_codec_image.cc

 // Copyright 2015 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 "media/gpu/avda_codec_image.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 66 matching lines @@
   // 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
   // texture id, so we can skip preserving it if the right context is current.
   UpdateSurfaceInternal(UpdateMode::RENDER_TO_FRONT_BUFFER,
                         kDontRestoreBindings);
 
   // By setting image state to UNBOUND instead of COPIED we ensure that
   // CopyTexImage() is called each time the surface texture is used for drawing.
   // It would be nice if we could do this via asking for the currently bound
   // Texture, but the active unit never seems to change.
-  texture_->SetLevelStreamTextureImage(GL_TEXTURE_EXTERNAL_OES, 0, this,
-                                       gpu::gles2::Texture::UNBOUND);
+  texture_->SetLevelStreamTextureImage(

[liberato (no reviews please), 2016/06/02 14:37:02]

i think that this would be clearer as SetLevelImage, now that it checks for !=
old image.

[watk, 2016/06/03 01:09:46]

Done.

+      GL_TEXTURE_EXTERNAL_OES, 0, this, gpu::gles2::Texture::UNBOUND,
+      shared_state_->surface_texture_service_id());
 
   return true;
 }
 
 bool AVDACodecImage::CopyTexSubImage(unsigned target,
                                      const gfx::Point& offset,
                                      const gfx::Rect& rect) {
   return false;
 }
 
@@ skipping 136 matching lines @@
 }
 
 bool AVDACodecImage::IsCodecBufferOutstanding() const {
   static_assert(kUpdateOnly < 0 && kUpdateOnly > kRendered &&
                     kRendered > kInvalidCodecBufferIndex,
                 "Codec buffer index enum values are not ordered correctly.");
   return codec_buffer_index_ > kRendered && media_codec_;
 }
 
 }  // namespace media