Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

content/browser/renderer_host/render_process_host_impl.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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 1131 matching lines @@
       switches::kContentImageTextureTarget,
       base::UintToString(
           // TODO(reveman): We currently assume that the compositor will use
           // BGRA_8888 if it's able to, and RGBA_8888 otherwise. Since we don't
           // know what it will use we hardcode BGRA_8888 here for now. We should
           // instead move decisions about GpuMemoryBuffer format to the browser
           // embedder so we know it here, and pass that decision to the
           // compositor for each usage.
           // crbug.com/490362
           BrowserGpuMemoryBufferManager::GetImageTextureTarget(
-              gfx::GpuMemoryBuffer::BGRA_8888,
+              gfx::BufferFormat::BGRA_8888,
               // TODO(danakj): When one-copy supports partial update, change
               // this usage to PERSISTENT_MAP for one-copy.
-              gfx::GpuMemoryBuffer::MAP)));
+              gfx::BufferUsage::MAP)));
 
   command_line->AppendSwitchASCII(
       switches::kVideoImageTextureTarget,
       base::UintToString(BrowserGpuMemoryBufferManager::GetImageTextureTarget(
-          gfx::GpuMemoryBuffer::R_8, gfx::GpuMemoryBuffer::MAP)));
+          gfx::BufferFormat::R_8, gfx::BufferUsage::MAP)));
 
   // Appending disable-gpu-feature switches due to software rendering list.
   GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
   DCHECK(gpu_data_manager);
   gpu_data_manager->AppendRendererCommandLine(command_line);
 }
 
 void RenderProcessHostImpl::AppendRendererCommandLine(
     base::CommandLine* command_line) const {
   // Pass the process type first, so it shows first in process listings.
@@ skipping 1340 matching lines @@
 void RenderProcessHostImpl::GetAudioOutputControllers(
     const GetAudioOutputControllersCallback& callback) const {
   audio_renderer_host()->GetOutputControllers(callback);
 }
 
 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
   return bluetooth_dispatcher_host_.get();
 }
 
 }  // namespace content