Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/context_group.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_CONTEXT_GROUP_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 21 matching lines @@
 namespace gles2 {
 
 class ProgramCache;
 class BufferManager;
 class GLES2Decoder;
 class FramebufferManager;
 class MailboxManager;
 class RenderbufferManager;
 class PathManager;
 class ProgramManager;
+class ProgressReporter;
 class SamplerManager;
 class ShaderManager;
 class TextureManager;
 class MemoryTracker;
 struct DisallowedFeatures;
 struct PassthroughResources;
 
 // A Context Group helps manage multiple GLES2Decoders that share
 // resources.
 class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
  public:
   ContextGroup(
       const GpuPreferences& gpu_preferences,
       const scoped_refptr<MailboxManager>& mailbox_manager,
       const scoped_refptr<MemoryTracker>& memory_tracker,
       const scoped_refptr<ShaderTranslatorCache>& shader_translator_cache,
       const scoped_refptr<FramebufferCompletenessCache>&
           framebuffer_completeness_cache,
       const scoped_refptr<FeatureInfo>& feature_info,
       bool bind_generates_resource,
-      gpu::ImageFactory* image_factory);
+      gpu::ImageFactory* image_factory,
+      ProgressReporter* progress_reporter);
 
   // This should only be called by GLES2Decoder. This must be paired with a
   // call to destroy if it succeeds.
   bool Initialize(
       GLES2Decoder* decoder,
       ContextType context_type,
       const DisallowedFeatures& disallowed_features);
 
   // Destroys all the resources when called for the last context in the group.
   // It should only be called by GLES2Decoder.
@@ skipping 154 matching lines @@
 
  private:
   friend class base::RefCounted<ContextGroup>;
   ~ContextGroup();
 
   bool CheckGLFeature(GLint min_required, GLint* v);
   bool CheckGLFeatureU(GLint min_required, uint32_t* v);
   bool QueryGLFeature(GLenum pname, GLint min_required, GLint* v);
   bool QueryGLFeatureU(GLenum pname, GLint min_required, uint32_t* v);
   bool HaveContexts();
+  void ReportProgress();
 
   const GpuPreferences& gpu_preferences_;
   scoped_refptr<MailboxManager> mailbox_manager_;
   scoped_refptr<MemoryTracker> memory_tracker_;
   scoped_refptr<ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<FramebufferCompletenessCache> framebuffer_completeness_cache_;
   scoped_refptr<TransferBufferManager> transfer_buffer_manager_;
 
   bool enforce_gl_minimums_;
   bool bind_generates_resource_;
@@ skipping 40 matching lines @@
 
   gpu::ImageFactory* image_factory_;
 
   std::vector<base::WeakPtr<gles2::GLES2Decoder> > decoders_;
 
   // Mappings from client side IDs to service side IDs.
   base::hash_map<GLuint, GLsync> syncs_id_map_;
 
   std::unique_ptr<PassthroughResources> passthrough_resources_;
 
+  // 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(ContextGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_