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

Unified Diff: ui/gl/gl_gl_api_implementation.cc

Issue 1114263002: For dyen: add ui/gl unittest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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_gl_api_implementation.h ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « ui/gl/gl_gl_api_implementation.h ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698