| 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" | 7 #include "ui/gfx/generic_shared_memory_id.h" |
| 8 | 8 |
| 9 namespace gfx { | 9 namespace gfx { |
| 10 | 10 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 gfx::GpuMemoryBufferHandle handle; | 37 gfx::GpuMemoryBufferHandle handle; |
| 38 handle.type = gfx::NATIVE_PIXMAP; | 38 handle.type = gfx::NATIVE_PIXMAP; |
| 39 handle.id = source_handle.id; | 39 handle.id = source_handle.id; |
| 40 #if defined(OS_LINUX) | 40 #if defined(OS_LINUX) |
| 41 handle.native_pixmap_handle = | 41 handle.native_pixmap_handle = |
| 42 gfx::CloneHandleForIPC(source_handle.native_pixmap_handle); | 42 gfx::CloneHandleForIPC(source_handle.native_pixmap_handle); |
| 43 #endif | 43 #endif |
| 44 return handle; | 44 return handle; |
| 45 } | 45 } |
| 46 case gfx::IO_SURFACE_BUFFER: | 46 case gfx::IO_SURFACE_BUFFER: |
| 47 case gfx::DIRECT_COMPOSITION: |
| 47 return source_handle; | 48 return source_handle; |
| 48 } | 49 } |
| 49 return gfx::GpuMemoryBufferHandle(); | 50 return gfx::GpuMemoryBufferHandle(); |
| 50 } | 51 } |
| 51 | 52 |
| 52 base::trace_event::MemoryAllocatorDumpGuid GpuMemoryBuffer::GetGUIDForTracing( | 53 base::trace_event::MemoryAllocatorDumpGuid GpuMemoryBuffer::GetGUIDForTracing( |
| 53 uint64_t tracing_process_id) const { | 54 uint64_t tracing_process_id) const { |
| 54 return gfx::GetGenericSharedGpuMemoryGUIDForTracing(tracing_process_id, | 55 return gfx::GetGenericSharedGpuMemoryGUIDForTracing(tracing_process_id, |
| 55 GetId()); | 56 GetId()); |
| 56 } | 57 } |
| 57 | 58 |
| 58 } // namespace gfx | 59 } // namespace gfx |
| OLD | NEW |