Index: ui/gl/gl_image_shared_memory.cc |
diff --git a/ui/gl/gl_image_shared_memory.cc b/ui/gl/gl_image_shared_memory.cc |
index 16ec6cba4a29b5bdb958fe8e0dbadc5c3614440d..33ba4d161aba82b7f95f085e27f75c20e5d26f0f 100644 |
--- a/ui/gl/gl_image_shared_memory.cc |
+++ b/ui/gl/gl_image_shared_memory.cc |
@@ -40,18 +40,16 @@ |
DCHECK(!shared_memory_); |
} |
-bool GLImageSharedMemory::Initialize( |
- const base::SharedMemoryHandle& handle, |
- gfx::GenericSharedMemoryId shared_memory_id, |
- gfx::BufferFormat format) { |
+bool GLImageSharedMemory::Initialize(const gfx::GpuMemoryBufferHandle& handle, |
+ gfx::BufferFormat format) { |
size_t size_in_bytes; |
if (!SizeInBytes(GetSize(), format, &size_in_bytes)) |
return false; |
- if (!base::SharedMemory::IsHandleValid(handle)) |
+ if (!base::SharedMemory::IsHandleValid(handle.handle)) |
return false; |
- base::SharedMemory shared_memory(handle, true); |
+ base::SharedMemory shared_memory(handle.handle, true); |
// Duplicate the handle. |
base::SharedMemoryHandle duped_shared_memory_handle; |
@@ -75,7 +73,7 @@ |
DCHECK(!shared_memory_); |
shared_memory_ = duped_shared_memory.Pass(); |
- shared_memory_id_ = shared_memory_id; |
+ shared_memory_id_ = handle.id; |
return true; |
} |