content/public/test/unittest_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: content/public/test/unittest_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: 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 | « content/common/gpu/client/gl_helper_unittest.cc ('k') | gpu/command_buffer/common/unittest_main.cc » ('j') | ui/compositor/test/default_context_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/unittest_test_suite.cc

diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc

index 934eb44b860c28c020ede27b3efbd746b045bec3..a721ebe14c70519ffd772cf1d121ea4b5f86a5ce 100644

--- a/content/public/test/unittest_test_suite.cc

+++ b/content/public/test/unittest_test_suite.cc

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

#include "base/test/test_suite.h"

#include "third_party/WebKit/public/platform/Platform.h"

#include "third_party/WebKit/public/web/WebKit.h"

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

namespace content {

@@ -36,6 +37,8 @@ UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)

: test_suite_(test_suite) {

DCHECK(test_suite);

#if !defined(OS_IOS)

+ gfx::GLSurface::InitializeOneOffForTests();

webkit_platform_support_.reset(new UnitTestWebKitPlatformSupport);

blink::initialize(webkit_platform_support_.get());

#endif