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