GLImage support for Android zero-copy pixel buffers

ui/gl/gl_image_android.cc

 // Copyright (c) 2012 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.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"
 
 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 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: {
-      return NULL;
+      scoped_refptr<GLImageEGL> image(new GLImageEGL(size));
+      if (!image->Initialize(buffer))
+        return NULL;
+
+      return image;
     }
     case kGLImplementationMockGL:
       return new GLImageStub;
     default:
       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