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

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

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: 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/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index d19ae397292e002f3a6d6e9e6fcb0037462924bb..658fcb95ccbcc02b3b079b29592a78bf16616661 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -21,6 +21,7 @@
#include "gpu/command_buffer/service/logger.h"
#include "gpu/command_buffer/service/mailbox_manager.h"
#include "gpu/command_buffer/service/program_manager.h"
+#include "gpu/command_buffer/service/progress_reporter.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "gpu/command_buffer/service/vertex_attrib_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -193,11 +194,11 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine(
feature_info = new FeatureInfo(*command_line, gpu_driver_bug_workaround);
}
- group_ = scoped_refptr<ContextGroup>(
- new ContextGroup(gpu_preferences_, NULL, memory_tracker_,
- new ShaderTranslatorCache(gpu_preferences_),
- new FramebufferCompletenessCache, feature_info,
- normalized_init.bind_generates_resource, nullptr));
+ group_ = scoped_refptr<ContextGroup>(new ContextGroup(
+ gpu_preferences_, NULL, memory_tracker_,
+ new ShaderTranslatorCache(gpu_preferences_),
+ new FramebufferCompletenessCache, feature_info,
+ normalized_init.bind_generates_resource, nullptr, nullptr));
bool use_default_textures = normalized_init.bind_generates_resource;
InSequence sequence;

Powered by Google App Engine
This is Rietveld 408576698