Remove the assumption about client_id from gpu memory buffer allocation on the browser side.

content/common/gpu/client/gpu_memory_buffer_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/size.h"
 
 namespace content {
 
 // Provides common implementation of a GPU memory buffer.
 class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
  public:
   typedef base::Callback<void(scoped_ptr<GpuMemoryBufferImpl> buffer)>
       CreationCallback;
   typedef base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)>
       AllocationCallback;
 
   virtual ~GpuMemoryBufferImpl();
 
   // Creates a GPU memory buffer instance with |size| and |internalformat| for
-  // |usage|.
+  // |usage| by the current process and |client_id|.
   static void Create(const gfx::Size& size,
                      unsigned internalformat,
                      unsigned usage,
+                     int client_id,
                      const CreationCallback& callback);
 
   // Allocates a GPU memory buffer with |size| and |internalformat| for |usage|
-  // by |child_process| identified by |child_id|. The |handle| returned can be
+  // by |child_process| and |child_client_id|. The |handle| returned can be
   // used by the |child_process| to create an instance of this class.
   static void AllocateForChildProcess(const gfx::Size& size,
                                       unsigned internalformat,
                                       unsigned usage,
                                       base::ProcessHandle child_process,
-                                      int child_id,
+                                      int child_client_id,
                                       const AllocationCallback& callback);
 
   // Notify that GPU memory buffer has been deleted by |child_process|.
   static void DeletedByChildProcess(gfx::GpuMemoryBufferType type,
                                     const gfx::GpuMemoryBufferId& id,
                                     base::ProcessHandle child_process);
 
   // Creates an instance from the given |handle|. |size| and |internalformat|
   // should match what was used to allocate the |handle|.
   static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle(
@@ skipping 20 matching lines @@
   const gfx::Size size_;
   const unsigned internalformat_;
   bool mapped_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_H_