gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc - Issue 1998723002: Move code in ui/gl/* from gfx:: to gl::

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_context_state.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 7 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 | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_lost.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc

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

index 10e31d130cfad26f655c5e4cc8ebaa5815f9cdf8..b7a9f406797fef2549afacd6f2a84a73f13dcd70 100644

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

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

@@ -31,7 +31,7 @@

#define GL_DEPTH24_STENCIL8 0x88F0

#endif

-using ::gfx::MockGLInterface;

+using ::gl::MockGLInterface;

using ::testing::_;

using ::testing::DoAll;

using ::testing::InSequence;

@@ -52,10 +52,9 @@ namespace gles2 {

namespace {

-void SetupUpdateES3UnpackParametersExpectations(

- ::gfx::MockGLInterface* gl,

- GLint row_length,

- GLint image_height) {

+void SetupUpdateES3UnpackParametersExpectations(::gl::MockGLInterface* gl,

+ GLint row_length,

+ GLint image_height) {

EXPECT_CALL(*gl, PixelStorei(GL_UNPACK_ROW_LENGTH, row_length))

.Times(1)

.RetiresOnSaturation();