OLD | NEW |
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 #include "content/common/gpu/client/gpu_memory_buffer_impl.h" | 5 #include "content/common/gpu/client/gpu_memory_buffer_impl.h" |
6 | 6 |
7 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h" | 7 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 return; | 38 return; |
39 } | 39 } |
40 | 40 |
41 callback.Run(gfx::GpuMemoryBufferHandle()); | 41 callback.Run(gfx::GpuMemoryBufferHandle()); |
42 } | 42 } |
43 | 43 |
44 // static | 44 // static |
45 void GpuMemoryBufferImpl::DeletedByChildProcess( | 45 void GpuMemoryBufferImpl::DeletedByChildProcess( |
46 gfx::GpuMemoryBufferType type, | 46 gfx::GpuMemoryBufferType type, |
47 const gfx::GpuMemoryBufferId& id, | 47 const gfx::GpuMemoryBufferId& id, |
48 base::ProcessHandle child_process) { | 48 base::ProcessHandle child_process, |
| 49 int child_client_id, |
| 50 uint32 sync_point) { |
49 } | 51 } |
50 | 52 |
51 // static | 53 // static |
52 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( | 54 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle( |
53 const gfx::GpuMemoryBufferHandle& handle, | 55 const gfx::GpuMemoryBufferHandle& handle, |
54 const gfx::Size& size, | 56 const gfx::Size& size, |
55 Format format, | 57 Format format, |
56 const DestructionCallback& callback) { | 58 const DestructionCallback& callback) { |
57 switch (handle.type) { | 59 switch (handle.type) { |
58 case gfx::SHARED_MEMORY_BUFFER: | 60 case gfx::SHARED_MEMORY_BUFFER: |
59 return GpuMemoryBufferImplSharedMemory::CreateFromHandle( | 61 return GpuMemoryBufferImplSharedMemory::CreateFromHandle( |
60 handle, size, format, callback); | 62 handle, size, format, callback); |
61 default: | 63 default: |
62 return scoped_ptr<GpuMemoryBufferImpl>(); | 64 return scoped_ptr<GpuMemoryBufferImpl>(); |
63 } | 65 } |
64 } | 66 } |
65 | 67 |
66 } // namespace content | 68 } // namespace content |
OLD | NEW |