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

Unified Diff: ui/gl/gl_implementation.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_implementation.h ('k') | ui/gl/gl_implementation_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/gl/gl_implementation.h ('k') | ui/gl/gl_implementation_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698