| 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);
|
|
|