gpu/command_buffer/service/gles2_cmd_decoder_unittest.h - Issue 669813003: Update from chromium https://crrev.com/301725/

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.h

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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: gpu/command_buffer/service/gles2_cmd_decoder_unittest.h

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h

index fea20abba52273c34ee1193c83274e935334d6f6..0ea7d4ba8547b3aa5e3dcc437cadeb87c4ab448e 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.h

@@ -57,7 +57,7 @@ class GLES2DecoderRGBBackbufferTest : public GLES2DecoderWithShaderTest {

public:

GLES2DecoderRGBBackbufferTest() {}

- virtual void SetUp();

+ void SetUp() override;

};

class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest {

@@ -65,7 +65,7 @@ class GLES2DecoderManualInitTest : public GLES2DecoderWithShaderTest {

GLES2DecoderManualInitTest() {}

// Override default setup so nothing gets setup.

- virtual void SetUp();

+ void SetUp() override;

void DirtyStateMaskTest(GLuint color_bits,

bool depth_mask,