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

Unified Diff: ui/gl/gl_bindings.h

Issue 893213002: Revert of Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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.gyp ('k') | ui/gl/gl_bindings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_bindings.h
diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h
index 0ddde77dc729d8d2fc90ff4752cff6ff4de8ed7e..86f921b000fb0fa444e836893a1db34ef2c54dd8 100644
--- a/ui/gl/gl_bindings.h
+++ b/ui/gl/gl_bindings.h
@@ -4,8 +4,6 @@
#ifndef UI_GL_GL_BINDINGS_H_
#define UI_GL_GL_BINDINGS_H_
-
-#include <string>
// Includes the platform independent and platform dependent GL headers.
// Only include this in cc files. It pulls in system headers, including
@@ -347,59 +345,51 @@
struct GL_EXPORT DriverOSMESA {
void InitializeStaticBindings();
+ void InitializeDynamicBindings(GLContext* context);
void InitializeDebugBindings();
void ClearBindings();
ProcsOSMESA fn;
ProcsOSMESA debug_fn;
ExtensionsOSMESA ext;
-
- private:
- static std::string GetPlatformExtensions();
};
#if defined(OS_WIN)
struct GL_EXPORT DriverWGL {
void InitializeStaticBindings();
+ void InitializeDynamicBindings(GLContext* context);
void InitializeDebugBindings();
void ClearBindings();
ProcsWGL fn;
ProcsWGL debug_fn;
ExtensionsWGL ext;
-
- private:
- static std::string GetPlatformExtensions();
};
#endif
#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
struct GL_EXPORT DriverEGL {
void InitializeStaticBindings();
+ void InitializeDynamicBindings(GLContext* context);
void InitializeDebugBindings();
void ClearBindings();
ProcsEGL fn;
ProcsEGL debug_fn;
ExtensionsEGL ext;
-
- private:
- static std::string GetPlatformExtensions();
};
#endif
#if defined(USE_X11)
struct GL_EXPORT DriverGLX {
void InitializeStaticBindings();
+ void InitializeDynamicBindings(GLContext* context);
void InitializeDebugBindings();
void ClearBindings();
ProcsGLX fn;
ProcsGLX debug_fn;
ExtensionsGLX ext;
-
- private:
- static std::string GetPlatformExtensions();
};
#endif
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/gl/gl_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698