Chromium Code Reviews| Index: content/browser/gpu/browser_gpu_memory_buffer_manager.h |
| diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.h b/content/browser/gpu/browser_gpu_memory_buffer_manager.h |
| index 12fd082975a2c4672bdc262dde2c593f967017bb..3c4bc9b1352921d2a6268bf0166ff8b5cdaf1ffa 100644 |
| --- a/content/browser/gpu/browser_gpu_memory_buffer_manager.h |
| +++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.h |
| @@ -5,16 +5,19 @@ |
| #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_ |
| -#include <vector> |
| +#include <set> |
| #include "base/callback.h" |
| #include "base/trace_event/memory_dump_provider.h" |
| #include "content/common/content_export.h" |
| -#include "content/common/gpu/gpu_memory_buffer_factory.h" |
| #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
| namespace content { |
| +using GpuMemoryBufferConfiguration = |
| + std::pair<gfx::BufferFormat, gfx::BufferUsage>; |
| +using GpuMemoryBufferConfigurationSet = std::set<GpuMemoryBufferConfiguration>; |
|
piman
2015/10/07 01:20:17
nit: hash_set?
reveman
2015/10/07 09:05:01
Done.
|
| + |
| class CONTENT_EXPORT BrowserGpuMemoryBufferManager |
| : public gpu::GpuMemoryBufferManager, |
| public base::trace_event::MemoryDumpProvider { |
| @@ -97,8 +100,8 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager |
| gfx::BufferFormat format, |
| gfx::BufferUsage usage, |
| int32 surface_id); |
| - bool IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format, |
| - gfx::BufferUsage usage) const; |
| + bool IsNativeGpuMemoryBufferConfiguration(gfx::BufferFormat format, |
| + gfx::BufferUsage usage) const; |
| void AllocateGpuMemoryBufferForSurfaceOnIO( |
| AllocateGpuMemoryBufferRequest* request); |
| void GpuMemoryBufferAllocatedForSurfaceOnIO( |
| @@ -125,9 +128,7 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager |
| uint64_t ClientIdToTracingProcessId(int client_id) const; |
| - const gfx::GpuMemoryBufferType factory_type_; |
| - const std::vector<GpuMemoryBufferFactory::Configuration> |
| - supported_configurations_; |
| + const GpuMemoryBufferConfigurationSet native_configurations_; |
| const int gpu_client_id_; |
| const uint64_t gpu_client_tracing_id_; |