| Index: ui/gl/gl_bindings.cc
|
| diff --git a/ui/gl/gl_bindings.cc b/ui/gl/gl_bindings.cc
|
| index 43c84e2e1ffc2357cfa165738cccd2f7d0d90d28..3a4694520c990e4db6f2a0cf4197aae3dfd20494 100644
|
| --- a/ui/gl/gl_bindings.cc
|
| +++ b/ui/gl/gl_bindings.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| +#if defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| #include <EGL/egl.h>
|
| #endif
|
|
|
| @@ -12,11 +12,7 @@
|
| #include "ui/gfx/x/x11_types.h"
|
| #endif
|
|
|
| -#if defined(OS_WIN)
|
| -#include "ui/gl/gl_surface_wgl.h"
|
| -#endif
|
| -
|
| -#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| +#if defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| #include "ui/gl/gl_surface_egl.h"
|
| #endif
|
|
|
| @@ -26,27 +22,10 @@ std::string DriverOSMESA::GetPlatformExtensions() {
|
| return "";
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -std::string DriverWGL::GetPlatformExtensions() {
|
| - const char* str = nullptr;
|
| - if (g_driver_wgl.fn.wglGetExtensionsStringARBFn) {
|
| - str = g_driver_wgl.fn.wglGetExtensionsStringARBFn(
|
| - GLSurfaceWGL::GetDisplayDC());
|
| - } else if (g_driver_wgl.fn.wglGetExtensionsStringEXTFn) {
|
| - str = g_driver_wgl.fn.wglGetExtensionsStringEXTFn();
|
| - }
|
| - return str ? std::string(str) : "";
|
| -}
|
| -#endif
|
| -
|
| -#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| +#if defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
|
| std::string DriverEGL::GetPlatformExtensions() {
|
| EGLDisplay display =
|
| -#if defined(OS_WIN)
|
| - GLSurfaceEGL::GetPlatformDisplay(GetPlatformDefaultEGLNativeDisplay());
|
| -#else
|
| g_driver_egl.fn.eglGetDisplayFn(GetPlatformDefaultEGLNativeDisplay());
|
| -#endif
|
|
|
| DCHECK(g_driver_egl.fn.eglInitializeFn);
|
| g_driver_egl.fn.eglInitializeFn(display, NULL, NULL);
|
|
|