| Index: include/effects/SkDisplacementMapEffect.h
|
| diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
|
| index b3fa8d5f00062c7b7cb49223e002e8c977f4f0a6..9513a54f15c92e07c2df048cb48b0f82babfb890 100644
|
| --- a/include/effects/SkDisplacementMapEffect.h
|
| +++ b/include/effects/SkDisplacementMapEffect.h
|
| @@ -35,16 +35,16 @@ public:
|
| const SkBitmap& src,
|
| const Context& ctx,
|
| SkBitmap* dst,
|
| - SkIPoint* offset) const SK_OVERRIDE;
|
| - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
|
| + SkIPoint* offset) const override;
|
| + void computeFastBounds(const SkRect& src, SkRect* dst) const override;
|
|
|
| virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
|
| - SkIRect* dst) const SK_OVERRIDE;
|
| + SkIRect* dst) const override;
|
|
|
| #if SK_SUPPORT_GPU
|
| - bool canFilterImageGPU() const SK_OVERRIDE { return true; }
|
| + bool canFilterImageGPU() const override { return true; }
|
| virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
|
| - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
|
| + SkBitmap* result, SkIPoint* offset) const override;
|
| #endif
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| @@ -54,7 +54,7 @@ protected:
|
| ChannelSelectorType yChannelSelector,
|
| SkScalar scale, SkImageFilter* inputs[2],
|
| const CropRect* cropRect);
|
| - void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const override;
|
|
|
| private:
|
| ChannelSelectorType fXChannelSelector;
|
|
|