Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / gpu / command_buffer / service / memory_program_cache.h

diff --git a/src/gpu/command_buffer/service/memory_program_cache.h b/src/gpu/command_buffer/service/memory_program_cache.h
index e72f9f5..7560d01 100644 (file)
--- a/src/gpu/command_buffer/service/memory_program_cache.h
+++ b/src/gpu/command_buffer/service/memory_program_cache.h
@@ -24,29 +24,28 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
  public:
   MemoryProgramCache();
   explicit MemoryProgramCache(const size_t max_cache_size_bytes);
-  virtual ~MemoryProgramCache();
+  ~MemoryProgramCache() override;
 
-  virtual ProgramLoadResult LoadLinkedProgram(
+  ProgramLoadResult LoadLinkedProgram(
       GLuint program,
       Shader* shader_a,
       const ShaderTranslatorInterface* translator_a,
       Shader* shader_b,
       const ShaderTranslatorInterface* translator_b,
       const LocationMap* bind_attrib_location_map,
-      const ShaderCacheCallback& shader_callback) OVERRIDE;
-  virtual void SaveLinkedProgram(
-      GLuint program,
-      const Shader* shader_a,
-      const ShaderTranslatorInterface* translator_a,
-      const Shader* shader_b,
-      const ShaderTranslatorInterface* translator_b,
-      const LocationMap* bind_attrib_location_map,
-      const ShaderCacheCallback& shader_callback) OVERRIDE;
+      const ShaderCacheCallback& shader_callback) override;
+  void SaveLinkedProgram(GLuint program,
+                         const Shader* shader_a,
+                         const ShaderTranslatorInterface* translator_a,
+                         const Shader* shader_b,
+                         const ShaderTranslatorInterface* translator_b,
+                         const LocationMap* bind_attrib_location_map,
+                         const ShaderCacheCallback& shader_callback) override;
 
-  virtual void LoadProgram(const std::string& program) OVERRIDE;
+  void LoadProgram(const std::string& program) override;
 
  private:
-  virtual void ClearBackend() OVERRIDE;
+  void ClearBackend() override;
 
   class ProgramCacheValue : public base::RefCounted<ProgramCacheValue> {
    public:
@@ -55,13 +54,13 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
                       const char* data,
                       const std::string& program_hash,
                       const char* shader_0_hash,
-                      const ShaderTranslator::VariableMap& attrib_map_0,
-                      const ShaderTranslator::VariableMap& uniform_map_0,
-                      const ShaderTranslator::VariableMap& varying_map_0,
+                      const AttributeMap& attrib_map_0,
+                      const UniformMap& uniform_map_0,
+                      const VaryingMap& varying_map_0,
                       const char* shader_1_hash,
-                      const ShaderTranslator::VariableMap& attrib_map_1,
-                      const ShaderTranslator::VariableMap& uniform_map_1,
-                      const ShaderTranslator::VariableMap& varying_map_1,
+                      const AttributeMap& attrib_map_1,
+                      const UniformMap& uniform_map_1,
+                      const VaryingMap& varying_map_1,
                       MemoryProgramCache* program_cache);
 
     GLsizei length() const {
@@ -80,15 +79,15 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
       return shader_0_hash_;
     }
 
-    const ShaderTranslator::VariableMap& attrib_map_0() const {
+    const AttributeMap& attrib_map_0() const {
       return attrib_map_0_;
     }
 
-    const ShaderTranslator::VariableMap& uniform_map_0() const {
+    const UniformMap& uniform_map_0() const {
       return uniform_map_0_;
     }
 
-    const ShaderTranslator::VariableMap& varying_map_0() const {
+    const VaryingMap& varying_map_0() const {
       return varying_map_0_;
     }
 
@@ -96,15 +95,15 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
       return shader_1_hash_;
     }
 
-    const ShaderTranslator::VariableMap& attrib_map_1() const {
+    const AttributeMap& attrib_map_1() const {
       return attrib_map_1_;
     }
 
-    const ShaderTranslator::VariableMap& uniform_map_1() const {
+    const UniformMap& uniform_map_1() const {
       return uniform_map_1_;
     }
 
-    const ShaderTranslator::VariableMap& varying_map_1() const {
+    const VaryingMap& varying_map_1() const {
       return varying_map_1_;
     }
 
@@ -118,13 +117,13 @@ class GPU_EXPORT MemoryProgramCache : public ProgramCache {
     const scoped_ptr<const char[]> data_;
     const std::string program_hash_;
     const std::string shader_0_hash_;
-    const ShaderTranslator::VariableMap attrib_map_0_;
-    const ShaderTranslator::VariableMap uniform_map_0_;
-    const ShaderTranslator::VariableMap varying_map_0_;
+    const AttributeMap attrib_map_0_;
+    const UniformMap uniform_map_0_;
+    const VaryingMap varying_map_0_;
     const std::string shader_1_hash_;
-    const ShaderTranslator::VariableMap attrib_map_1_;
-    const ShaderTranslator::VariableMap uniform_map_1_;
-    const ShaderTranslator::VariableMap varying_map_1_;
+    const AttributeMap attrib_map_1_;
+    const UniformMap uniform_map_1_;
+    const VaryingMap varying_map_1_;
     MemoryProgramCache* const program_cache_;
 
     DISALLOW_COPY_AND_ASSIGN(ProgramCacheValue);