Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(900)

Unified Diff: ui/gl/gl_bindings.cc

Issue 1061733002: Remove windows/mac/ios specific code from //ui (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix default try set Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_bindings_api_autogen_wgl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_bindings_api_autogen_wgl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698