Update from https://crrev.com/316786

gpu/command_buffer/service/shader_manager.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_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ skipping 17 matching lines @@
     kANGLE,
     kGL,  // GL or GLES
   };
 
   enum ShaderState {
     kShaderStateWaiting,
     kShaderStateCompileRequested,
     kShaderStateCompiled, // Signifies compile happened, not valid compile.
   };
 
-  void RequestCompile();
+  void RequestCompile(scoped_refptr<ShaderTranslatorInterface> translator,
+                      TranslatedShaderSourceType type);
 
-  void DoCompile(ShaderTranslatorInterface* translator,
-                 TranslatedShaderSourceType type);
+  void DoCompile();
 
   ShaderState shader_state() const {
     return shader_state_;
   }
 
   GLuint service_id() const {
     return service_id_;
   }
 
   GLenum shader_type() const {
     return shader_type_;
   }
 
   const std::string& source() const {
     return source_;
   }
 
   void set_source(const std::string& source) {
     source_ = source;
   }
 
   const std::string& translated_source() const {
     return translated_source_;
   }
 
-  const std::string& last_compiled_source() const {
+  std::string last_compiled_source() const {
     return last_compiled_source_;
   }
 
+  std::string last_compiled_signature() const {
+    if (translator_.get()) {
+      return last_compiled_source_ +
+             translator_->GetStringForOptionsThatWouldAffectCompilation();
+    }
+    return last_compiled_source_;
+  }
+
   const sh::Attribute* GetAttribInfo(const std::string& name) const;
   const sh::Uniform* GetUniformInfo(const std::string& name) const;
   const sh::Varying* GetVaryingInfo(const std::string& name) const;
 
   // If the original_name is not found, return NULL.
   const std::string* GetAttribMappedName(
       const std::string& original_name) const;
 
   // If the hashed_name is not found, return NULL.
   const std::string* GetOriginalNameFromHashedName(
@@ skipping 64 matching lines @@
 
   // The current state of the shader.
   ShaderState shader_state_;
 
   // The shader this Shader is tracking.
   GLuint service_id_;
 
   // Type of shader - GL_VERTEX_SHADER or GL_FRAGMENT_SHADER.
   GLenum shader_type_;
 
+  // Translated source type when shader was last requested to be compiled.
+  TranslatedShaderSourceType source_type_;
+
+  // Translator to use, set when shader was last requested to be compiled.
+  scoped_refptr<ShaderTranslatorInterface> translator_;
+
   // True if compilation succeeded.
   bool valid_;
 
   // The shader source as passed to glShaderSource.
   std::string source_;
 
   // The source the last compile used.
   std::string last_compiled_source_;
 
   // The translated shader source.
@@ skipping 58 matching lines @@
   void RemoveShader(Shader* shader);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_