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 03f9aba42785753a6890ae1263439702616180f1..9730ffbe851bef1c6eb7ac94d5ce607785c1f00a 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_android.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_android.cc
@@ -18,12 +18,12 @@ 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 {
     switch (handle.type) {
       case gfx::SURFACE_TEXTURE_BUFFER:
         return surface_texture_factory_.CreateGpuMemoryBuffer(
-            handle.global_id, size, internalformat);
+            handle.global_id, size, format);
       default:
         NOTREACHED();
         return gfx::GpuMemoryBufferHandle();
@@ -43,13 +43,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;