ui/compositor/test/test_suite.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/compositor/test/test_suite.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: compile3 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/compositor/test/test_suite.cc

diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc

index aa21ece36d14289bee2c75d254075ba7fb05acea..18b4060b7e3091e319cedda4eb840a4183364737 100644

--- a/ui/compositor/test/test_suite.cc

+++ b/ui/compositor/test/test_suite.cc

@@ -9,7 +9,7 @@

#include "ui/compositor/compositor.h"

#include "ui/compositor/compositor_switches.h"

#include "ui/gfx/gfx_paths.h"

-#include "ui/gl/gl_implementation.h"

+#include "ui/gl/gl_surface.h"

#if defined(USE_X11)

#include <X11/Xlib.h>

@@ -31,8 +31,8 @@ void CompositorTestSuite::Initialize() {

#if defined(USE_X11)

XInitThreads();

#endif

- CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL));

base::TestSuite::Initialize();

+ gfx::GLSurface::InitializeOneOffForTests();

gfx::RegisterPathProvider();

« no previous file with comments | « ui/compositor/test/default_context_factory.cc ('k') | ui/gl/gl_gl_api_implementation.cc » ('j') | no next file with comments »