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

Side by Side Diff: media/renderers/mock_gpu_video_accelerator_factories.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 years, 7 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
« no previous file with comments | « media/renderers/mock_gpu_video_accelerator_factories.h ('k') | media/renderers/renderer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "media/renderers/mock_gpu_video_accelerator_factories.h" 5 #include "media/renderers/mock_gpu_video_accelerator_factories.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "ui/gfx/buffer_format_util.h" 8 #include "ui/gfx/buffer_format_util.h"
8 #include "ui/gfx/gpu_memory_buffer.h" 9 #include "ui/gfx/gpu_memory_buffer.h"
9 10
10 namespace media { 11 namespace media {
11 12
12 namespace { 13 namespace {
13 14
14 bool gpu_memory_buffers_in_use_by_window_server = false; 15 bool gpu_memory_buffers_in_use_by_window_server = false;
15 16
16 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { 17 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 MockGpuVideoAcceleratorFactories::MockGpuVideoAcceleratorFactories( 86 MockGpuVideoAcceleratorFactories::MockGpuVideoAcceleratorFactories(
86 gpu::gles2::GLES2Interface* gles2) 87 gpu::gles2::GLES2Interface* gles2)
87 : gles2_(gles2) {} 88 : gles2_(gles2) {}
88 89
89 MockGpuVideoAcceleratorFactories::~MockGpuVideoAcceleratorFactories() {} 90 MockGpuVideoAcceleratorFactories::~MockGpuVideoAcceleratorFactories() {}
90 91
91 bool MockGpuVideoAcceleratorFactories::IsGpuVideoAcceleratorEnabled() { 92 bool MockGpuVideoAcceleratorFactories::IsGpuVideoAcceleratorEnabled() {
92 return true; 93 return true;
93 } 94 }
94 95
95 scoped_ptr<gfx::GpuMemoryBuffer> 96 std::unique_ptr<gfx::GpuMemoryBuffer>
96 MockGpuVideoAcceleratorFactories::AllocateGpuMemoryBuffer( 97 MockGpuVideoAcceleratorFactories::AllocateGpuMemoryBuffer(
97 const gfx::Size& size, 98 const gfx::Size& size,
98 gfx::BufferFormat format, 99 gfx::BufferFormat format,
99 gfx::BufferUsage /* usage */) { 100 gfx::BufferUsage /* usage */) {
100 if (fail_to_allocate_gpu_memory_buffer_) 101 if (fail_to_allocate_gpu_memory_buffer_)
101 return nullptr; 102 return nullptr;
102 return make_scoped_ptr<gfx::GpuMemoryBuffer>( 103 return base::WrapUnique(new GpuMemoryBufferImpl(size, format));
103 new GpuMemoryBufferImpl(size, format));
104 } 104 }
105 105
106 void MockGpuVideoAcceleratorFactories:: 106 void MockGpuVideoAcceleratorFactories::
107 SetGpuMemoryBuffersInUseByMacOSWindowServer(bool in_use) { 107 SetGpuMemoryBuffersInUseByMacOSWindowServer(bool in_use) {
108 gpu_memory_buffers_in_use_by_window_server = in_use; 108 gpu_memory_buffers_in_use_by_window_server = in_use;
109 } 109 }
110 110
111 scoped_ptr<base::SharedMemory> 111 std::unique_ptr<base::SharedMemory>
112 MockGpuVideoAcceleratorFactories::CreateSharedMemory(size_t size) { 112 MockGpuVideoAcceleratorFactories::CreateSharedMemory(size_t size) {
113 return nullptr; 113 return nullptr;
114 } 114 }
115 115
116 scoped_ptr<VideoDecodeAccelerator> 116 std::unique_ptr<VideoDecodeAccelerator>
117 MockGpuVideoAcceleratorFactories::CreateVideoDecodeAccelerator() { 117 MockGpuVideoAcceleratorFactories::CreateVideoDecodeAccelerator() {
118 return scoped_ptr<VideoDecodeAccelerator>(DoCreateVideoDecodeAccelerator()); 118 return base::WrapUnique(DoCreateVideoDecodeAccelerator());
119 } 119 }
120 120
121 scoped_ptr<VideoEncodeAccelerator> 121 std::unique_ptr<VideoEncodeAccelerator>
122 MockGpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator() { 122 MockGpuVideoAcceleratorFactories::CreateVideoEncodeAccelerator() {
123 return scoped_ptr<VideoEncodeAccelerator>(DoCreateVideoEncodeAccelerator()); 123 return base::WrapUnique(DoCreateVideoEncodeAccelerator());
124 } 124 }
125 125
126 bool MockGpuVideoAcceleratorFactories::ShouldUseGpuMemoryBuffersForVideoFrames() 126 bool MockGpuVideoAcceleratorFactories::ShouldUseGpuMemoryBuffersForVideoFrames()
127 const { 127 const {
128 return false; 128 return false;
129 } 129 }
130 130
131 unsigned MockGpuVideoAcceleratorFactories::ImageTextureTarget( 131 unsigned MockGpuVideoAcceleratorFactories::ImageTextureTarget(
132 gfx::BufferFormat format) { 132 gfx::BufferFormat format) {
133 return GL_TEXTURE_2D; 133 return GL_TEXTURE_2D;
134 } 134 }
135 135
136 namespace { 136 namespace {
137 class ScopedGLContextLockImpl 137 class ScopedGLContextLockImpl
138 : public GpuVideoAcceleratorFactories::ScopedGLContextLock { 138 : public GpuVideoAcceleratorFactories::ScopedGLContextLock {
139 public: 139 public:
140 ScopedGLContextLockImpl(MockGpuVideoAcceleratorFactories* gpu_factories) 140 ScopedGLContextLockImpl(MockGpuVideoAcceleratorFactories* gpu_factories)
141 : gpu_factories_(gpu_factories) {} 141 : gpu_factories_(gpu_factories) {}
142 gpu::gles2::GLES2Interface* ContextGL() override { 142 gpu::gles2::GLES2Interface* ContextGL() override {
143 return gpu_factories_->GetGLES2Interface(); 143 return gpu_factories_->GetGLES2Interface();
144 } 144 }
145 145
146 private: 146 private:
147 MockGpuVideoAcceleratorFactories* gpu_factories_; 147 MockGpuVideoAcceleratorFactories* gpu_factories_;
148 }; 148 };
149 } // namespace 149 } // namespace
150 150
151 scoped_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock> 151 std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock>
152 MockGpuVideoAcceleratorFactories::GetGLContextLock() { 152 MockGpuVideoAcceleratorFactories::GetGLContextLock() {
153 DCHECK(gles2_); 153 DCHECK(gles2_);
154 return make_scoped_ptr(new ScopedGLContextLockImpl(this)); 154 return base::WrapUnique(new ScopedGLContextLockImpl(this));
155 } 155 }
156 156
157 } // namespace media 157 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/mock_gpu_video_accelerator_factories.h ('k') | media/renderers/renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698