| Index: src/effects/SkAlphaThresholdFilter.cpp
|
| diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp
|
| index 09dc7427e5f63bc843430e29c90176cfda9164a0..abc4d3327c17d819bde173045c90c0911c3dea60 100644
|
| --- a/src/effects/SkAlphaThresholdFilter.cpp
|
| +++ b/src/effects/SkAlphaThresholdFilter.cpp
|
| @@ -20,13 +20,13 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl)
|
|
|
| protected:
|
| - void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const override;
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
|
| + SkBitmap* result, SkIPoint* offset) const override;
|
| #if SK_SUPPORT_GPU
|
| virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
|
| - const SkIRect& bounds) const SK_OVERRIDE;
|
| + const SkIRect& bounds) const override;
|
| #endif
|
|
|
| private:
|
| @@ -71,14 +71,14 @@ public:
|
|
|
| virtual ~AlphaThresholdEffect() {};
|
|
|
| - const char* name() const SK_OVERRIDE { return "Alpha Threshold"; }
|
| + const char* name() const override { return "Alpha Threshold"; }
|
|
|
| float innerThreshold() const { return fInnerThreshold; }
|
| float outerThreshold() const { return fOuterThreshold; }
|
|
|
| - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
| + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
|
|
|
| - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
| + GrGLFragmentProcessor* createGLInstance() const override;
|
|
|
| private:
|
| AlphaThresholdEffect(GrTexture* texture,
|
| @@ -102,9 +102,9 @@ private:
|
| this->addTextureAccess(&fMaskTextureAccess);
|
| }
|
|
|
| - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
|
| + bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
|
| + void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
|
|
|
| GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
|
|
|
| @@ -127,9 +127,9 @@ public:
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray&,
|
| - const TextureSamplerArray&) SK_OVERRIDE;
|
| + const TextureSamplerArray&) override;
|
|
|
| - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
| + void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
|
|
|
| private:
|
|
|
|
|