src/gpu/effects/GrSimpleTextureEffect.cpp - Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

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: src/gpu/effects/GrSimpleTextureEffect.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: git cl web Created 5 years, 9 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: src/gpu/effects/GrSimpleTextureEffect.cpp

diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp

index 93f7d68249b8ac7932c23e5debfe248f9d238252..76eece4af155669902a25ec1df6190da598f9ab7 100644

--- a/src/gpu/effects/GrSimpleTextureEffect.cpp

+++ b/src/gpu/effects/GrSimpleTextureEffect.cpp

@@ -23,7 +23,7 @@ public:

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray& coords,

- const TextureSamplerArray& samplers) SK_OVERRIDE {

+ const TextureSamplerArray& samplers) override {

GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppendf("\t%s = ", outputColor);

fsBuilder->appendTextureLookupAndModulate(inputColor,

« no previous file with comments | « src/gpu/effects/GrSimpleTextureEffect.h ('k') | src/gpu/effects/GrTextureDomain.h » ('j') | no next file with comments »