Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: gpu/command_buffer/service/shader_manager.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: remove throttling Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/shader_manager.cc
diff --git a/gpu/command_buffer/service/shader_manager.cc b/gpu/command_buffer/service/shader_manager.cc
index 94ffe42ce4de5a2d82a0d367b8a191734bcd9fb3..3d5959aa011066ac8382d751dee250b8d2d3dd91 100644
--- a/gpu/command_buffer/service/shader_manager.cc
+++ b/gpu/command_buffer/service/shader_manager.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "gpu/command_buffer/service/progress_reporter.h"
namespace gpu {
namespace gles2 {
@@ -273,13 +274,16 @@ 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();
}
}

Powered by Google App Engine
This is Rietveld 408576698