Disambiguate texture target/face in TextureManager

* Rename "face" parameter to "target" in:
  * gpu::gles2::TextureManager::GetLevelSize
  * gpu::gles2::TextureManager::GetLevelType
  * gpu::gles2::TextureManager::ValidForTexture
* Correct use of said parameter in
  content::GpuVideoDecodeAccelerator::OnAssignPictureBuffers

Change-Id: I0fb0be98a368106f35a6a59d7a0b9c98f4a24421

BUG=chromium:170170
TEST=trybots


Review URL: https://chromiumcodereview.appspot.com/11866013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177367 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 16 insertions, 16 deletions

diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc
index e5fe971..79ce8ac 100644
--- a/gpu/command_buffer/service/texture_manager.cc
+++ b/gpu/command_buffer/service/texture_manager.cc
@@ -389,7 +389,7 @@ void TextureManager::TextureInfo::SetLevelInfo(
 }
 
 bool TextureManager::TextureInfo::ValidForTexture(
-    GLint face,
+    GLint target,
     GLint level,
     GLint xoffset,
     GLint yoffset,
@@ -397,10 +397,10 @@ bool TextureManager::TextureInfo::ValidForTexture(
     GLsizei height,
     GLenum format,
     GLenum type) const {
-  size_t face_index = GLTargetToFaceIndex(face);
+  size_t face_index = GLTargetToFaceIndex(target);
   if (level >= 0 && face_index < level_infos_.size() &&
       static_cast<size_t>(level) < level_infos_[face_index].size()) {
-    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(face)][level];
+    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(target)][level];
     int32 right;
     int32 top;
     return SafeAddInt32(xoffset, width, &right) &&
@@ -416,13 +416,13 @@ bool TextureManager::TextureInfo::ValidForTexture(
 }
 
 bool TextureManager::TextureInfo::GetLevelSize(
-    GLint face, GLint level, GLsizei* width, GLsizei* height) const {
+    GLint target, GLint level, GLsizei* width, GLsizei* height) const {
   DCHECK(width);
   DCHECK(height);
-  size_t face_index = GLTargetToFaceIndex(face);
+  size_t face_index = GLTargetToFaceIndex(target);
   if (level >= 0 && face_index < level_infos_.size() &&
       static_cast<size_t>(level) < level_infos_[face_index].size()) {
-    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(face)][level];
+    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(target)][level];
     if (info.target != 0) {
       *width = info.width;
       *height = info.height;
@@ -433,13 +433,13 @@ bool TextureManager::TextureInfo::GetLevelSize(
 }
 
 bool TextureManager::TextureInfo::GetLevelType(
-    GLint face, GLint level, GLenum* type, GLenum* internal_format) const {
+    GLint target, GLint level, GLenum* type, GLenum* internal_format) const {
   DCHECK(type);
   DCHECK(internal_format);
-  size_t face_index = GLTargetToFaceIndex(face);
+  size_t face_index = GLTargetToFaceIndex(target);
   if (level >= 0 && face_index < level_infos_.size() &&
       static_cast<size_t>(level) < level_infos_[face_index].size()) {
-    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(face)][level];
+    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(target)][level];
     if (info.target != 0) {
       *type = info.type;
       *internal_format = info.internal_format;
@@ -688,11 +688,11 @@ void TextureManager::TextureInfo::SetLevelImage(
 }
 
 gfx::GLImage* TextureManager::TextureInfo::GetLevelImage(
-  GLint face, GLint level) const {
-  size_t face_index = GLTargetToFaceIndex(face);
+  GLint target, GLint level) const {
+  size_t face_index = GLTargetToFaceIndex(target);
   if (level >= 0 && face_index < level_infos_.size() &&
       static_cast<size_t>(level) < level_infos_[face_index].size()) {
-    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(face)][level];
+    const LevelInfo& info = level_infos_[GLTargetToFaceIndex(target)][level];
     if (info.target != 0) {
       return info.image;
     }
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index f0f5b6a..2318b28 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -125,15 +125,15 @@ class GPU_EXPORT TextureManager {
     // Get the width and height for a particular level. Returns false if level
     // does not exist.
     bool GetLevelSize(
-        GLint face, GLint level, GLsizei* width, GLsizei* height) const;
+        GLint target, GLint level, GLsizei* width, GLsizei* height) const;
 
     // Get the type of a level. Returns false if level does not exist.
     bool GetLevelType(
-        GLint face, GLint level, GLenum* type, GLenum* internal_format) const;
+        GLint target, GLint level, GLenum* type, GLenum* internal_format) const;
 
     // Get the image bound to a particular level. Returns NULL if level
     // does not exist.
-    gfx::GLImage* GetLevelImage(GLint face, GLint level) const;
+    gfx::GLImage* GetLevelImage(GLint target, GLint level) const;
 
     bool IsDeleted() const {
       return deleted_;
@@ -142,7 +142,7 @@ class GPU_EXPORT TextureManager {
     // Returns true of the given dimensions are inside the dimensions of the
     // level and if the format and type match the level.
     bool ValidForTexture(
-        GLint face,
+        GLint target,
         GLint level,
         GLint xoffset,
         GLint yoffset,