| Index: include/effects/SkDisplacementMapEffect.h
|
| diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
|
| index 4b4ea6021708a1fc396cb7cffa0d64fd057e3f59..4d64aaeb41d3f19f437f6af88c6bde0c013e95ee 100644
|
| --- a/include/effects/SkDisplacementMapEffect.h
|
| +++ b/include/effects/SkDisplacementMapEffect.h
|
| @@ -51,17 +51,13 @@ public:
|
| #endif
|
|
|
| protected:
|
| - explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
|
| - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| -
|
| -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
| -public:
|
| -#endif
|
| SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
|
| ChannelSelectorType yChannelSelector,
|
| SkScalar scale, SkImageFilter* displacement,
|
| SkImageFilter* color = NULL,
|
| const CropRect* cropRect = NULL);
|
| + explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
|
| + virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| private:
|
| ChannelSelectorType fXChannelSelector;
|
|
|