Ping watchdog thread during GpuChannel destruction

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/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
+class ProgressReporter;
+
 enum ShaderVariableBaseType {
   SHADER_VARIABLE_INT = 0x01,
   SHADER_VARIABLE_UINT = 0x02,
   SHADER_VARIABLE_FLOAT = 0x03,
   SHADER_VARIABLE_UNDEFINED_TYPE = 0x00
 };
 
 // This is used to keep the source code for a shader. This is because in order
 // to emluate GLES2 the shaders will have to be re-written before passed to
 // the underlying OpenGL. But, when the user calls glGetShaderSource they
@@ skipping 230 matching lines @@
   // The name hashing info when the shader was last compiled.
   NameMap name_map_;
 };
 
 // Tracks the Shaders.
 //
 // NOTE: To support shared resources an instance of this class will
 // need to be shared by multiple GLES2Decoders.
 class GPU_EXPORT ShaderManager {
  public:
-  ShaderManager();
+  ShaderManager(ProgressReporter* progress_reporter);
   ~ShaderManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a shader for the given shader ID.
   Shader* CreateShader(
       GLuint client_id,
       GLuint service_id,
       GLenum shader_type);
@@ skipping 19 matching lines @@
 
  private:
   friend class Shader;
 
   // Info for each shader by service side shader Id.
   typedef base::hash_map<GLuint, scoped_refptr<Shader> > ShaderMap;
   ShaderMap shaders_;
 
   void RemoveShader(Shader* shader);
 
+  // Used to notify the watchdog thread of progress during destruction,
+  // preventing time-outs when destruction takes a long time. May be null when
+  // using in-process command buffer.
+  ProgressReporter* progress_reporter_;
+
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_