Remove NameMap from shader translator and shader/program managers

gpu/command_buffer/service/shader_translator.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "gpu/gpu_export.h"
 #include "third_party/angle/include/GLSLANG/ShaderLang.h"
 
 namespace gl {
 struct GLVersionInfo;
 }
 
 namespace gpu {
 namespace gles2 {
 
 // Mapping between variable name and info.
 typedef base::hash_map<std::string, sh::Attribute> AttributeMap;
 typedef std::vector<sh::OutputVariable> OutputVariableList;
 typedef base::hash_map<std::string, sh::Uniform> UniformMap;
 typedef base::hash_map<std::string, sh::Varying> VaryingMap;
 typedef base::hash_map<std::string, sh::InterfaceBlock> InterfaceBlockMap;
-// Mapping between hashed name and original name.
-typedef base::hash_map<std::string, std::string> NameMap;
 
 // Translates a GLSL ES 2.0 shader to desktop GLSL shader, or just
 // validates GLSL ES 2.0 shaders on a true GLSL ES implementation.
 class ShaderTranslatorInterface
     : public base::RefCounted<ShaderTranslatorInterface> {
  public:
   ShaderTranslatorInterface() {}
 
   // Initializes the translator.
   // Must be called once before using the translator object.
@@ skipping 10 matching lines @@
   // Upon success, fill |translated_shader|, |attrib_map|, |uniform_map|,
   // |varying_map|, and |name_map| if they are non-null.
   virtual bool Translate(const std::string& shader_source,
                          std::string* info_log,
                          std::string* translated_shader,
                          int* shader_version,
                          AttributeMap* attrib_map,
                          UniformMap* uniform_map,
                          VaryingMap* varying_map,
                          InterfaceBlockMap* interface_block_map,
-                         OutputVariableList* output_variable_list,
-                         NameMap* name_map) const = 0;
+                         OutputVariableList* output_variable_list) const = 0;
 
   // Return a string that is unique for a specfic set of options that would
   // possibly affect compilation.
   virtual std::string GetStringForOptionsThatWouldAffectCompilation() const = 0;
 
  protected:
   virtual ~ShaderTranslatorInterface() {}
 
  private:
   friend class base::RefCounted<ShaderTranslatorInterface>;
@@ skipping 31 matching lines @@
 
   // Overridden from ShaderTranslatorInterface.
   bool Translate(const std::string& shader_source,
                  std::string* info_log,
                  std::string* translated_source,
                  int* shader_version,
                  AttributeMap* attrib_map,
                  UniformMap* uniform_map,
                  VaryingMap* varying_map,
                  InterfaceBlockMap* interface_block_map,
-                 OutputVariableList* output_variable_list,
-                 NameMap* name_map) const override;
+                 OutputVariableList* output_variable_list) const override;
 
   std::string GetStringForOptionsThatWouldAffectCompilation() const override;
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
  private:
   ~ShaderTranslator() override;
 
   ShCompileOptions GetCompileOptions() const;
 
   ShHandle compiler_;
   ShCompileOptions compile_options_;
   base::ObserverList<DestructionObserver> destruction_observers_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_