Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/common/gpu/gpu_channel.cc

 // Copyright (c) 2012 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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "content/common/gpu/gpu_channel.h"
 
@@ skipping 848 matching lines @@
     size += gpu_channel_manager()->gpu_memory_manager()->GetTrackerMemoryUsage(
         tracker);
   }
 
   return size;
 }
 
 scoped_refptr<gfx::GLImage> GpuChannel::CreateImageForGpuMemoryBuffer(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
-    gfx::GpuMemoryBuffer::Format format,
+    gfx::BufferFormat format,
     uint32 internalformat) {
   switch (handle.type) {
     case gfx::SHARED_MEMORY_BUFFER: {
       scoped_refptr<gfx::GLImageSharedMemory> image(
           new gfx::GLImageSharedMemory(size, internalformat));
       if (!image->Initialize(handle, format))
         return scoped_refptr<gfx::GLImage>();
 
       return image;
     }
@@ skipping 26 matching lines @@
       pmd->CreateAllocatorDump(base::StringPrintf("gl/%s", dump_name.c_str()));
 
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   GetMemoryUsage());
 
   return true;
 }
 
 }  // namespace content