gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.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/tests/gl_chromium_framebuffer_multisample_unittest.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/tests/gl_bind_uniform_location_unittest.cc ('k') | gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

index fe61d5135978a888f4e09b8e50d9aee63d2ea0e2..9d36a26f50a318e0351608af4ced8de9c23dfadf 100644

--- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

+++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

@@ -15,13 +15,9 @@ namespace gpu {

class GLChromiumFramebufferMultisampleTest : public testing::Test {

protected:

- virtual void SetUp() {

- gl_.Initialize(GLManager::Options());

- }

+ void SetUp() override { gl_.Initialize(GLManager::Options()); }

- virtual void TearDown() {

- gl_.Destroy();

- }

+ void TearDown() override { gl_.Destroy(); }

GLManager gl_;

};