Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/child/child_gpu_memory_buffer_manager.cc

 // Copyright 2014 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.
 
 #include "content/child/child_gpu_memory_buffer_manager.h"
 
 #include "content/common/child_process_messages.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
 namespace content {
@@ skipping 11 matching lines @@
 
 ChildGpuMemoryBufferManager::ChildGpuMemoryBufferManager(
     ThreadSafeSender* sender)
     : sender_(sender) {
 }
 
 ChildGpuMemoryBufferManager::~ChildGpuMemoryBufferManager() {
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
-ChildGpuMemoryBufferManager::AllocateGpuMemoryBuffer(
-    const gfx::Size& size,
-    gfx::GpuMemoryBuffer::Format format,
-    gfx::GpuMemoryBuffer::Usage usage) {
+ChildGpuMemoryBufferManager::AllocateGpuMemoryBuffer(const gfx::Size& size,
+                                                     gfx::BufferFormat format,
+                                                     gfx::BufferUsage usage) {
   TRACE_EVENT2("renderer",
                "ChildGpuMemoryBufferManager::AllocateGpuMemoryBuffer",
                "width",
                size.width(),
                "height",
                size.height());
 
   gfx::GpuMemoryBufferHandle handle;
   IPC::Message* message = new ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer(
       size.width(), size.height(), format, usage, &handle);
@@ skipping 19 matching lines @@
 }
 
 void ChildGpuMemoryBufferManager::SetDestructionSyncPoint(
     gfx::GpuMemoryBuffer* buffer,
     uint32 sync_point) {
   static_cast<GpuMemoryBufferImpl*>(buffer)
       ->set_destruction_sync_point(sync_point);
 }
 
 }  // namespace content