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

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

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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef GPU_GLES2_CONFORM_TEST_CONTEXT_H_ 5 #ifndef GPU_GLES2_CONFORM_TEST_CONTEXT_H_
6 #define GPU_GLES2_CONFORM_TEST_CONTEXT_H_ 6 #define GPU_GLES2_CONFORM_TEST_CONTEXT_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 12 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
13 #include "gpu/command_buffer/client/gpu_control.h" 13 #include "gpu/command_buffer/client/gpu_control.h"
14 #include "gpu/command_buffer/service/command_buffer_service.h" 14 #include "gpu/command_buffer/service/command_buffer_service.h"
15 #include "gpu/command_buffer/service/command_executor.h" 15 #include "gpu/command_buffer/service/command_executor.h"
16 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 16 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
17 #include "gpu/command_buffer/service/gpu_preferences.h" 17 #include "gpu/command_buffer/service/gpu_preferences.h"
18 #include "gpu/command_buffer/service/progress_reporter_stub.h"
18 #include "gpu/config/gpu_driver_bug_workarounds.h" 19 #include "gpu/config/gpu_driver_bug_workarounds.h"
19 #include "ui/gfx/native_widget_types.h" 20 #include "ui/gfx/native_widget_types.h"
20 #include "ui/gl/gl_context.h" 21 #include "ui/gl/gl_context.h"
21 #include "ui/gl/gl_context.h" 22 #include "ui/gl/gl_context.h"
22 #include "ui/gl/gl_surface.h" 23 #include "ui/gl/gl_surface.h"
23 #include "ui/gl/gl_surface.h" 24 #include "ui/gl/gl_surface.h"
24 #include <EGL/egl.h> 25 #include <EGL/egl.h>
25 26
26 namespace gpu { 27 namespace gpu {
27 class TransferBuffer; 28 class TransferBuffer;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 const Config* config_; 105 const Config* config_;
105 bool is_current_in_some_thread_; 106 bool is_current_in_some_thread_;
106 bool is_destroyed_; 107 bool is_destroyed_;
107 gpu::GpuPreferences gpu_preferences_; 108 gpu::GpuPreferences gpu_preferences_;
108 const gpu::GpuDriverBugWorkarounds gpu_driver_bug_workarounds_; 109 const gpu::GpuDriverBugWorkarounds gpu_driver_bug_workarounds_;
109 std::unique_ptr<gpu::CommandBufferService> command_buffer_; 110 std::unique_ptr<gpu::CommandBufferService> command_buffer_;
110 std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_; 111 std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
111 std::unique_ptr<gpu::gles2::GLES2Decoder> decoder_; 112 std::unique_ptr<gpu::gles2::GLES2Decoder> decoder_;
112 std::unique_ptr<gpu::CommandExecutor> command_executor_; 113 std::unique_ptr<gpu::CommandExecutor> command_executor_;
113 std::unique_ptr<gpu::TransferBuffer> transfer_buffer_; 114 std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
115 gpu::gles2::ProgressReporterStub progress_reporter_;
114 116
115 scoped_refptr<gl::GLContext> gl_context_; 117 scoped_refptr<gl::GLContext> gl_context_;
116 118
117 std::unique_ptr<gpu::gles2::GLES2Interface> client_gl_context_; 119 std::unique_ptr<gpu::gles2::GLES2Interface> client_gl_context_;
118 DISALLOW_COPY_AND_ASSIGN(Context); 120 DISALLOW_COPY_AND_ASSIGN(Context);
119 }; 121 };
120 122
121 } // namespace egl 123 } // namespace egl
122 124
123 #endif // GPU_GLES2_CONFORM_TEST_CONTEXT_H_ 125 #endif // GPU_GLES2_CONFORM_TEST_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698