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

Side by Side Diff: gpu/ipc/client/gpu_memory_buffer_impl.h

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
« no previous file with comments | « gpu/ipc/client/gpu_channel_host.cc ('k') | gpu/ipc/client/gpu_memory_buffer_impl.cc » ('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 #ifndef GPU_IPC_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_ 5 #ifndef GPU_IPC_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_
6 #define GPU_IPC_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_ 6 #define GPU_IPC_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_
7 7
8 #include <memory>
9
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "gpu/command_buffer/common/sync_token.h" 12 #include "gpu/command_buffer/common/sync_token.h"
12 #include "gpu/gpu_export.h" 13 #include "gpu/gpu_export.h"
13 #include "ui/gfx/geometry/size.h" 14 #include "ui/gfx/geometry/size.h"
14 #include "ui/gfx/gpu_memory_buffer.h" 15 #include "ui/gfx/gpu_memory_buffer.h"
15 16
16 namespace gpu { 17 namespace gpu {
17 18
18 // Provides common implementation of a GPU memory buffer. 19 // Provides common implementation of a GPU memory buffer.
19 class GPU_EXPORT GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { 20 class GPU_EXPORT GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
20 public: 21 public:
21 typedef base::Callback<void(const gpu::SyncToken& sync)> DestructionCallback; 22 typedef base::Callback<void(const gpu::SyncToken& sync)> DestructionCallback;
22 23
23 ~GpuMemoryBufferImpl() override; 24 ~GpuMemoryBufferImpl() override;
24 25
25 // Creates an instance from the given |handle|. |size| and |internalformat| 26 // Creates an instance from the given |handle|. |size| and |internalformat|
26 // should match what was used to allocate the |handle|. |callback| is 27 // should match what was used to allocate the |handle|. |callback| is
27 // called when instance is deleted, which is not necessarily on the same 28 // called when instance is deleted, which is not necessarily on the same
28 // thread as this function was called on and instance was created on. 29 // thread as this function was called on and instance was created on.
29 static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle( 30 static std::unique_ptr<GpuMemoryBufferImpl> CreateFromHandle(
30 const gfx::GpuMemoryBufferHandle& handle, 31 const gfx::GpuMemoryBufferHandle& handle,
31 const gfx::Size& size, 32 const gfx::Size& size,
32 gfx::BufferFormat format, 33 gfx::BufferFormat format,
33 gfx::BufferUsage usage, 34 gfx::BufferUsage usage,
34 const DestructionCallback& callback); 35 const DestructionCallback& callback);
35 36
36 // Type-checking upcast routine. Returns an NULL on failure. 37 // Type-checking upcast routine. Returns an NULL on failure.
37 static GpuMemoryBufferImpl* FromClientBuffer(ClientBuffer buffer); 38 static GpuMemoryBufferImpl* FromClientBuffer(ClientBuffer buffer);
38 39
39 // Overridden from gfx::GpuMemoryBuffer: 40 // Overridden from gfx::GpuMemoryBuffer:
(...skipping 19 matching lines...) Expand all
59 bool mapped_; 60 bool mapped_;
60 gpu::SyncToken destruction_sync_token_; 61 gpu::SyncToken destruction_sync_token_;
61 62
62 private: 63 private:
63 DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl); 64 DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl);
64 }; 65 };
65 66
66 } // namespace gpu 67 } // namespace gpu
67 68
68 #endif // GPU_IPC_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_ 69 #endif // GPU_IPC_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_
OLDNEW
« no previous file with comments | « gpu/ipc/client/gpu_channel_host.cc ('k') | gpu/ipc/client/gpu_memory_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698