gpu: Compositor management of GpuMemoryBuffer instances.

ui/gl/gl_image_memory.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 "ui/gl/gl_image_memory.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_binders.h"
 
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
 #include "ui/gl/gl_surface_egl.h"
 #endif
 
 namespace gfx {
 namespace {
 
-bool ValidFormat(unsigned internalformat) {
+bool ValidInternalFormat(unsigned internalformat) {
   switch (internalformat) {
-    case GL_BGRA8_EXT:
-    case GL_RGBA8_OES:
+    case GL_RGBA:
       return true;
     default:
       return false;
   }
 }
 
-GLenum TextureFormat(unsigned internalformat) {
-  switch (internalformat) {
-    case GL_BGRA8_EXT:
+GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) {
+  switch (format) {
+    case gfx::GpuMemoryBuffer::RGBA_8888:
+      return GL_RGBA;
+    case gfx::GpuMemoryBuffer::BGRA_8888:
       return GL_BGRA_EXT;
-    case GL_RGBA8_OES:
-      return GL_RGBA;
-    default:
-      NOTREACHED();
-      return 0;
+    case gfx::GpuMemoryBuffer::RGBX_8888:

[piman, 2014/10/09 21:33:02]

I may have missed it (this patch is big), but what makes this case NOTREACHED ?

[reveman, 2014/10/10 02:20:16]

Nice catch. GpuMemoryBufferImplSharedMemory will not create a buffer of this
format but there's nothing stopping a malicious renderer from passing an invalid
value to the GPU process.

Added a ValidFormat check to ::Initialize.

+      break;
   }
+
+  NOTREACHED();
+  return 0;
 }
 
-GLenum DataFormat(unsigned internalformat) {
-  return TextureFormat(internalformat);
+GLenum DataFormat(gfx::GpuMemoryBuffer::Format format) {
+  return TextureFormat(format);
 }
 
-GLenum DataType(unsigned internalformat) {
-  switch (internalformat) {
-    case GL_BGRA8_EXT:
-    case GL_RGBA8_OES:
+GLenum DataType(gfx::GpuMemoryBuffer::Format format) {
+  switch (format) {
+    case gfx::GpuMemoryBuffer::RGBA_8888:
+    case gfx::GpuMemoryBuffer::BGRA_8888:
       return GL_UNSIGNED_BYTE;
-    default:
-      NOTREACHED();
-      return 0;
+    case gfx::GpuMemoryBuffer::RGBX_8888:
+      break;
   }
-}
 
-int BytesPerPixel(unsigned internalformat) {
-  switch (internalformat) {
-    case GL_BGRA8_EXT:
-    case GL_RGBA8_OES:
-      return 4;
-    default:
-      NOTREACHED();
-      return 0;
-  }
+  NOTREACHED();
+  return 0;
 }
 
 }  // namespace
 
 GLImageMemory::GLImageMemory(const gfx::Size& size, unsigned internalformat)
-    : memory_(NULL),
-      size_(size),
+    : size_(size),
       internalformat_(internalformat),
+      memory_(NULL),
+      format_(gfx::GpuMemoryBuffer::RGBA_8888),
       in_use_(false),
       target_(0),
       need_do_bind_tex_image_(false)
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
       ,
       egl_texture_id_(0u),
       egl_image_(EGL_NO_IMAGE_KHR)
 #endif
 {
 }
 
 GLImageMemory::~GLImageMemory() {
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
   DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
   DCHECK_EQ(0u, egl_texture_id_);
 #endif
 }
 
-bool GLImageMemory::Initialize(const unsigned char* memory) {
-  if (!ValidFormat(internalformat_)) {
-    DVLOG(0) << "Invalid format: " << internalformat_;
+// static
+size_t GLImageMemory::BytesPerPixel(gfx::GpuMemoryBuffer::Format format) {
+  switch (format) {
+    case gfx::GpuMemoryBuffer::RGBA_8888:
+    case gfx::GpuMemoryBuffer::BGRA_8888:
+      return 4;
+    case gfx::GpuMemoryBuffer::RGBX_8888:
+      break;
+  }
+
+  NOTREACHED();
+  return 0;
+}
+
+bool GLImageMemory::Initialize(const unsigned char* memory,
+                               gfx::GpuMemoryBuffer::Format format) {
+  if (!ValidInternalFormat(internalformat_)) {
+    DVLOG(0) << "Invalid internalformat: " << internalformat_;
     return false;
   }
 
   DCHECK(memory);
   DCHECK(!memory_);
   memory_ = memory;
+  format_ = format;
   return true;
 }
 
 void GLImageMemory::Destroy(bool have_context) {
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
   if (egl_image_ != EGL_NO_IMAGE_KHR) {
     eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_);
     egl_image_ = EGL_NO_IMAGE_KHR;
   }
@@ skipping 31 matching lines @@
 bool GLImageMemory::CopyTexImage(unsigned target) {
   TRACE_EVENT0("gpu", "GLImageMemory::CopyTexImage");
 
   // GL_TEXTURE_EXTERNAL_OES is not a supported CopyTexImage target.
   if (target == GL_TEXTURE_EXTERNAL_OES)
     return false;
 
   DCHECK(memory_);
   glTexImage2D(target,
                0,  // mip level
-               TextureFormat(internalformat_),
+               TextureFormat(format_),
                size_.width(),
                size_.height(),
                0,  // border
-               DataFormat(internalformat_),
-               DataType(internalformat_),
+               DataFormat(format_),
+               DataType(format_),
                memory_);
 
   return true;
 }
 
 void GLImageMemory::WillUseTexImage() {
   DCHECK(!in_use_);
   in_use_ = true;
 
   if (!need_do_bind_tex_image_)
     return;
 
   DCHECK(target_);
   DoBindTexImage(target_);
 }
 
 void GLImageMemory::DidUseTexImage() {
   DCHECK(in_use_);
   in_use_ = false;
 }
 
 bool GLImageMemory::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                          int z_order,
                                          OverlayTransform transform,
                                          const Rect& bounds_rect,
                                          const RectF& crop_rect) {
   return false;
 }
 
-bool GLImageMemory::HasValidFormat() const {
-  return ValidFormat(internalformat_);
-}
-
-size_t GLImageMemory::Bytes() const {
-  return size_.GetArea() * BytesPerPixel(internalformat_);
-}
-
 void GLImageMemory::DoBindTexImage(unsigned target) {
   TRACE_EVENT0("gpu", "GLImageMemory::DoBindTexImage");
 
   DCHECK(need_do_bind_tex_image_);
   need_do_bind_tex_image_ = false;
 
   DCHECK(memory_);
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
   if (target == GL_TEXTURE_EXTERNAL_OES) {
     if (egl_image_ == EGL_NO_IMAGE_KHR) {
       DCHECK_EQ(0u, egl_texture_id_);
       glGenTextures(1, &egl_texture_id_);
 
       {
         ScopedTextureBinder texture_binder(GL_TEXTURE_2D, egl_texture_id_);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         glTexImage2D(GL_TEXTURE_2D,
                      0,  // mip level
-                     TextureFormat(internalformat_),
+                     TextureFormat(format_),
                      size_.width(),
                      size_.height(),
                      0,  // border
-                     DataFormat(internalformat_),
-                     DataType(internalformat_),
+                     DataFormat(format_),
+                     DataType(format_),
                      memory_);
       }
 
       EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
       // Need to pass current EGL rendering context to eglCreateImageKHR for
       // target type EGL_GL_TEXTURE_2D_KHR.
       egl_image_ =
           eglCreateImageKHR(GLSurfaceEGL::GetHardwareDisplay(),
                             eglGetCurrentContext(),
                             EGL_GL_TEXTURE_2D_KHR,
                             reinterpret_cast<EGLClientBuffer>(egl_texture_id_),
                             attrs);
       DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_)
           << "Error creating EGLImage: " << eglGetError();
     } else {
       ScopedTextureBinder texture_binder(GL_TEXTURE_2D, egl_texture_id_);
 
       glTexSubImage2D(GL_TEXTURE_2D,
                       0,  // mip level
                       0,  // x-offset
                       0,  // y-offset
                       size_.width(),
                       size_.height(),
-                      DataFormat(internalformat_),
-                      DataType(internalformat_),
+                      DataFormat(format_),
+                      DataType(format_),
                       memory_);
     }
 
     glEGLImageTargetTexture2DOES(target, egl_image_);
     DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
     return;
   }
 #endif
 
   DCHECK_NE(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), target);
   glTexImage2D(target,
                0,  // mip level
-               TextureFormat(internalformat_),
+               TextureFormat(format_),
                size_.width(),
                size_.height(),
                0,  // border
-               DataFormat(internalformat_),
-               DataType(internalformat_),
+               DataFormat(format_),
+               DataType(format_),
                memory_);
 }
 
 }  // namespace gfx