| Index: ui/gl/gl_gl_api_implementation.cc
|
| diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc
|
| index 6752a25ee5a83644a00495804ffb027d81a54859..b14372fd6f109940d16b92b344e0d815ee0a6213 100644
|
| --- a/ui/gl/gl_gl_api_implementation.cc
|
| +++ b/ui/gl/gl_gl_api_implementation.cc
|
| @@ -299,7 +299,7 @@ void InitializeStaticGLBindingsGL() {
|
| g_trace_gl = new TraceGLApi(g_real_gl);
|
| g_no_context_gl = new NoContextGLApi();
|
| }
|
| - g_real_gl->Initialize(&g_driver_gl);
|
| + g_real_gl->Initialize(&g_driver_gl, nullptr);
|
| g_gl = g_real_gl;
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableGPUServiceTracing)) {
|
| @@ -382,7 +382,7 @@ GLApi::GLApi() {
|
| }
|
|
|
| GLApi::~GLApi() {
|
| - if (GetCurrentGLApi() == this)
|
| + if (g_current_gl_context_tls /* for testing */ && GetCurrentGLApi() == this)
|
| SetGLApi(NULL);
|
| }
|
|
|
| @@ -403,7 +403,7 @@ RealGLApi::RealGLApi() {
|
| RealGLApi::~RealGLApi() {
|
| }
|
|
|
| -void RealGLApi::Initialize(DriverGL* driver) {
|
| +void RealGLApi::Initialize(DriverGL* driver, base::CommandLine* command_line) {
|
| InitializeBase(driver);
|
| }
|
|
|
|
|