| 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 "ui/gfx/gpu_memory_buffer.h" | 5 #include "ui/gfx/gpu_memory_buffer.h" |
| 6 | 6 |
| 7 #include "ui/gfx/generic_shared_memory_id.h" |
| 8 |
| 7 namespace gfx { | 9 namespace gfx { |
| 8 | 10 |
| 9 GpuMemoryBufferHandle::GpuMemoryBufferHandle() | 11 GpuMemoryBufferHandle::GpuMemoryBufferHandle() |
| 10 : type(EMPTY_BUFFER), id(0), handle(base::SharedMemory::NULLHandle()) { | 12 : type(EMPTY_BUFFER), id(0), handle(base::SharedMemory::NULLHandle()) { |
| 11 } | 13 } |
| 12 | 14 |
| 13 GpuMemoryBufferHandle::GpuMemoryBufferHandle( | 15 GpuMemoryBufferHandle::GpuMemoryBufferHandle( |
| 14 const GpuMemoryBufferHandle& other) = default; | 16 const GpuMemoryBufferHandle& other) = default; |
| 15 | 17 |
| 16 GpuMemoryBufferHandle::~GpuMemoryBufferHandle() {} | 18 GpuMemoryBufferHandle::~GpuMemoryBufferHandle() {} |
| (...skipping 24 matching lines...) Expand all Loading... |
| 41 gfx::CloneHandleForIPC(source_handle.native_pixmap_handle); | 43 gfx::CloneHandleForIPC(source_handle.native_pixmap_handle); |
| 42 #endif | 44 #endif |
| 43 return handle; | 45 return handle; |
| 44 } | 46 } |
| 45 case gfx::IO_SURFACE_BUFFER: | 47 case gfx::IO_SURFACE_BUFFER: |
| 46 return source_handle; | 48 return source_handle; |
| 47 } | 49 } |
| 48 return gfx::GpuMemoryBufferHandle(); | 50 return gfx::GpuMemoryBufferHandle(); |
| 49 } | 51 } |
| 50 | 52 |
| 53 base::trace_event::MemoryAllocatorDumpGuid GpuMemoryBuffer::GetGUIDForTracing( |
| 54 uint64_t tracing_process_id) const { |
| 55 return gfx::GetGenericSharedGpuMemoryGUIDForTracing(tracing_process_id, |
| 56 GetId()); |
| 57 } |
| 58 |
| 51 } // namespace gfx | 59 } // namespace gfx |
| OLD | NEW |