gpu: Compositor management of GpuMemoryBuffer instances.

content/common/gpu/client/gpu_memory_buffer_impl.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.cc b/content/common/gpu/client/gpu_memory_buffer_impl.cc
index b197cca2bced5fa122740938957dc486a2c387fb..2706bf12d2174c75326d9709b4c8a0b7b7aa7f84 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl.cc
@@ -9,13 +9,9 @@
 namespace content {
 
 GpuMemoryBufferImpl::GpuMemoryBufferImpl(const gfx::Size& size,
-                                         unsigned internalformat,
+                                         Format format,
                                          const DestructionCallback& callback)
-    : size_(size),
-      internalformat_(internalformat),
-      callback_(callback),
-      mapped_(false) {
-  DCHECK(IsFormatValid(internalformat));
+    : size_(size), format_(format), callback_(callback), mapped_(false) {
 }
 
 GpuMemoryBufferImpl::~GpuMemoryBufferImpl() {
@@ -23,41 +19,34 @@ GpuMemoryBufferImpl::~GpuMemoryBufferImpl() {
 }
 
 // static
-bool GpuMemoryBufferImpl::IsFormatValid(unsigned internalformat) {
-  switch (internalformat) {
-    case GL_BGRA8_EXT:
-    case GL_RGBA8_OES:
-    case GL_RGB8_OES:
-      return true;
-    default:
-      return false;
-  }
+GpuMemoryBufferImpl* GpuMemoryBufferImpl::FromClientBuffer(
+    ClientBuffer buffer) {
+  return reinterpret_cast<GpuMemoryBufferImpl*>(buffer);
 }
 
 // static
-bool GpuMemoryBufferImpl::IsUsageValid(unsigned usage) {
-  switch (usage) {
-    case GL_IMAGE_MAP_CHROMIUM:
-    case GL_IMAGE_SCANOUT_CHROMIUM:
-      return true;
-    default:
-      return false;
+size_t GpuMemoryBufferImpl::BytesPerPixel(Format format) {
+  switch (format) {
+    case RGBA_8888:
+    case RGBX_8888:
+    case BGRA_8888:
+      return 4;
   }
+
+  NOTREACHED();
+  return 0;
 }
 
-// static
-size_t GpuMemoryBufferImpl::BytesPerPixel(unsigned internalformat) {
-  switch (internalformat) {
-    case GL_BGRA8_EXT:
-    case GL_RGBA8_OES:
-    case GL_RGB8_OES:
-      return 4;
-    default:
-      NOTREACHED();
-      return 0;
-  }
+gfx::GpuMemoryBuffer::Format GpuMemoryBufferImpl::GetFormat() const {
+  return format_;
+}
+
+bool GpuMemoryBufferImpl::IsMapped() const {
+  return mapped_;
 }
 
-bool GpuMemoryBufferImpl::IsMapped() const { return mapped_; }
+ClientBuffer GpuMemoryBufferImpl::AsClientBuffer() {
+  return reinterpret_cast<ClientBuffer>(this);
+}
 
 }  // namespace content