ui/gl/gl_implementation_ozone.cc - Issue 135213003: Ensure GL initialization only happens once, and provide common init path

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_implementation_ozone.cc

Issue 135213003: Ensure GL initialization only happens once, and provide common init path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: initgl: 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

Index: ui/gl/gl_implementation_ozone.cc

diff --git a/ui/gl/gl_implementation_ozone.cc b/ui/gl/gl_implementation_ozone.cc

index 0d9fe6b310de1729ab641bb861b28ae5b1278567..61efdcb69a7852f7ab224deef8729fd68ca2b167 100644

--- a/ui/gl/gl_implementation_ozone.cc

+++ b/ui/gl/gl_implementation_ozone.cc

@@ -37,8 +37,7 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {

// 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.

- if (GetGLImplementation() != kGLImplementationNone)

- return true;

+ DCHECK_EQ(kGLImplementationNone, GetGLImplementation());

switch (implementation) {

case kGLImplementationOSMesaGL:

« ui/compositor/test/default_context_factory.cc ('K') | « ui/gl/gl_implementation_mac.cc ('k') | ui/gl/gl_implementation_win.cc » ('j') | ui/gl/gl_surface.cc » ('J')