Allow multiple texture ids per picture buffer.

content/common/gpu/media/android_copying_backing_strategy.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 "content/common/gpu/media/android_copying_backing_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/media/avda_return_on_failure.h"
@@ skipping 95 matching lines @@
   }
 
   {
     TRACE_EVENT0("media", "AVDA::UpdateTexImage");
     surface_texture_->UpdateTexImage();
   }
 
   float transform_matrix[16];
   surface_texture_->GetTransformMatrix(transform_matrix);
 
-  uint32_t picture_buffer_texture_id = picture_buffer.texture_id();
+  DCHECK_LE(1u, picture_buffer.texture_ids().size());
+  uint32_t picture_buffer_texture_id = picture_buffer.texture_ids()[0];
 
   // Defer initializing the CopyTextureCHROMIUMResourceManager until it is
   // needed because it takes 10s of milliseconds to initialize.
   if (!copier_) {
     copier_.reset(new gpu::CopyTextureCHROMIUMResourceManager());
     copier_->Initialize(state_provider_->GetGlDecoder().get(),
                         state_provider_->GetGlDecoder()->GetContextGroup()->
                             feature_info()->feature_flags());
   }
 
@@ skipping 31 matching lines @@
 void AndroidCopyingBackingStrategy::UpdatePictureBufferSize(
     media::PictureBuffer* picture_buffer,
     const gfx::Size& new_size) {
   // This strategy uses 2D textures who's allocated memory is dependent on the
   // size. To update size in all places, we must:
   // 1) Update the PictureBuffer meta-data
   picture_buffer->set_size(new_size);
 
   // 2) Update the GL texture via glTexImage2D. This step assumes the caller
   // has made our GL context current.
-  glBindTexture(GL_TEXTURE_2D, picture_buffer->texture_id());
+  DCHECK_LE(1u, picture_buffer->texture_ids().size());
+  glBindTexture(GL_TEXTURE_2D, picture_buffer->texture_ids()[0]);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, new_size.width(), new_size.height(),
                0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
   state_provider_->GetGlDecoder()->RestoreActiveTextureUnitBinding(
       GL_TEXTURE_2D);
 
   // 3) Update the CHROMIUM Texture's size.
   gpu::gles2::TextureRef* texture_ref =
       state_provider_->GetTextureForPicture(*picture_buffer);
   RETURN_IF_NULL(texture_ref);
   gpu::gles2::TextureManager* texture_manager =
       state_provider_->GetGlDecoder()->GetContextGroup()->texture_manager();
   RETURN_IF_NULL(texture_manager);
   texture_manager->SetLevelInfo(texture_ref, GetTextureTarget(), 0, GL_RGBA,
                                 new_size.width(), new_size.height(), 1, 0,
                                 GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(new_size));
 }
 
 }  // namespace content