| Index: ui/gl/gl_image_x11.cc
|
| diff --git a/ui/gl/gl_image_x11.cc b/ui/gl/gl_image_x11.cc
|
| index a6c09a1513710aa8634b4bfa41a0814d4a02f6bf..6f7d8c6e85b3c735d07c1d0feccbee89d5c458be 100644
|
| --- a/ui/gl/gl_image_x11.cc
|
| +++ b/ui/gl/gl_image_x11.cc
|
| @@ -35,7 +35,9 @@ scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
|
| }
|
|
|
| scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
|
| - gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
|
| + gfx::GpuMemoryBufferHandle buffer,
|
| + gfx::Size size,
|
| + unsigned internalformat) {
|
| TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
|
| switch (GetGLImplementation()) {
|
| case kGLImplementationOSMesaGL:
|
| @@ -43,7 +45,8 @@ scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
|
| case kGLImplementationEGLGLES2:
|
| switch (buffer.type) {
|
| case SHARED_MEMORY_BUFFER: {
|
| - scoped_refptr<GLImageShm> image(new GLImageShm(size));
|
| + scoped_refptr<GLImageShm> image(
|
| + new GLImageShm(size, internalformat));
|
| if (!image->Initialize(buffer))
|
| return NULL;
|
|
|
|
|