gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

 // Copyright 2014 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_memory_buffer_impl_surface_texture.h"
 
-#include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "content/common/android/surface_texture_manager.h"
 #include "content/common/gpu/client/gpu_memory_buffer_factory_host.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 namespace {
 
-base::StaticAtomicSequenceNumber g_next_buffer_id;
-
-void GpuMemoryBufferDeleted(const gfx::GpuMemoryBufferHandle& handle,
+void GpuMemoryBufferDeleted(gfx::GpuMemoryBufferId id,
+                            int client_id,
                             uint32 sync_point) {
-  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(handle,
-                                                                    sync_point);
+  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(
+      gfx::SURFACE_TEXTURE_BUFFER, id, client_id, sync_point);
 }
 
 void GpuMemoryBufferCreated(
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
+    int client_id,
     const GpuMemoryBufferImpl::CreationCallback& callback,
     const gfx::GpuMemoryBufferHandle& handle) {
   DCHECK_EQ(gfx::SURFACE_TEXTURE_BUFFER, handle.type);
 
   callback.Run(GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
-      handle, size, format, base::Bind(&GpuMemoryBufferDeleted, handle)));
+      handle,
+      size,
+      format,
+      base::Bind(&GpuMemoryBufferDeleted, handle.id, client_id)));
 }
 
 void GpuMemoryBufferCreatedForChildProcess(
     const GpuMemoryBufferImpl::AllocationCallback& callback,
     const gfx::GpuMemoryBufferHandle& handle) {
   DCHECK_EQ(gfx::SURFACE_TEXTURE_BUFFER, handle.type);
 
   callback.Run(handle);
 }
 
 }  // namespace
 
 GpuMemoryBufferImplSurfaceTexture::GpuMemoryBufferImplSurfaceTexture(
+    gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     const DestructionCallback& callback,
-    const gfx::GpuMemoryBufferId& id,
     ANativeWindow* native_window)
-    : GpuMemoryBufferImpl(size, format, callback),
-      id_(id),
+    : GpuMemoryBufferImpl(id, size, format, callback),
       native_window_(native_window),
-      stride_(0u) {
+      stride_(0) {
 }
 
 GpuMemoryBufferImplSurfaceTexture::~GpuMemoryBufferImplSurfaceTexture() {
   ANativeWindow_release(native_window_);
 }
 
 // static
 void GpuMemoryBufferImplSurfaceTexture::Create(
+    gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     int client_id,
     const CreationCallback& callback) {
-  gfx::GpuMemoryBufferHandle handle;
-  handle.global_id.primary_id = g_next_buffer_id.GetNext();
-  handle.global_id.secondary_id = client_id;
-  handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(
-      handle,
+      gfx::SURFACE_TEXTURE_BUFFER,
+      id,
       size,
       format,
       MAP,
-      base::Bind(&GpuMemoryBufferCreated, size, format, callback));
+      client_id,
+      base::Bind(&GpuMemoryBufferCreated, size, format, client_id, callback));
 }
 
 // static
 void GpuMemoryBufferImplSurfaceTexture::AllocateForChildProcess(
+    gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     int child_client_id,
     const AllocationCallback& callback) {
-  gfx::GpuMemoryBufferHandle handle;
-  handle.global_id.primary_id = g_next_buffer_id.GetNext();
-  handle.global_id.secondary_id = child_client_id;
-  handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(
-      handle,
+      gfx::SURFACE_TEXTURE_BUFFER,
+      id,
       size,
       format,
       MAP,
+      child_client_id,
       base::Bind(&GpuMemoryBufferCreatedForChildProcess, callback));
 }
 
 // static
 scoped_ptr<GpuMemoryBufferImpl>
 GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     Format format,
     const DestructionCallback& callback) {
   DCHECK(IsFormatSupported(format));
 
-  ANativeWindow* native_window =
-      SurfaceTextureManager::GetInstance()->AcquireNativeWidget(
-          handle.global_id.primary_id, handle.global_id.secondary_id);
+  ANativeWindow* native_window = SurfaceTextureManager::GetInstance()->
+      AcquireNativeWidgetForSurfaceTexture(handle.id);
   if (!native_window)
     return scoped_ptr<GpuMemoryBufferImpl>();
 
   ANativeWindow_setBuffersGeometry(
       native_window, size.width(), size.height(), WindowFormat(format));
 
   return make_scoped_ptr<GpuMemoryBufferImpl>(
       new GpuMemoryBufferImplSurfaceTexture(
-          size, format, callback, handle.global_id, native_window));
+          handle.id, size, format, callback, native_window));
 }
 
 // static
 void GpuMemoryBufferImplSurfaceTexture::DeletedByChildProcess(
-    const gfx::GpuMemoryBufferId& id,
+    gfx::GpuMemoryBufferId id,
+    int child_client_id,
     uint32_t sync_point) {
-  gfx::GpuMemoryBufferHandle handle;
-  handle.type = gfx::SURFACE_TEXTURE_BUFFER;
-  handle.global_id = id;
-  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(handle,
-                                                                    sync_point);
+  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(
+      gfx::SURFACE_TEXTURE_BUFFER, id, child_client_id, sync_point);
 }
 
 // static
 bool GpuMemoryBufferImplSurfaceTexture::IsFormatSupported(Format format) {
   switch (format) {
     case RGBA_8888:
       return true;
     case RGBX_8888:
     case BGRA_8888:
       return false;
@@ skipping 64 matching lines @@
 }
 
 uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const {
   return stride_;
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SURFACE_TEXTURE_BUFFER;
-  handle.global_id = id_;
+  handle.id = id_;
   return handle;
 }
 
 }  // namespace content