Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: src/effects/SkLumaColorFilter.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
« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/SkMagnifierImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkLumaColorFilter.cpp
diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
index b7860e0a0b9a1848fb73b49debd972fb332b6d8a..e0c08eaf0bc43bc82e81d5173165226897120047 100644
--- a/src/effects/SkLumaColorFilter.cpp
+++ b/src/effects/SkLumaColorFilter.cpp
@@ -63,14 +63,14 @@ public:
return SkRef(gLumaEffect);
}
- const char* name() const SK_OVERRIDE { return "Luminance-to-Alpha"; }
+ const char* name() const override { return "Luminance-to-Alpha"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
- GrProcessorKeyBuilder* b) const SK_OVERRIDE {
+ GrProcessorKeyBuilder* b) const override {
GLProcessor::GenKey(*this, caps, b);
}
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
+ GrGLFragmentProcessor* createGLInstance() const override {
return SkNEW_ARGS(GLProcessor, (*this));
}
@@ -85,7 +85,7 @@ public:
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray&,
- const TextureSamplerArray&) SK_OVERRIDE {
+ const TextureSamplerArray&) override {
if (NULL == inputColor) {
inputColor = "vec4(1)";
}
@@ -110,9 +110,9 @@ private:
this->initClassID<LumaColorFilterEffect>();
}
- bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; }
+ bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
- void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
// The output is always black. The alpha value for the color passed in is arbitrary.
inout->setToOther(kRGB_GrColorComponentFlags, GrColorPackRGBA(0, 0, 0, 0),
GrInvariantOutput::kWill_ReadInput);
« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/SkMagnifierImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698