diff options
Diffstat (limited to 'chromium/ui/gl/gl_image_android.cc')
| -rw-r--r-- | chromium/ui/gl/gl_image_android.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chromium/ui/gl/gl_image_android.cc b/chromium/ui/gl/gl_image_android.cc index e56dc2d074b..a619c850178 100644 --- a/chromium/ui/gl/gl_image_android.cc +++ b/chromium/ui/gl/gl_image_android.cc @@ -5,9 +5,10 @@ #include "ui/gl/gl_image.h" #include "base/debug/trace_event.h" -#include "ui/gl/gl_image_egl.h" +#include "ui/gl/gl_image_android_native_buffer.h" #include "ui/gl/gl_image_shm.h" #include "ui/gl/gl_image_stub.h" +#include "ui/gl/gl_image_surface_texture.h" #include "ui/gl/gl_implementation.h" namespace gfx { @@ -41,8 +42,17 @@ scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer( return image; } - case EGL_CLIENT_BUFFER: { - scoped_refptr<GLImageEGL> image(new GLImageEGL(size)); + case ANDROID_NATIVE_BUFFER: { + scoped_refptr<GLImageAndroidNativeBuffer> image( + new GLImageAndroidNativeBuffer(size)); + if (!image->Initialize(buffer)) + return NULL; + + return image; + } + case SURFACE_TEXTURE_BUFFER: { + scoped_refptr<GLImageSurfaceTexture> image( + new GLImageSurfaceTexture(size)); if (!image->Initialize(buffer)) return NULL; |