Chromium Code Reviews| Index: ui/gl/gl_gl_api_implementation.h |
| diff --git a/ui/gl/gl_gl_api_implementation.h b/ui/gl/gl_gl_api_implementation.h |
| index d4086006b6b51babf299646b6c7594d2fb06ccef..170e10bbd1f7af2cf9f57b198068be4b02d3d8a9 100644 |
| --- a/ui/gl/gl_gl_api_implementation.h |
| +++ b/ui/gl/gl_gl_api_implementation.h |
| @@ -5,10 +5,15 @@ |
| #ifndef UI_GL_GL_GL_API_IMPLEMENTATION_H_ |
| #define UI_GL_GL_GL_API_IMPLEMENTATION_H_ |
| +#include <vector> |
| + |
| #include "base/compiler_specific.h" |
| #include "ui/gl/gl_bindings.h" |
| #include "ui/gl/gl_export.h" |
| +namespace base { |
| + class CommandLine; |
|
no sievers
2015/04/30 23:49:05
nit: no indent
David Yen
2015/05/01 21:20:38
Done.
|
| +} |
| namespace gpu { |
| namespace gles2 { |
| class GLES2Decoder; |
| @@ -53,11 +58,21 @@ class RealGLApi : public GLApiBase { |
| public: |
| RealGLApi(); |
| ~RealGLApi() override; |
| - void Initialize(DriverGL* driver); |
| + void Initialize(DriverGL* driver, base::CommandLine* command_line = nullptr); |
|
Zhenyao Mo
2015/04/30 22:40:51
default values are against coding style. Otherwise
David Yen
2015/05/01 21:20:37
Done.
|
| private: |
| + void glGetIntegervFn(GLenum pname, GLint* params) override; |
| + const GLubyte* glGetStringFn(GLenum name) override; |
| + const GLubyte* glGetStringiFn(GLenum name, GLuint index) override; |
| + |
| void glFinishFn() override; |
| void glFlushFn() override; |
| + |
| + // Filtered GL_EXTENSIONS we return to glGetString(i) calls. |
| + bool extensions_filtered_ = false; |
| + std::vector<std::string> disabled_extensions_; |
| + std::vector<std::string> filtered_exts_; |
| + std::string filtered_exts_str_; |
| }; |
| // Inserts a TRACE for every GL call. |
| @@ -119,7 +134,7 @@ private: |
| class GL_EXPORT ScopedSetGLToRealGLApi { |
| public: |
| - ScopedSetGLToRealGLApi(); |
| + ScopedSetGLToRealGLApi(GLApi* set_api = nullptr); |
|
no sievers
2015/04/30 23:49:05
Instead of changing this (which is supposed to set
David Yen
2015/05/01 21:20:37
No longer relevant, so removed.
|
| ~ScopedSetGLToRealGLApi(); |
| private: |