Use clearer names for the PictureBuffer texture id members

media/video/picture.h

 // Copyright (c) 2011 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.
 
 #ifndef MEDIA_VIDEO_PICTURE_H_
 #define MEDIA_VIDEO_PICTURE_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "gpu/command_buffer/common/mailbox.h"
 #include "media/base/media_export.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
-// A picture buffer that is composed of a GLES2 texture.
+// A picture buffer that is composed of one or more GLES2 textures.
 // This is the media-namespace equivalent of PP_PictureBuffer_Dev.
 class MEDIA_EXPORT PictureBuffer {
  public:
   using TextureIds = std::vector<uint32_t>;
 
-  PictureBuffer(int32_t id, gfx::Size size, const TextureIds& texture_ids);
   PictureBuffer(int32_t id,
                 gfx::Size size,
-                const TextureIds& texture_ids,
-                const TextureIds& internal_texture_ids);
+                const TextureIds& client_texture_ids);
   PictureBuffer(int32_t id,
                 gfx::Size size,
-                const TextureIds& texture_ids,
+                const TextureIds& client_texture_ids,
+                const TextureIds& service_texture_ids);
+  PictureBuffer(int32_t id,
+                gfx::Size size,
+                const TextureIds& client_texture_ids,
                 const std::vector<gpu::Mailbox>& texture_mailboxes);
   PictureBuffer(const PictureBuffer& other);
   ~PictureBuffer();
 
   // Returns the client-specified id of the buffer.
   int32_t id() const { return id_; }
 
   // Returns the size of the buffer.
-  gfx::Size size() const {
-    return size_;
-  }
+  gfx::Size size() const { return size_; }
+
   void set_size(const gfx::Size& size) { size_ = size; }
 
-  // Returns the id of the texture.
-  // NOTE: The texture id in the renderer process corresponds to a different
-  // texture id in the GPU process.
-  const TextureIds& texture_ids() const { return texture_ids_; }
+  // The client texture ids, i.e., those returned by Chrome's GL service.
+  const TextureIds& client_texture_ids() const { return client_texture_ids_; }
 
-  const TextureIds& internal_texture_ids() const {
-    return internal_texture_ids_;
-  }
+  // The service texture ids, i.e., the real platform ids corresponding to
+  // |client_texture_ids|.
+  const TextureIds& service_texture_ids() const { return service_texture_ids_; }
 
   const gpu::Mailbox& texture_mailbox(size_t plane) const {
     return texture_mailboxes_[plane];
   }
 
  private:
   int32_t id_;
   gfx::Size size_;
-  TextureIds texture_ids_;
-  TextureIds internal_texture_ids_;
+  TextureIds client_texture_ids_;
+  TextureIds service_texture_ids_;
   std::vector<gpu::Mailbox> texture_mailboxes_;
 };
 
 // A decoded picture frame.
 // This is the media-namespace equivalent of PP_Picture_Dev.
 class MEDIA_EXPORT Picture {
  public:
   // Defaults |size_changed_| to false. Size changed is currently only used
   // by AVDA and is set via set_size_changd().
   Picture(int32_t picture_buffer_id,
@@ skipping 30 matching lines @@
   int32_t picture_buffer_id_;
   int32_t bitstream_buffer_id_;
   gfx::Rect visible_rect_;
   bool allow_overlay_;
   bool size_changed_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_PICTURE_H_