| Index: content/common/gpu/client/gpu_channel_host.cc
|
| diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc
|
| index 2d25b4940f491530e767f80893bf4cee5b79f78c..263a94524bc3326eac9241c77091fc3a662d4790 100644
|
| --- a/content/common/gpu/client/gpu_channel_host.cc
|
| +++ b/content/common/gpu/client/gpu_channel_host.cc
|
| @@ -281,32 +281,40 @@ int32 GpuChannelHost::ReserveTransferBufferId() {
|
| }
|
|
|
| gfx::GpuMemoryBufferHandle GpuChannelHost::ShareGpuMemoryBufferToGpuProcess(
|
| - gfx::GpuMemoryBufferHandle source_handle) {
|
| + gfx::GpuMemoryBufferHandle source_handle,
|
| + bool* requires_sync_point) {
|
| + DCHECK(requires_sync_point);
|
| switch (source_handle.type) {
|
| case gfx::SHARED_MEMORY_BUFFER: {
|
| gfx::GpuMemoryBufferHandle handle;
|
| handle.type = gfx::SHARED_MEMORY_BUFFER;
|
| handle.handle = ShareToGpuProcess(source_handle.handle);
|
| + *requires_sync_point = false;
|
| return handle;
|
| }
|
| #if defined(USE_OZONE)
|
| case gfx::OZONE_NATIVE_BUFFER:
|
| + *requires_sync_point = true;
|
| return source_handle;
|
| #endif
|
| #if defined(OS_MACOSX)
|
| case gfx::IO_SURFACE_BUFFER:
|
| + *requires_sync_point = true;
|
| return source_handle;
|
| #endif
|
| #if defined(OS_ANDROID)
|
| case gfx::SURFACE_TEXTURE_BUFFER:
|
| + *requires_sync_point = true;
|
| return source_handle;
|
| #endif
|
| #if defined(USE_X11)
|
| case gfx::X11_PIXMAP_BUFFER:
|
| + *requires_sync_point = true;
|
| return source_handle;
|
| #endif
|
| default:
|
| NOTREACHED();
|
| + *requires_sync_point = false;
|
| return gfx::GpuMemoryBufferHandle();
|
| }
|
| }
|
|
|