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

Side by Side Diff: gpu/ipc/service/gpu_memory_buffer_factory.cc

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ipc/service/gpu_memory_buffer_factory.h" 5 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h"
8 #include "build/build_config.h" 9 #include "build/build_config.h"
9 10
10 #if defined(OS_MACOSX) 11 #if defined(OS_MACOSX)
11 #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" 12 #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
12 #endif 13 #endif
13 14
14 #if defined(OS_ANDROID) 15 #if defined(OS_ANDROID)
15 #include "gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h" 16 #include "gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h"
16 #endif 17 #endif
17 18
18 #if defined(USE_OZONE) 19 #if defined(USE_OZONE)
19 #include "gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h" 20 #include "gpu/ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap.h"
20 #endif 21 #endif
21 22
22 namespace gpu { 23 namespace gpu {
23 24
24 // static 25 // static
25 scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::CreateNativeType() { 26 std::unique_ptr<GpuMemoryBufferFactory>
27 GpuMemoryBufferFactory::CreateNativeType() {
26 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
27 return make_scoped_ptr(new GpuMemoryBufferFactoryIOSurface); 29 return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
28 #endif 30 #endif
29 #if defined(OS_ANDROID) 31 #if defined(OS_ANDROID)
30 return make_scoped_ptr(new GpuMemoryBufferFactorySurfaceTexture); 32 return base::WrapUnique(new GpuMemoryBufferFactorySurfaceTexture);
31 #endif 33 #endif
32 #if defined(USE_OZONE) 34 #if defined(USE_OZONE)
33 return make_scoped_ptr(new GpuMemoryBufferFactoryOzoneNativePixmap); 35 return base::WrapUnique(new GpuMemoryBufferFactoryOzoneNativePixmap);
34 #endif 36 #endif
35 NOTREACHED(); 37 NOTREACHED();
36 return nullptr; 38 return nullptr;
37 } 39 }
38 40
39 } // namespace gpu 41 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/ipc/service/gpu_memory_buffer_factory.h ('k') | gpu/ipc/service/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698