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

Side by Side Diff: content/browser/gpu/browser_gpu_memory_buffer_manager.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
6 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 6 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ~BrowserGpuMemoryBufferManager() override; 55 ~BrowserGpuMemoryBufferManager() override;
56 56
57 static BrowserGpuMemoryBufferManager* current(); 57 static BrowserGpuMemoryBufferManager* current();
58 58
59 static bool IsNativeGpuMemoryBuffersEnabled(); 59 static bool IsNativeGpuMemoryBuffersEnabled();
60 60
61 static uint32_t GetImageTextureTarget(gfx::BufferFormat format, 61 static uint32_t GetImageTextureTarget(gfx::BufferFormat format,
62 gfx::BufferUsage usage); 62 gfx::BufferUsage usage);
63 63
64 // Overridden from gpu::GpuMemoryBufferManager: 64 // Overridden from gpu::GpuMemoryBufferManager:
65 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( 65 std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
66 const gfx::Size& size, 66 const gfx::Size& size,
67 gfx::BufferFormat format, 67 gfx::BufferFormat format,
68 gfx::BufferUsage usage, 68 gfx::BufferUsage usage,
69 int32_t surface_id) override; 69 int32_t surface_id) override;
70 scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle( 70 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle(
71 const gfx::GpuMemoryBufferHandle& handle, 71 const gfx::GpuMemoryBufferHandle& handle,
72 const gfx::Size& size, 72 const gfx::Size& size,
73 gfx::BufferFormat format) override; 73 gfx::BufferFormat format) override;
74 gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer( 74 gfx::GpuMemoryBuffer* GpuMemoryBufferFromClientBuffer(
75 ClientBuffer buffer) override; 75 ClientBuffer buffer) override;
76 void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer, 76 void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
77 const gpu::SyncToken& sync_token) override; 77 const gpu::SyncToken& sync_token) override;
78 78
79 // Overridden from base::trace_event::MemoryDumpProvider: 79 // Overridden from base::trace_event::MemoryDumpProvider:
80 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, 80 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 struct CreateGpuMemoryBufferFromHandleRequest; 127 struct CreateGpuMemoryBufferFromHandleRequest;
128 128
129 using CreateDelegate = base::Callback<void(GpuProcessHost* host, 129 using CreateDelegate = base::Callback<void(GpuProcessHost* host,
130 gfx::GpuMemoryBufferId id, 130 gfx::GpuMemoryBufferId id,
131 const gfx::Size& size, 131 const gfx::Size& size,
132 gfx::BufferFormat format, 132 gfx::BufferFormat format,
133 gfx::BufferUsage usage, 133 gfx::BufferUsage usage,
134 int client_id, 134 int client_id,
135 const CreateCallback& callback)>; 135 const CreateCallback& callback)>;
136 136
137 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface( 137 std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
138 const gfx::Size& size, 138 const gfx::Size& size,
139 gfx::BufferFormat format, 139 gfx::BufferFormat format,
140 gfx::BufferUsage usage, 140 gfx::BufferUsage usage,
141 int32_t surface_id); 141 int32_t surface_id);
142 142
143 // Functions that handle synchronous buffer creation requests. 143 // Functions that handle synchronous buffer creation requests.
144 void HandleCreateGpuMemoryBufferOnIO(CreateGpuMemoryBufferRequest* request); 144 void HandleCreateGpuMemoryBufferOnIO(CreateGpuMemoryBufferRequest* request);
145 void HandleCreateGpuMemoryBufferFromHandleOnIO( 145 void HandleCreateGpuMemoryBufferFromHandleOnIO(
146 CreateGpuMemoryBufferFromHandleRequest* request); 146 CreateGpuMemoryBufferFromHandleRequest* request);
147 void HandleGpuMemoryBufferCreatedOnIO( 147 void HandleGpuMemoryBufferCreatedOnIO(
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>; 182 using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
183 using ClientMap = base::hash_map<int, BufferMap>; 183 using ClientMap = base::hash_map<int, BufferMap>;
184 ClientMap clients_; 184 ClientMap clients_;
185 185
186 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager); 186 DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
187 }; 187 };
188 188
189 } // namespace content 189 } // namespace content
190 190
191 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ 191 #endif // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.cc ('k') | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698