gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc - Issue 2103123002: Move static GL binding initialization to //ui/gl/init.

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: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 2103123002: Move static GL binding initialization to //ui/gl/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 5 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: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

index eb27a5c3d4231a7ddea117fb509f4e886a1bd554..10014934526b5840e17d55e05ec78b7548cecf92 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

@@ -26,6 +26,7 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/gl/gl_implementation.h"

#include "ui/gl/gl_mock.h"

+#include "ui/gl/init/gl_factory.h"

#include "ui/gl/test/gl_surface_test_support.h"

using ::gl::MockGLInterface;

@@ -573,7 +574,7 @@ void GLES2DecoderTestBase::ResetDecoder() {

engine_.reset();

::gl::MockGLInterface::SetGLInterface(NULL);

gl_.reset();

- gl::ClearGLBindings();

+ gl::init::ClearGLBindings();

}

void GLES2DecoderTestBase::TearDown() {

« no previous file with comments | « PRESUBMIT.py ('k') | gpu/command_buffer/service/gpu_service_test.cc » ('j') | no next file with comments »