Chromium Code Reviews| 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 7e97b9c42e19eac8dc344370a6ffc040483f6354..77ef8752afc9ffdf8411da6f78b178de32bc3838 100644 |
| --- a/content/common/gpu/client/gpu_channel_host.cc |
| +++ b/content/common/gpu/client/gpu_channel_host.cc |
| @@ -281,7 +281,7 @@ int32 GpuChannelHost::ReserveTransferBufferId() { |
| } |
| gfx::GpuMemoryBufferHandle GpuChannelHost::ShareGpuMemoryBufferToGpuProcess( |
| - gfx::GpuMemoryBufferHandle source_handle, |
| + const gfx::GpuMemoryBufferHandle& source_handle, |
| bool* requires_sync_point) { |
| switch (source_handle.type) { |
| case gfx::SHARED_MEMORY_BUFFER: { |
| @@ -291,26 +291,11 @@ gfx::GpuMemoryBufferHandle GpuChannelHost::ShareGpuMemoryBufferToGpuProcess( |
| *requires_sync_point = false; |
| return handle; |
| } |
| -#if defined(USE_OZONE) |
|
reveman
2014/11/04 06:20:46
Note: I removed all these ifdefs as they are not n
|
| - 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: |
| + case gfx::OZONE_NATIVE_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(); |
| return gfx::GpuMemoryBufferHandle(); |