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

Unified Diff: trunk/src/ui/gl/gl_surface_egl.cc

Issue 149953003: Revert 247793 "Ensure GL initialization only happens once, and p..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/ui/gl/gl_surface.cc ('k') | trunk/src/ui/keyboard/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gl/gl_surface_egl.cc
===================================================================
--- trunk/src/ui/gl/gl_surface_egl.cc (revision 247809)
+++ trunk/src/ui/gl/gl_surface_egl.cc (working copy)
@@ -784,15 +784,15 @@
// static
bool GLSurface::InitializeOneOffInternal() {
- switch (GetGLImplementation()) {
- case kGLImplementationEGLGLES2:
- if (!GLSurfaceEGL::InitializeOneOff()) {
- LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
- return false;
- }
- default:
- break;
+ if (GetGLImplementation() == kGLImplementationOSMesaGL) {
+ return true;
}
+ DCHECK(GetGLImplementation() == kGLImplementationEGLGLES2);
+
+ if (!GLSurfaceEGL::InitializeOneOff()) {
+ LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
+ return false;
+ }
return true;
}
« no previous file with comments | « trunk/src/ui/gl/gl_surface.cc ('k') | trunk/src/ui/keyboard/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698