gpu: Compositor management of GpuMemoryBuffer instances.

content/common/gpu/client/gpu_memory_buffer_impl_android.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl_android.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
index b19efb4b7e8196f21719e0aa21b4fc2287edef91..0c0b51fb39487f94f6145f7f140cd6f24e1cc0bb 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_android.cc
@@ -11,14 +11,13 @@ namespace content {
 
 // static
 void GpuMemoryBufferImpl::Create(const gfx::Size& size,
-                                 unsigned internalformat,
-                                 unsigned usage,
+                                 Format format,
+                                 Usage usage,
                                  int client_id,
                                  const CreationCallback& callback) {
   if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
-          size, internalformat, usage)) {
-    GpuMemoryBufferImplSharedMemory::Create(
-        size, internalformat, usage, callback);
+          size, format, usage)) {
+    GpuMemoryBufferImplSharedMemory::Create(size, format, callback);
     return;
   }
 
@@ -28,15 +27,15 @@ void GpuMemoryBufferImpl::Create(const gfx::Size& size,
 // static
 void GpuMemoryBufferImpl::AllocateForChildProcess(
     const gfx::Size& size,
-    unsigned internalformat,
-    unsigned usage,
+    Format format,
+    Usage usage,
     base::ProcessHandle child_process,
     int child_client_id,
     const AllocationCallback& callback) {
   if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
-          size, internalformat, usage)) {
+          size, format, usage)) {
     GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
-        size, internalformat, child_process, callback);
+        size, format, child_process, callback);
     return;
   }
 
@@ -54,15 +53,15 @@ void GpuMemoryBufferImpl::DeletedByChildProcess(
 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
-    unsigned internalformat,
+    Format format,
     const DestructionCallback& callback) {
   switch (handle.type) {
     case gfx::SHARED_MEMORY_BUFFER:
       return GpuMemoryBufferImplSharedMemory::CreateFromHandle(
-          handle, size, internalformat, callback);
+          handle, size, format, callback);
     case gfx::SURFACE_TEXTURE_BUFFER:
       return GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
-          handle, size, internalformat, callback);
+          handle, size, format, callback);
     default:
       return scoped_ptr<GpuMemoryBufferImpl>();
   }