Clean up calls to CreateGpuMemoryBufferImageCHROMIUM.

gpu/command_buffer/service/image_factory.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 "gpu/command_buffer/service/image_factory.h"
 
 #include "gpu/command_buffer/common/capabilities.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 
-ImageFactory::ImageFactory() {
-}
-
-ImageFactory::~ImageFactory() {
-}
-
-// static
-gfx::BufferFormat ImageFactory::DefaultBufferFormatForImageFormat(
-    unsigned internalformat) {
+namespace {
+gfx::BufferFormat BufferFormatForInternalFormat(unsigned internalformat) {
   switch (internalformat) {
     case GL_RED:
       return gfx::BufferFormat::R_8;
     case GL_RGB:
       return gfx::BufferFormat::BGRX_8888;
     case GL_RGBA:
       return gfx::BufferFormat::RGBA_8888;
     case GL_BGRA_EXT:
       return gfx::BufferFormat::BGRA_8888;
     case GL_ATC_RGB_AMD:
@@ skipping 11 matching lines @@
     case GL_RGB_YCBCR_420V_CHROMIUM:
       return gfx::BufferFormat::YUV_420_BIPLANAR;
     case GL_RGB_YCBCR_422_CHROMIUM:
       return gfx::BufferFormat::UYVY_422;
     default:
       NOTREACHED();
       return gfx::BufferFormat::RGBA_8888;
   }
 }
 
+}  // namespace
+
+ImageFactory::ImageFactory() {
+}
+
+ImageFactory::~ImageFactory() {
+}
+
+// static
+gfx::BufferFormat ImageFactory::DefaultBufferFormatForImageFormat(
+    unsigned internalformat) {
+  switch (internalformat) {
+    case GL_RGB:
+      return gfx::BufferFormat::BGRX_8888;
+    case GL_RGBA:
+      return gfx::BufferFormat::RGBA_8888;
+    default:
+      NOTREACHED();
+      return gfx::BufferFormat::RGBA_8888;
+  }
+}
+
 // static
 bool ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat(
     unsigned internalformat,
     gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::ATC:
     case gfx::BufferFormat::ATCIA:
     case gfx::BufferFormat::BGRA_8888:
     case gfx::BufferFormat::BGRX_8888:
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::R_8:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::RGBX_8888:
     case gfx::BufferFormat::YUV_420:
     case gfx::BufferFormat::YUV_420_BIPLANAR:
     case gfx::BufferFormat::UYVY_422:
-      return format == DefaultBufferFormatForImageFormat(internalformat);
+      return format == BufferFormatForInternalFormat(internalformat);
     case gfx::BufferFormat::RGBA_4444:
       return internalformat == GL_RGBA;
   }
 
   NOTREACHED();
   return false;
 }
 
 // static
 bool ImageFactory::IsGpuMemoryBufferFormatSupported(
@@ skipping 55 matching lines @@
       return size.width() % 2 == 0 && size.height() % 2 == 0;
     case gfx::BufferFormat::UYVY_422:
       return size.width() % 2 == 0;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace gpu