| 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 "content/child/child_gpu_memory_buffer_manager.h" | 5 #include "content/child/child_gpu_memory_buffer_manager.h" |
| 6 | 6 |
| 7 #include "content/child/child_thread.h" | 7 #include "content/child/child_thread.h" |
| 8 #include "content/common/child_process_messages.h" | 8 #include "content/common/child_process_messages.h" |
| 9 #include "content/common/gpu/client/gpu_memory_buffer_impl.h" | 9 #include "content/common/gpu/client/gpu_memory_buffer_impl.h" |
| 10 | 10 |
| 11 namespace content { | 11 namespace content { |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 void DeletedGpuMemoryBuffer(ThreadSafeSender* sender, | 14 void DeletedGpuMemoryBuffer(ThreadSafeSender* sender, |
| 15 gfx::GpuMemoryBufferType type, | 15 gfx::GpuMemoryBufferType type, |
| 16 const gfx::GpuMemoryBufferId& id) { | 16 const gfx::GpuMemoryBufferId& id, |
| 17 uint32 sync_point) { |
| 17 TRACE_EVENT0("renderer", | 18 TRACE_EVENT0("renderer", |
| 18 "ChildGpuMemoryBufferManager::DeletedGpuMemoryBuffer"); | 19 "ChildGpuMemoryBufferManager::DeletedGpuMemoryBuffer"); |
| 19 sender->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer(type, id)); | 20 sender->Send( |
| 21 new ChildProcessHostMsg_DeletedGpuMemoryBuffer(type, id, sync_point)); |
| 20 } | 22 } |
| 21 | 23 |
| 22 } // namespace | 24 } // namespace |
| 23 | 25 |
| 24 ChildGpuMemoryBufferManager::ChildGpuMemoryBufferManager( | 26 ChildGpuMemoryBufferManager::ChildGpuMemoryBufferManager( |
| 25 ThreadSafeSender* sender) | 27 ThreadSafeSender* sender) |
| 26 : sender_(sender) { | 28 : sender_(sender) { |
| 27 } | 29 } |
| 28 | 30 |
| 29 ChildGpuMemoryBufferManager::~ChildGpuMemoryBufferManager() { | 31 ChildGpuMemoryBufferManager::~ChildGpuMemoryBufferManager() { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 49 return scoped_ptr<gfx::GpuMemoryBuffer>(); | 51 return scoped_ptr<gfx::GpuMemoryBuffer>(); |
| 50 | 52 |
| 51 scoped_ptr<GpuMemoryBufferImpl> buffer(GpuMemoryBufferImpl::CreateFromHandle( | 53 scoped_ptr<GpuMemoryBufferImpl> buffer(GpuMemoryBufferImpl::CreateFromHandle( |
| 52 handle, | 54 handle, |
| 53 size, | 55 size, |
| 54 format, | 56 format, |
| 55 base::Bind( | 57 base::Bind( |
| 56 &DeletedGpuMemoryBuffer, sender_, handle.type, handle.global_id))); | 58 &DeletedGpuMemoryBuffer, sender_, handle.type, handle.global_id))); |
| 57 if (!buffer) { | 59 if (!buffer) { |
| 58 sender_->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer( | 60 sender_->Send(new ChildProcessHostMsg_DeletedGpuMemoryBuffer( |
| 59 handle.type, handle.global_id)); | 61 handle.type, handle.global_id, 0)); |
| 60 return scoped_ptr<gfx::GpuMemoryBuffer>(); | 62 return scoped_ptr<gfx::GpuMemoryBuffer>(); |
| 61 } | 63 } |
| 62 | 64 |
| 63 return buffer.Pass(); | 65 return buffer.Pass(); |
| 64 } | 66 } |
| 65 | 67 |
| 66 gfx::GpuMemoryBuffer* | 68 gfx::GpuMemoryBuffer* |
| 67 ChildGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( | 69 ChildGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer( |
| 68 ClientBuffer buffer) { | 70 ClientBuffer buffer) { |
| 69 return GpuMemoryBufferImpl::FromClientBuffer(buffer); | 71 return GpuMemoryBufferImpl::FromClientBuffer(buffer); |
| 70 } | 72 } |
| 71 | 73 |
| 74 bool ChildGpuMemoryBufferManager::NeedsDestructionSyncPoint( |
| 75 gfx::GpuMemoryBufferType type) { |
| 76 return GpuMemoryBufferImpl::NeedsDestructionSyncPoint(type); |
| 77 } |
| 78 |
| 79 void ChildGpuMemoryBufferManager::RecordDestructionSyncPoint( |
| 80 ClientBuffer buffer, |
| 81 uint32 sync_point) { |
| 82 GpuMemoryBufferImpl::FromClientBuffer(buffer) |
| 83 ->set_destruction_sync_point(sync_point); |
| 84 } |
| 85 |
| 72 } // namespace content | 86 } // namespace content |
| OLD | NEW |