gpu: Compositor management of GpuMemoryBuffer instances.

content/common/gpu/gpu_memory_buffer_factory_android.cc

Index: content/common/gpu/gpu_memory_buffer_factory_android.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_android.cc b/content/common/gpu/gpu_memory_buffer_factory_android.cc
index db34d1a67b64c75ae8e09e6440345cb4cb2305cd..ad76eeec3cdf1cc447cc025cf16116e7713e3ec3 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_android.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_android.cc
@@ -18,8 +18,8 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
   virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
-      unsigned internalformat,
-      unsigned usage) override {
+      gfx::GpuMemoryBuffer::Format format,
+      gfx::GpuMemoryBuffer::Usage usage) override {
     NOTREACHED();
     return gfx::GpuMemoryBufferHandle();
   }
@@ -30,13 +30,14 @@ class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
   virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
+      gfx::GpuMemoryBuffer::Format format,
       unsigned internalformat,
       int client_id) override {
     switch (handle.type) {
       case gfx::SHARED_MEMORY_BUFFER: {
         scoped_refptr<gfx::GLImageSharedMemory> image(
             new gfx::GLImageSharedMemory(size, internalformat));
-        if (!image->Initialize(handle))
+        if (!image->Initialize(handle, format))
           return NULL;
 
         return image;