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

Unified Diff: gpu/command_buffer/tests/gl_manager.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: Fix lifetime and use nullptr Created 4 years, 2 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/tests/gl_manager.cc
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index 6d6658cb73d90e44790fcb8e779b88beb5f161d2..482efa619e29dd0e39436fe17f2f9ae7fbfd65de 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -301,10 +301,10 @@ void GLManager::InitializeWithCommandLine(
scoped_refptr<gles2::FeatureInfo> feature_info =
new gles2::FeatureInfo(command_line, gpu_driver_bug_workaround);
context_group = new gles2::ContextGroup(
- gpu_preferences_, mailbox_manager_.get(), NULL,
+ gpu_preferences_, mailbox_manager_.get(), nullptr,
new gpu::gles2::ShaderTranslatorCache(gpu_preferences_),
new gpu::gles2::FramebufferCompletenessCache, feature_info,
- options.bind_generates_resource, options.image_factory);
+ options.bind_generates_resource, options.image_factory, nullptr);
}
decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group));

Powered by Google App Engine
This is Rietveld 408576698