Use clearer names for the PictureBuffer texture id members

media/gpu/avda_picture_buffer_manager.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_picture_buffer_manager.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "base/android/build_info.h"
@@ skipping 192 matching lines @@
 gpu::gles2::TextureRef* AVDAPictureBufferManager::GetTextureForPicture(
     const PictureBuffer& picture_buffer) {
   auto gles_decoder = state_provider_->GetGlDecoder();
   RETURN_NULL_IF_NULL(gles_decoder);
   RETURN_NULL_IF_NULL(gles_decoder->GetContextGroup());
 
   gpu::gles2::TextureManager* texture_manager =
       gles_decoder->GetContextGroup()->texture_manager();
   RETURN_NULL_IF_NULL(texture_manager);
 
-  DCHECK_LE(1u, picture_buffer.internal_texture_ids().size());
+  DCHECK_LE(1u, picture_buffer.client_texture_ids().size());
   gpu::gles2::TextureRef* texture_ref =
-      texture_manager->GetTexture(picture_buffer.internal_texture_ids()[0]);
+      texture_manager->GetTexture(picture_buffer.client_texture_ids()[0]);
   RETURN_NULL_IF_NULL(texture_ref);
 
   return texture_ref;
 }
 
 void AVDAPictureBufferManager::SetImageForPicture(
     const PictureBuffer& picture_buffer,
     const scoped_refptr<gpu::gles2::GLStreamTextureImage>& image) {
   gpu::gles2::TextureRef* texture_ref = GetTextureForPicture(picture_buffer);
   RETURN_IF_NULL(texture_ref);
@@ skipping 72 matching lines @@
   if (!surface_texture_ && have_context) {
     // To make devtools work, we're using a 2D texture.  Make it transparent,
     // so that it draws a hole for the SV to show through.  This is only
     // because devtools draws and reads back, which skips overlay processing.
     // It's unclear why devtools renders twice -- once normally, and once
     // including a readback layer.  The result is that the device screen
     // flashes as we alternately draw the overlay hole and this texture,
     // unless we make the texture transparent.
     static const uint8_t rgba[] = {0, 0, 0, 0};
     const gfx::Size size(1, 1);
-    DCHECK_LE(1u, picture_buffer.texture_ids().size());
-    glBindTexture(GL_TEXTURE_2D, picture_buffer.texture_ids()[0]);
+    DCHECK_LE(1u, picture_buffer.service_texture_ids().size());
+    glBindTexture(GL_TEXTURE_2D, picture_buffer.service_texture_ids()[0]);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size.width(), size.height(), 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, rgba);
   }
 }
 
 void AVDAPictureBufferManager::ReleaseCodecBufferForPicture(
     const PictureBuffer& picture_buffer) {
   AVDACodecImage* avda_image =
       shared_state_->GetImageForPicture(picture_buffer.id());
   RETURN_IF_NULL(avda_image);
@@ skipping 81 matching lines @@
   shared_state_->CodecChanged(codec);
 }
 
 bool AVDAPictureBufferManager::ArePicturesOverlayable() {
   // SurfaceView frames are always overlayable because that's the only way to
   // display them.
   return !surface_texture_;
 }
 
 }  // namespace media