GLImage support for Android zero-copy pixel buffers

ui/gl/gl_image_android.cc

Index: ui/gl/gl_image_android.cc
diff --git a/ui/gl/gl_image_android.cc b/ui/gl/gl_image_android.cc
index e55e3bbd6890e3078d8003c94940114fbbdcc724..74fd466e64434103914a65567b42c5cd743484ac 100644
--- a/ui/gl/gl_image_android.cc
+++ b/ui/gl/gl_image_android.cc
@@ -5,6 +5,7 @@
 #include "ui/gl/gl_image.h"
 
 #include "base/debug/trace_event.h"
+#include "ui/gl/gl_image_egl.h"
 #include "ui/gl/gl_image_stub.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -13,8 +14,25 @@ namespace gfx {
 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
   TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
   switch (GetGLImplementation()) {

[reveman, 2013/04/05 00:13:24]

nit: please return NULL here for kGLImplementationEGLGLES2 to be consistent with
GLImage::CreateGLImageForPixelBuffer.

[kaanb, 2013/04/05 01:02:52]

Done.

-    case kGLImplementationEGLGLES2: {
+    case kGLImplementationMockGL:
+      return new GLImageStub;
+    default:
+      NOTREACHED();
       return NULL;
+  }
+  return NULL;

[reveman, 2013/04/05 00:13:24]

nit: "return NULL" is redundant

[kaanb, 2013/04/05 01:02:52]

Done.

+}
+
+scoped_refptr<GLImage> GLImage::CreateGLImageForPixelBuffer(
+    gfx::PixelBufferHandle buffer, const gfx::Size& size) {
+  TRACE_EVENT0("gpu", "GLImage::CreateGLImageForPixelBuffer");
+  switch (GetGLImplementation()) {
+    case kGLImplementationEGLGLES2: {
+      scoped_refptr<GLImageEGL> image(new GLImageEGL(size));
+      if (!image->Initialize(buffer))
+        return NULL;
+
+      return image;
     }
     case kGLImplementationMockGL:
       return new GLImageStub;
@@ -22,6 +40,7 @@ scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
       NOTREACHED();
       return NULL;
   }
+  return NULL;

[apatrick_chromium, 2013/04/04 23:33:40]

nit: redundant

[kaanb, 2013/04/05 01:02:52]

Done.

 }
 
 }  // namespace gfx