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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ui/gl/gl_implementation_mac.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_implementation_android.cc ('k') | trunk/src/ui/gl/gl_implementation_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gl/gl_implementation_mac.cc
===================================================================
--- trunk/src/ui/gl/gl_implementation_mac.cc (revision 247809)
+++ trunk/src/ui/gl/gl_implementation_mac.cc (working copy)
@@ -31,7 +31,8 @@
// Prevent reinitialization with a different implementation. Once the gpu
// unit tests have initialized with kGLImplementationMock, we don't want to
// later switch to another GL implementation.
- DCHECK_EQ(kGLImplementationNone, GetGLImplementation());
+ if (GetGLImplementation() != kGLImplementationNone)
+ return true;
// Allow the main thread or another to initialize these bindings
// after instituting restrictions on I/O. Going forward they will
« no previous file with comments | « trunk/src/ui/gl/gl_implementation_android.cc ('k') | trunk/src/ui/gl/gl_implementation_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698