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

Side by Side Diff: ui/compositor/test/in_process_context_provider.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ 5 #ifndef UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
6 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ 6 #define UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
16 #include "cc/output/context_provider.h" 16 #include "cc/output/context_provider.h"
17 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 17 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
18 #include "skia/ext/refptr.h" 18 #include "skia/ext/refptr.h"
19 #include "ui/gfx/native_widget_types.h" 19 #include "ui/gfx/native_widget_types.h"
20 20
21 namespace gpu { 21 namespace gpu {
22 class GLInProcessContext; 22 class GLInProcessContext;
23 class GpuMemoryBufferManager; 23 class GpuMemoryBufferManager;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 InProcessContextProvider* shared_context, 62 InProcessContextProvider* shared_context,
63 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 63 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
64 gpu::ImageFactory* image_factory, 64 gpu::ImageFactory* image_factory,
65 gfx::AcceleratedWidget window, 65 gfx::AcceleratedWidget window,
66 const std::string& debug_name); 66 const std::string& debug_name);
67 ~InProcessContextProvider() override; 67 ~InProcessContextProvider() override;
68 68
69 base::ThreadChecker main_thread_checker_; 69 base::ThreadChecker main_thread_checker_;
70 base::ThreadChecker context_thread_checker_; 70 base::ThreadChecker context_thread_checker_;
71 71
72 scoped_ptr<gpu::GLInProcessContext> context_; 72 std::unique_ptr<gpu::GLInProcessContext> context_;
73 skia::RefPtr<class GrContext> gr_context_; 73 skia::RefPtr<class GrContext> gr_context_;
74 74
75 gpu::gles2::ContextCreationAttribHelper attribs_; 75 gpu::gles2::ContextCreationAttribHelper attribs_;
76 InProcessContextProvider* shared_context_; 76 InProcessContextProvider* shared_context_;
77 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_; 77 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
78 gpu::ImageFactory* image_factory_; 78 gpu::ImageFactory* image_factory_;
79 gfx::AcceleratedWidget window_; 79 gfx::AcceleratedWidget window_;
80 std::string debug_name_; 80 std::string debug_name_;
81 cc::ContextProvider::Capabilities capabilities_; 81 cc::ContextProvider::Capabilities capabilities_;
82 82
83 base::Lock context_lock_; 83 base::Lock context_lock_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(InProcessContextProvider); 85 DISALLOW_COPY_AND_ASSIGN(InProcessContextProvider);
86 }; 86 };
87 87
88 } // namespace ui 88 } // namespace ui
89 89
90 #endif // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_ 90 #endif // UI_COMPOSITOR_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
OLDNEW
« no previous file with comments | « ui/compositor/test/in_process_context_factory.cc ('k') | ui/compositor/test/test_compositor_host_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698