| Index: ui/gl/gl_image_linux.cc
|
| diff --git a/ui/gl/gl_image_linux.cc b/ui/gl/gl_image_linux.cc
|
| index 75efd2ab2778aea26fd0af57cd1e88f99e6618ff..fe945eccbe938aead4af2caaf64966844c5ea65a 100644
|
| --- a/ui/gl/gl_image_linux.cc
|
| +++ b/ui/gl/gl_image_linux.cc
|
| @@ -14,9 +14,8 @@ namespace gfx {
|
| scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
|
| TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
|
| switch (GetGLImplementation()) {
|
| - case kGLImplementationOSMesaGL: {
|
| + case kGLImplementationOSMesaGL:
|
| return NULL;
|
| - }
|
| case kGLImplementationDesktopGL: {
|
| scoped_refptr<GLImageGLX> image(new GLImageGLX(window));
|
| if (!image->Initialize())
|
| @@ -24,9 +23,24 @@ scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
|
|
|
| return image;
|
| }
|
| - case kGLImplementationEGLGLES2: {
|
| + case kGLImplementationEGLGLES2:
|
| + return NULL;
|
| + case kGLImplementationMockGL:
|
| + return new GLImageStub;
|
| + default:
|
| + NOTREACHED();
|
| + return NULL;
|
| + }
|
| +}
|
| +
|
| +scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
|
| + gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
|
| + TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
|
| + switch (GetGLImplementation()) {
|
| + case kGLImplementationOSMesaGL:
|
| + case kGLImplementationDesktopGL:
|
| + case kGLImplementationEGLGLES2:
|
| return NULL;
|
| - }
|
| case kGLImplementationMockGL:
|
| return new GLImageStub;
|
| default:
|
|
|