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

Side by Side Diff: gpu/gles2_conform_support/egl/context.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: revert to passing via destructor 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/gles2_conform_support/egl/context.h" 5 #include "gpu/gles2_conform_support/egl/context.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "gpu/command_buffer/client/gles2_implementation.h" 10 #include "gpu/command_buffer/client/gles2_implementation.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 transfer_buffer_manager->Initialize(); 252 transfer_buffer_manager->Initialize();
253 253
254 std::unique_ptr<gpu::CommandBufferService> command_buffer( 254 std::unique_ptr<gpu::CommandBufferService> command_buffer(
255 new gpu::CommandBufferService(transfer_buffer_manager.get())); 255 new gpu::CommandBufferService(transfer_buffer_manager.get()));
256 256
257 scoped_refptr<gpu::gles2::FeatureInfo> feature_info( 257 scoped_refptr<gpu::gles2::FeatureInfo> feature_info(
258 new gpu::gles2::FeatureInfo(gpu_driver_bug_workarounds_)); 258 new gpu::gles2::FeatureInfo(gpu_driver_bug_workarounds_));
259 scoped_refptr<gpu::gles2::ContextGroup> group(new gpu::gles2::ContextGroup( 259 scoped_refptr<gpu::gles2::ContextGroup> group(new gpu::gles2::ContextGroup(
260 gpu_preferences_, nullptr, nullptr, 260 gpu_preferences_, nullptr, nullptr,
261 new gpu::gles2::ShaderTranslatorCache(gpu_preferences_), 261 new gpu::gles2::ShaderTranslatorCache(gpu_preferences_),
262 new gpu::gles2::FramebufferCompletenessCache, feature_info, true, 262 new gpu::gles2::FramebufferCompletenessCache, feature_info, true, nullptr,
263 nullptr)); 263 &progress_reporter_));
264 264
265 std::unique_ptr<gpu::gles2::GLES2Decoder> decoder( 265 std::unique_ptr<gpu::gles2::GLES2Decoder> decoder(
266 gpu::gles2::GLES2Decoder::Create(group.get())); 266 gpu::gles2::GLES2Decoder::Create(group.get()));
267 if (!decoder.get()) 267 if (!decoder.get())
268 return false; 268 return false;
269 269
270 std::unique_ptr<gpu::CommandExecutor> command_executor( 270 std::unique_ptr<gpu::CommandExecutor> command_executor(
271 new gpu::CommandExecutor(command_buffer.get(), decoder.get(), 271 new gpu::CommandExecutor(command_buffer.get(), decoder.get(),
272 decoder.get())); 272 decoder.get()));
273 273
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 return false; 388 return false;
389 if (!gl_context_->MakeCurrent(gl_surface)) { 389 if (!gl_context_->MakeCurrent(gl_surface)) {
390 MarkServiceContextLost(); 390 MarkServiceContextLost();
391 return false; 391 return false;
392 } 392 }
393 client_gl_context_->Flush(); 393 client_gl_context_->Flush();
394 return true; 394 return true;
395 } 395 }
396 396
397 } // namespace egl 397 } // namespace egl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698