Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/shader_manager.cc

 // 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.
 
 #include "gpu/command_buffer/service/shader_manager.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "gpu/command_buffer/service/progress_reporter.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 // Given a variable name | a[0].b.c[0] |, return |a|.
 std::string GetTopVariableName(const std::string& fullname) {
   size_t pos = fullname.find_first_of("[.");
   if (pos == std::string::npos)
@@ skipping 243 matching lines @@
   }
   return nullptr;
 }
 
 ShaderManager::ShaderManager() {}
 
 ShaderManager::~ShaderManager() {
   DCHECK(shaders_.empty());
 }
 
-void ShaderManager::Destroy(bool have_context) {
+void ShaderManager::Destroy(bool have_context,
+                            ProgressReporter* progress_reporter) {
   while (!shaders_.empty()) {
     if (have_context) {
       Shader* shader = shaders_.begin()->second.get();
       shader->Destroy();
     }
     shaders_.erase(shaders_.begin());
+    if (progress_reporter)

[danakj, 2016/10/05 01:53:48]

same, when is it null?

[ericrk, 2016/10/05 18:07:31]

removed.

+      progress_reporter->ReportProgress();
   }
 }
 
 Shader* ShaderManager::CreateShader(
     GLuint client_id,
     GLuint service_id,
     GLenum shader_type) {
   std::pair<ShaderMap::iterator, bool> result =
       shaders_.insert(std::make_pair(
           client_id, scoped_refptr<Shader>(
@@ skipping 59 matching lines @@
 
 void ShaderManager::UnuseShader(Shader* shader) {
   DCHECK(shader);
   DCHECK(IsOwned(shader));
   shader->DecUseCount();
   RemoveShader(shader);
 }
 
 }  // namespace gles2
 }  // namespace gpu