| Index: ui/gl/gl_implementation.cc
|
| diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc
|
| index 74b95b8b3dbafeebf36f98c64a3eb57134c91d57..98b5ddea7b7cd12d468553735267f540fe4f6383 100644
|
| --- a/ui/gl/gl_implementation.cc
|
| +++ b/ui/gl/gl_implementation.cc
|
| @@ -23,9 +23,6 @@ const struct {
|
| } kGLImplementationNamePairs[] = {
|
| { kGLImplementationDesktopName, kGLImplementationDesktopGL },
|
| { kGLImplementationOSMesaName, kGLImplementationOSMesaGL },
|
| -#if defined(OS_MACOSX)
|
| - { kGLImplementationAppleName, kGLImplementationAppleGL },
|
| -#endif
|
| { kGLImplementationEGLName, kGLImplementationEGLGLES2 },
|
| { kGLImplementationMockName, kGLImplementationMockGL }
|
| };
|
| @@ -51,12 +48,7 @@ void CleanupNativeLibraries(void* unused) {
|
| base::ThreadLocalPointer<GLApi>* g_current_gl_context_tls = NULL;
|
| OSMESAApi* g_current_osmesa_context;
|
|
|
| -#if defined(OS_WIN)
|
| -
|
| -EGLApi* g_current_egl_context;
|
| -WGLApi* g_current_wgl_context;
|
| -
|
| -#elif defined(USE_X11)
|
| +#if defined(USE_X11)
|
|
|
| EGLApi* g_current_egl_context;
|
| GLXApi* g_current_glx_context;
|
|
|