gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions.cc - 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_extensions.cc

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.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_extensions.cc

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

index ac8019022b806be83402d02f5c3943218f2fb667..f87a4bd24b52cb5f4133ec07b83935468e337056 100644

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

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

@@ -19,7 +19,7 @@ namespace gles2 {

class GLES2DecoderTestWithCHROMIUMPathRendering : public GLES2DecoderTest {

public:

GLES2DecoderTestWithCHROMIUMPathRendering() {}

- virtual void SetUp() override {

+ void SetUp() override {

InitState init;

init.gl_version = "opengl es 3.1";

init.has_alpha = true;

@@ -39,7 +39,7 @@ INSTANTIATE_TEST_CASE_P(Service,

class GLES2DecoderTestWithBlendEquationAdvanced : public GLES2DecoderTest {

public:

GLES2DecoderTestWithBlendEquationAdvanced() {}

- virtual void SetUp() override {

+ void SetUp() override {

InitState init;

init.gl_version = "opengl es 2.0";

init.has_alpha = true;