gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_channel_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/gpu_channel_host.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 263 matching lines @@
 
   return base::FileDescriptor(duped_handle, true);
 #endif
 }
 
 int32 GpuChannelHost::ReserveTransferBufferId() {
   return next_transfer_buffer_id_.GetNext();
 }
 
 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: {
       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)

[reveman, 2014/11/04 06:20:46]

Note: I removed all these ifdefs as they are not needed as long as
gpu_memory_buffer.h doesn't have them.

+    case gfx::IO_SURFACE_BUFFER:
+    case gfx::SURFACE_TEXTURE_BUFFER:
     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();
       return gfx::GpuMemoryBufferHandle();
   }
 }
 
 int32 GpuChannelHost::ReserveImageId() {
   return next_image_id_.GetNext();
 }
 
@@ skipping 73 matching lines @@
 
   listeners_.clear();
 }
 
 bool GpuChannelHost::MessageFilter::IsLost() const {
   AutoLock lock(lock_);
   return lost_;
 }
 
 }  // namespace content