| OLD | NEW |
| 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 "cc/test/test_gpu_memory_buffer_manager.h" | 5 #include "cc/test/test_gpu_memory_buffer_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/ptr_util.h" |
| 11 #include "base/numerics/safe_conversions.h" | 12 #include "base/numerics/safe_conversions.h" |
| 12 #include "ui/gfx/buffer_format_util.h" | 13 #include "ui/gfx/buffer_format_util.h" |
| 13 #include "ui/gfx/gpu_memory_buffer.h" | 14 #include "ui/gfx/gpu_memory_buffer.h" |
| 14 | 15 |
| 15 namespace cc { | 16 namespace cc { |
| 16 namespace { | 17 namespace { |
| 17 | 18 |
| 18 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { | 19 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { |
| 19 public: | 20 public: |
| 20 GpuMemoryBufferImpl(const gfx::Size& size, | 21 GpuMemoryBufferImpl(const gfx::Size& size, |
| 21 gfx::BufferFormat format, | 22 gfx::BufferFormat format, |
| 22 scoped_ptr<base::SharedMemory> shared_memory, | 23 std::unique_ptr<base::SharedMemory> shared_memory, |
| 23 size_t offset, | 24 size_t offset, |
| 24 size_t stride) | 25 size_t stride) |
| 25 : size_(size), | 26 : size_(size), |
| 26 format_(format), | 27 format_(format), |
| 27 shared_memory_(std::move(shared_memory)), | 28 shared_memory_(std::move(shared_memory)), |
| 28 offset_(offset), | 29 offset_(offset), |
| 29 stride_(stride), | 30 stride_(stride), |
| 30 mapped_(false), | 31 mapped_(false), |
| 31 is_in_use_by_window_server_(false) {} | 32 is_in_use_by_window_server_(false) {} |
| 32 | 33 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 return reinterpret_cast<ClientBuffer>(this); | 78 return reinterpret_cast<ClientBuffer>(this); |
| 78 } | 79 } |
| 79 | 80 |
| 80 void SetIsInUseByMacOSWindowServer(bool value) { | 81 void SetIsInUseByMacOSWindowServer(bool value) { |
| 81 is_in_use_by_window_server_ = value; | 82 is_in_use_by_window_server_ = value; |
| 82 } | 83 } |
| 83 | 84 |
| 84 private: | 85 private: |
| 85 const gfx::Size size_; | 86 const gfx::Size size_; |
| 86 gfx::BufferFormat format_; | 87 gfx::BufferFormat format_; |
| 87 scoped_ptr<base::SharedMemory> shared_memory_; | 88 std::unique_ptr<base::SharedMemory> shared_memory_; |
| 88 size_t offset_; | 89 size_t offset_; |
| 89 size_t stride_; | 90 size_t stride_; |
| 90 bool mapped_; | 91 bool mapped_; |
| 91 bool is_in_use_by_window_server_; | 92 bool is_in_use_by_window_server_; |
| 92 }; | 93 }; |
| 93 | 94 |
| 94 } // namespace | 95 } // namespace |
| 95 | 96 |
| 96 TestGpuMemoryBufferManager::TestGpuMemoryBufferManager() { | 97 TestGpuMemoryBufferManager::TestGpuMemoryBufferManager() { |
| 97 } | 98 } |
| 98 | 99 |
| 99 TestGpuMemoryBufferManager::~TestGpuMemoryBufferManager() { | 100 TestGpuMemoryBufferManager::~TestGpuMemoryBufferManager() { |
| 100 } | 101 } |
| 101 | 102 |
| 102 void TestGpuMemoryBufferManager::SetGpuMemoryBufferIsInUseByMacOSWindowServer( | 103 void TestGpuMemoryBufferManager::SetGpuMemoryBufferIsInUseByMacOSWindowServer( |
| 103 gfx::GpuMemoryBuffer* gpu_memory_buffer, | 104 gfx::GpuMemoryBuffer* gpu_memory_buffer, |
| 104 bool in_use) { | 105 bool in_use) { |
| 105 static_cast<GpuMemoryBufferImpl*>(gpu_memory_buffer) | 106 static_cast<GpuMemoryBufferImpl*>(gpu_memory_buffer) |
| 106 ->SetIsInUseByMacOSWindowServer(in_use); | 107 ->SetIsInUseByMacOSWindowServer(in_use); |
| 107 } | 108 } |
| 108 | 109 |
| 109 scoped_ptr<gfx::GpuMemoryBuffer> | 110 std::unique_ptr<gfx::GpuMemoryBuffer> |
| 110 TestGpuMemoryBufferManager::AllocateGpuMemoryBuffer(const gfx::Size& size, | 111 TestGpuMemoryBufferManager::AllocateGpuMemoryBuffer(const gfx::Size& size, |
| 111 gfx::BufferFormat format, | 112 gfx::BufferFormat format, |
| 112 gfx::BufferUsage usage, | 113 gfx::BufferUsage usage, |
| 113 int32_t surface_id) { | 114 int32_t surface_id) { |
| 114 scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory); | 115 std::unique_ptr<base::SharedMemory> shared_memory(new base::SharedMemory); |
| 115 const size_t buffer_size = gfx::BufferSizeForBufferFormat(size, format); | 116 const size_t buffer_size = gfx::BufferSizeForBufferFormat(size, format); |
| 116 if (!shared_memory->CreateAnonymous(buffer_size)) | 117 if (!shared_memory->CreateAnonymous(buffer_size)) |
| 117 return nullptr; | 118 return nullptr; |
| 118 return make_scoped_ptr<gfx::GpuMemoryBuffer>(new GpuMemoryBufferImpl( | 119 return base::WrapUnique<gfx::GpuMemoryBuffer>(new GpuMemoryBufferImpl( |
| 119 size, format, std::move(shared_memory), 0, | 120 size, format, std::move(shared_memory), 0, |
| 120 base::checked_cast<int>( | 121 base::checked_cast<int>( |
| 121 gfx::RowSizeForBufferFormat(size.width(), format, 0)))); | 122 gfx::RowSizeForBufferFormat(size.width(), format, 0)))); |
| 122 } | 123 } |
| 123 | 124 |
| 124 scoped_ptr<gfx::GpuMemoryBuffer> | 125 std::unique_ptr<gfx::GpuMemoryBuffer> |
| 125 TestGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle( | 126 TestGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle( |
| 126 const gfx::GpuMemoryBufferHandle& handle, | 127 const gfx::GpuMemoryBufferHandle& handle, |
| 127 const gfx::Size& size, | 128 const gfx::Size& size, |
| 128 gfx::BufferFormat format) { | 129 gfx::BufferFormat format) { |
| 129 if (handle.type != gfx::SHARED_MEMORY_BUFFER) | 130 if (handle.type != gfx::SHARED_MEMORY_BUFFER) |
| 130 return nullptr; | 131 return nullptr; |
| 131 | 132 |
| 132 return make_scoped_ptr<gfx::GpuMemoryBuffer>(new GpuMemoryBufferImpl( | 133 return base::WrapUnique<gfx::GpuMemoryBuffer>(new GpuMemoryBufferImpl( |
| 133 size, format, | 134 size, format, |
| 134 make_scoped_ptr(new base::SharedMemory(handle.handle, false)), | 135 base::WrapUnique(new base::SharedMemory(handle.handle, false)), |
| 135 handle.offset, handle.stride)); | 136 handle.offset, handle.stride)); |
| 136 } | 137 } |
| 137 | 138 |
| 138 gfx::GpuMemoryBuffer* | 139 gfx::GpuMemoryBuffer* |
| 139 TestGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( | 140 TestGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( |
| 140 ClientBuffer buffer) { | 141 ClientBuffer buffer) { |
| 141 return reinterpret_cast<gfx::GpuMemoryBuffer*>(buffer); | 142 return reinterpret_cast<gfx::GpuMemoryBuffer*>(buffer); |
| 142 } | 143 } |
| 143 | 144 |
| 144 void TestGpuMemoryBufferManager::SetDestructionSyncToken( | 145 void TestGpuMemoryBufferManager::SetDestructionSyncToken( |
| 145 gfx::GpuMemoryBuffer* buffer, | 146 gfx::GpuMemoryBuffer* buffer, |
| 146 const gpu::SyncToken& sync_token) {} | 147 const gpu::SyncToken& sync_token) {} |
| 147 | 148 |
| 148 } // namespace cc | 149 } // namespace cc |
| OLD | NEW |