Remove NameMap from shader translator and shader/program managers

gpu/command_buffer/service/shader_manager.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/shader_manager.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 57 matching lines @@
   valid_ = false;
 
   // Translate GL ES 2.0 shader to Desktop GL shader and pass that to
   // glShaderSource and then glCompileShader.
   const char* source_for_driver = last_compiled_source_.c_str();
   ShaderTranslatorInterface* translator = translator_.get();
   if (translator) {
     bool success = translator->Translate(
         last_compiled_source_, &log_info_, &translated_source_,
         &shader_version_, &attrib_map_, &uniform_map_, &varying_map_,
-        &interface_block_map_, &output_variable_list_, &name_map_);
+        &interface_block_map_, &output_variable_list_);
     if (!success) {
       return;
     }
     source_for_driver = translated_source_.c_str();
   }
 
   glShaderSource(service_id_, 1, &source_for_driver, NULL);
   glCompileShader(service_id_);
 
   if (source_type_ == kANGLE) {
@@ skipping 128 matching lines @@
     const std::string& original_name) const {
   for (const auto& value : output_variable_list_) {
     if (value.name == original_name)
       return &value.mappedName;
   }
   return nullptr;
 }
 
 const std::string* Shader::GetOriginalNameFromHashedName(
     const std::string& hashed_name) const {
-  NameMap::const_iterator it = name_map_.find(hashed_name);
-  if (it != name_map_.end())
-    return &(it->second);
-  return NULL;
-}
-
-const std::string* Shader::GetMappedName(
-    const std::string& original_name) const {
-  for (const auto& key_value : name_map_) {
-    if (key_value.second == original_name)
-      return &(key_value.first);
+  if (const auto* info = GetAttribInfo(hashed_name)) {
+    return &info->name;
   }
-  return NULL;
+  if (const auto* info = GetUniformInfo(hashed_name)) {
+    return &info->name;
+  }
+  if (const auto* info = GetVaryingInfo(hashed_name)) {
+    return &info->name;
+  }
+  if (const auto* info = GetInterfaceBlockInfo(hashed_name)) {
+    return &info->name;
+  }
+  if (const auto* info = GetOutputVariableInfo(hashed_name)) {
+    return &info->name;
+  }
+  return nullptr;
 }
 
 const sh::Uniform* Shader::GetUniformInfo(const std::string& name) const {
   UniformMap::const_iterator it = uniform_map_.find(GetTopVariableName(name));
   return it != uniform_map_.end() ? &it->second : NULL;
 }
 
 const sh::Varying* Shader::GetVaryingInfo(const std::string& name) const {
   VaryingMap::const_iterator it = varying_map_.find(GetTopVariableName(name));
   return it != varying_map_.end() ? &it->second : NULL;
@@ skipping 106 matching lines @@
 
 void ShaderManager::UnuseShader(Shader* shader) {
   DCHECK(shader);
   DCHECK(IsOwned(shader));
   shader->DecUseCount();
   RemoveShader(shader);
 }
 
 }  // namespace gles2
 }  // namespace gpu