Unify graphics buffer enums for GpuMemoryBuffer & SurfaceFactoryOzone

This moves the gfx::GpuMemoryBuffer::BufferFormat to gfx::BufferFormat
and moves gfx::GpuMemoryBuffer:BufferUsage to gfx::BufferUsage, and
removes the ozone versions in favor of a common type. This avoids
unnecessary conversions.

There should be no functional change.

BUG=none
TEST=compile & run for CrOS, compile for all other platforms
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=jam (API change)

Review URL: https://codereview.chromium.org/1269503007

Cr-Commit-Position: refs/heads/master@{#341758}

2 files changed, 4 insertions, 5 deletions

diff --git a/mandoline/ui/aura/surface_context_factory.cc b/mandoline/ui/aura/surface_context_factory.cc
index ebf9807..2e8d7a5c 100644
--- a/mandoline/ui/aura/surface_context_factory.cc
+++ b/mandoline/ui/aura/surface_context_factory.cc
@@ -66,9 +66,8 @@ bool SurfaceContextFactory::DoesCreateTestContexts() {
   return false;
 }
 
-uint32 SurfaceContextFactory::GetImageTextureTarget(
-    gfx::GpuMemoryBuffer::Format format,
-    gfx::GpuMemoryBuffer::Usage usage) {
+uint32 SurfaceContextFactory::GetImageTextureTarget(gfx::BufferFormat format,
+                                                    gfx::BufferUsage usage) {
   // No GpuMemoryBuffer support, so just return GL_TEXTURE_2D.
   return GL_TEXTURE_2D;
 }
diff --git a/mandoline/ui/aura/surface_context_factory.h b/mandoline/ui/aura/surface_context_factory.h
index 90b9934..4f9d7f9 100644
--- a/mandoline/ui/aura/surface_context_factory.h
+++ b/mandoline/ui/aura/surface_context_factory.h
@@ -32,8 +32,8 @@ class SurfaceContextFactory : public ui::ContextFactory {
   scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
   void RemoveCompositor(ui::Compositor* compositor) override;
   bool DoesCreateTestContexts() override;
-  uint32 GetImageTextureTarget(gfx::GpuMemoryBuffer::Format format,
-                               gfx::GpuMemoryBuffer::Usage usage) override;
+  uint32 GetImageTextureTarget(gfx::BufferFormat format,
+                               gfx::BufferUsage usage) override;
   cc::SharedBitmapManager* GetSharedBitmapManager() override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;