Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

media/renderers/gpu_video_accelerator_factories.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 #define MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 47 matching lines @@
                               const gfx::Size& size,
                               std::vector<uint32>* texture_ids,
                               std::vector<gpu::Mailbox>* texture_mailboxes,
                               uint32 texture_target) = 0;
   virtual void DeleteTexture(uint32 texture_id) = 0;
 
   virtual void WaitSyncPoint(uint32 sync_point) = 0;
 
   virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
-      gfx::GpuMemoryBuffer::Format format,
-      gfx::GpuMemoryBuffer::Usage usage) = 0;
+      gfx::BufferFormat format,
+      gfx::BufferUsage usage) = 0;
 
   virtual unsigned ImageTextureTarget() = 0;
   virtual bool IsTextureRGSupported() = 0;
 
   virtual gpu::gles2::GLES2Interface* GetGLES2Interface() = 0;
 
   // Allocate & return a shared memory segment.
   virtual scoped_ptr<base::SharedMemory> CreateSharedMemory(size_t size) = 0;
 
   // Returns the task runner the video accelerator runs on.
   virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() = 0;
 
   // Returns the supported codec profiles of video decode accelerator.
   virtual VideoDecodeAccelerator::SupportedProfiles
       GetVideoDecodeAcceleratorSupportedProfiles() = 0;
 
   // Returns the supported codec profiles of video encode accelerator.
   virtual VideoEncodeAccelerator::SupportedProfiles
       GetVideoEncodeAcceleratorSupportedProfiles() = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<GpuVideoAcceleratorFactories>;
   virtual ~GpuVideoAcceleratorFactories() {}
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_GPU_VIDEO_ACCELERATOR_FACTORIES_H_