gpu: Compositor management of GpuMemoryBuffer instances.

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
index 872fad108bd65f49f9ba28571e845333763e2ec4..820559701a305fd8b4c675bc2a7d6ac74d5eaf06 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
@@ -13,11 +13,11 @@ namespace content {
 
 GpuMemoryBufferImplSurfaceTexture::GpuMemoryBufferImplSurfaceTexture(
     const gfx::Size& size,
-    unsigned internalformat,
+    Format format,
     const DestructionCallback& callback,
     const gfx::SurfaceTextureId& surface_texture_id,
     ANativeWindow* native_window)
-    : GpuMemoryBufferImpl(size, internalformat, callback),
+    : GpuMemoryBufferImpl(size, format, callback),
       surface_texture_id_(surface_texture_id),
       native_window_(native_window),
       stride_(0u) {
@@ -32,9 +32,9 @@ scoped_ptr<GpuMemoryBufferImpl>
 GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
-    unsigned internalformat,
+    Format format,
     const DestructionCallback& callback) {
-  DCHECK(IsFormatSupported(internalformat));
+  DCHECK(IsFormatSupported(format));
 
   ANativeWindow* native_window =
       SurfaceTextureLookup::GetInstance()->AcquireNativeWidget(
@@ -44,53 +44,58 @@ GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
     return scoped_ptr<GpuMemoryBufferImpl>();
 
   ANativeWindow_setBuffersGeometry(
-      native_window, size.width(), size.height(), WindowFormat(internalformat));
+      native_window, size.width(), size.height(), WindowFormat(format));
 
   return make_scoped_ptr<GpuMemoryBufferImpl>(
-      new GpuMemoryBufferImplSurfaceTexture(size,
-                                            internalformat,
-                                            callback,
-                                            handle.surface_texture_id,
-                                            native_window));
+      new GpuMemoryBufferImplSurfaceTexture(
+          size, format, callback, handle.surface_texture_id, native_window));
 }
 
 // static
-bool GpuMemoryBufferImplSurfaceTexture::IsFormatSupported(
-    unsigned internalformat) {
-  switch (internalformat) {
-    case GL_RGBA8_OES:
+bool GpuMemoryBufferImplSurfaceTexture::IsFormatSupported(Format format) {
+  switch (format) {
+    case RGBA_8888:
       return true;
-    default:
+    case RGBX_8888:
+    case BGRA_8888:
       return false;
   }
+
+  NOTREACHED();
+  return false;
 }
 
 // static
-bool GpuMemoryBufferImplSurfaceTexture::IsUsageSupported(unsigned usage) {
+bool GpuMemoryBufferImplSurfaceTexture::IsUsageSupported(Usage usage) {
   switch (usage) {
-    case GL_IMAGE_MAP_CHROMIUM:
+    case MAP:
       return true;
-    default:
+    case SCANOUT:
       return false;
   }
+
+  NOTREACHED();
+  return false;
 }
 
 // static
-bool GpuMemoryBufferImplSurfaceTexture::IsConfigurationSupported(
-    unsigned internalformat,
-    unsigned usage) {
-  return IsFormatSupported(internalformat) && IsUsageSupported(usage);
+bool GpuMemoryBufferImplSurfaceTexture::IsConfigurationSupported(Format format,
+                                                                 Usage usage) {
+  return IsFormatSupported(format) && IsUsageSupported(usage);
 }
 
 // static
-int GpuMemoryBufferImplSurfaceTexture::WindowFormat(unsigned internalformat) {
-  switch (internalformat) {
-    case GL_RGBA8_OES:
+int GpuMemoryBufferImplSurfaceTexture::WindowFormat(Format format) {
+  switch (format) {
+    case RGBA_8888:
       return WINDOW_FORMAT_RGBA_8888;
-    default:
-      NOTREACHED();
-      return 0;
+    case RGBX_8888:
+    case BGRA_8888:
+      break;
   }
+
+  NOTREACHED();
+  return 0;
 }
 
 void* GpuMemoryBufferImplSurfaceTexture::Map() {
@@ -106,7 +111,7 @@ void* GpuMemoryBufferImplSurfaceTexture::Map() {
   }
 
   DCHECK_LE(size_.width(), buffer.stride);
-  stride_ = buffer.stride * BytesPerPixel(internalformat_);
+  stride_ = buffer.stride * BytesPerPixel(format_);
   mapped_ = true;
   return buffer.bits;
 }
@@ -119,7 +124,9 @@ void GpuMemoryBufferImplSurfaceTexture::Unmap() {
   mapped_ = false;
 }
 
-uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const { return stride_; }
+uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const {
+  return stride_;
+}
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
     const {