Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

cc/resources/resource_provider.cc

 // Copyright 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.
 
 #include "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 95 matching lines @@
       return kBGRA_8888_GrPixelConfig;
     case RGBA_4444:
       return kRGBA_4444_GrPixelConfig;
     default:
       break;
   }
   DCHECK(false) << "Unsupported resource format.";
   return kSkia8888_GrPixelConfig;
 }
 
-gfx::GpuMemoryBuffer::Format ToGpuMemoryBufferFormat(ResourceFormat format) {
+gfx::BufferFormat ToGpuMemoryBufferFormat(ResourceFormat format) {
   switch (format) {
     case RGBA_8888:
-      return gfx::GpuMemoryBuffer::RGBA_8888;
+      return gfx::BufferFormat::RGBA_8888;
     case BGRA_8888:
-      return gfx::GpuMemoryBuffer::BGRA_8888;
+      return gfx::BufferFormat::BGRA_8888;
     case RGBA_4444:
-      return gfx::GpuMemoryBuffer::RGBA_4444;
+      return gfx::BufferFormat::RGBA_4444;
     case ALPHA_8:
     case LUMINANCE_8:
     case RGB_565:
     case ETC1:
     case RED_8:
       break;
   }
   NOTREACHED();
-  return gfx::GpuMemoryBuffer::RGBA_8888;
+  return gfx::BufferFormat::RGBA_8888;
 }
 
 class ScopedSetActiveTexture {
  public:
   ScopedSetActiveTexture(GLES2Interface* gl, GLenum unit)
       : gl_(gl), unit_(unit) {
     DCHECK_EQ(GL_TEXTURE0, ResourceProvider::GetActiveTextureUnit(gl_));
 
     if (unit_ != GL_TEXTURE0)
       gl_->ActiveTexture(unit_);
@@ skipping 839 matching lines @@
   // GpuMemoryBuffer provides direct access to the memory used by the GPU.
   // Read lock fences are required to ensure that we're not trying to map a
   // buffer that is currently in-use by the GPU.
   resource_->read_lock_fences_enabled = true;
 }
 
 gfx::GpuMemoryBuffer*
 ResourceProvider::ScopedWriteLockGpuMemoryBuffer::GetGpuMemoryBuffer() {
   if (gpu_memory_buffer_)
     return gpu_memory_buffer_;
-  gfx::GpuMemoryBuffer::Usage usage =
+  gfx::BufferUsage usage =
       resource_provider_->use_persistent_map_for_gpu_memory_buffers()
-          ? gfx::GpuMemoryBuffer::PERSISTENT_MAP
-          : gfx::GpuMemoryBuffer::MAP;
+          ? gfx::BufferUsage::PERSISTENT_MAP
+          : gfx::BufferUsage::MAP;
   scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
       gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(
           size_, ToGpuMemoryBufferFormat(format_), usage);
   gpu_memory_buffer_ = gpu_memory_buffer.release();
   return gpu_memory_buffer_;
 }
 
 ResourceProvider::ScopedWriteLockGr::ScopedWriteLockGr(
     ResourceProvider* resource_provider,
     ResourceId resource_id)
@@ skipping 946 matching lines @@
 }
 
 class GrContext* ResourceProvider::GrContext(bool worker_context) const {
   ContextProvider* context_provider =
       worker_context ? output_surface_->worker_context_provider()
                      : output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc