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

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

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: convert newly added scoped_ptr's Created 4 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SUPPORT_EGL_DISPLAY_H_ 5 #ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
7 7
8 #include <EGL/egl.h> 8 #include <EGL/egl.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 11
12 #include <memory>
13
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 15 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
15 #include "gpu/command_buffer/client/gpu_control.h" 16 #include "gpu/command_buffer/client/gpu_control.h"
16 #include "gpu/command_buffer/service/command_buffer_service.h" 17 #include "gpu/command_buffer/service/command_buffer_service.h"
17 #include "gpu/command_buffer/service/command_executor.h" 18 #include "gpu/command_buffer/service/command_executor.h"
18 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 19 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
19 #include "gpu/command_buffer/service/gpu_preferences.h" 20 #include "gpu/command_buffer/service/gpu_preferences.h"
20 #include "ui/gfx/native_widget_types.h" 21 #include "ui/gfx/native_widget_types.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 24
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 110
110 gpu::GpuPreferences gpu_preferences_; 111 gpu::GpuPreferences gpu_preferences_;
111 bool is_initialized_; 112 bool is_initialized_;
112 113
113 bool create_offscreen_; 114 bool create_offscreen_;
114 int create_offscreen_width_; 115 int create_offscreen_width_;
115 int create_offscreen_height_; 116 int create_offscreen_height_;
116 uint64_t next_fence_sync_release_; 117 uint64_t next_fence_sync_release_;
117 118
118 scoped_refptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_; 119 scoped_refptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_;
119 scoped_ptr<gpu::CommandBufferService> command_buffer_; 120 std::unique_ptr<gpu::CommandBufferService> command_buffer_;
120 scoped_ptr<gpu::CommandExecutor> executor_; 121 std::unique_ptr<gpu::CommandExecutor> executor_;
121 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 122 std::unique_ptr<gpu::gles2::GLES2Decoder> decoder_;
122 scoped_refptr<gfx::GLContext> gl_context_; 123 scoped_refptr<gfx::GLContext> gl_context_;
123 scoped_refptr<gfx::GLSurface> gl_surface_; 124 scoped_refptr<gfx::GLSurface> gl_surface_;
124 scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_; 125 std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;
125 scoped_ptr<gpu::TransferBuffer> transfer_buffer_; 126 std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
126 127
127 // TODO(alokp): Support more than one config, surface, and context. 128 // TODO(alokp): Support more than one config, surface, and context.
128 scoped_ptr<Config> config_; 129 std::unique_ptr<Config> config_;
129 scoped_ptr<Surface> surface_; 130 std::unique_ptr<Surface> surface_;
130 scoped_ptr<gpu::gles2::GLES2Implementation> context_; 131 std::unique_ptr<gpu::gles2::GLES2Implementation> context_;
131 132
132 DISALLOW_COPY_AND_ASSIGN(Display); 133 DISALLOW_COPY_AND_ASSIGN(Display);
133 }; 134 };
134 135
135 } // namespace egl 136 } // namespace egl
136 137
137 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 138 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698