| Index: ui/gl/gl_surface_glx.cc
|
| diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
|
| index d66078c89df64179436d7b6d9eacdea6058b6a05..bad432a9441a98a178a6307282ba03767daff558 100644
|
| --- a/ui/gl/gl_surface_glx.cc
|
| +++ b/ui/gl/gl_surface_glx.cc
|
| @@ -317,7 +317,9 @@ Display* SGIVideoSyncProviderThreadShim::display_ = NULL;
|
|
|
| } // namespace
|
|
|
| -GLSurfaceGLX::GLSurfaceGLX() {}
|
| +GLSurfaceGLX::GLSurfaceGLX(SurfaceConfiguration requested_configuration)
|
| + : GLSurface(requested_configuration) {
|
| +}
|
|
|
| bool GLSurfaceGLX::InitializeOneOff() {
|
| static bool initialized = false;
|
| @@ -529,6 +531,11 @@ void* NativeViewGLSurfaceGLX::GetConfig() {
|
| // use when creating the window in the first place. Then we can
|
| // pass that FBConfig down rather than attempting to reconstitute
|
| // it.
|
| + //
|
| + // TODO(iansf): Perhaps instead of kbr's suggestion above, we can
|
| + // now use GLSurface::GetSurfaceConfiguration to use the returned
|
| + // gfx::SurfaceConfiguration with glXChooseFBConfig in a manner
|
| + // similar to that used in NativeViewGLSurfaceEGL::GetConfig.
|
|
|
| XWindowAttributes attributes;
|
| if (!XGetWindowAttributes(
|
|
|