ui/gfx/compositor/compositor_gl.cc - Issue 7104039: First draft to enable turning off compositor for unit tests.

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/gfx/compositor/compositor_gl.cc

Issue 7104039: First draft to enable turning off compositor for unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Revised to add conditional compilation guards. Created 9 years, 6 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:

Index: ui/gfx/compositor/compositor_gl.cc

diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc

index 794d836021d18a18b1626f4fdfe9d146697b0810..e591e2accf084ca4dc043c7eed8b0f6b53165469 100644

--- a/ui/gfx/compositor/compositor_gl.cc

+++ b/ui/gfx/compositor/compositor_gl.cc

@@ -357,9 +357,9 @@ bool CompositorGL::InitShaders() {

// static

Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {

- gfx::GLSurface::InitializeOneOff();

- if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)

- return new glHidden::CompositorGL(widget);

+ gfx::GLSurface::InitializeOneOff();

+ if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)

+ return new glHidden::CompositorGL(widget);

return NULL;

}

#else

« no previous file with comments | « chrome/test/unit/chrome_test_suite.cc ('k') | views/run_all_unittests.cc » ('j') | no next file with comments »