Index: include/effects/SkDisplacementMapEffect.h |
diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h |
index 07f8ee9e85efe05c57e71d0b99c54a4c194706ea..a26d5a2e53916879ae594aafc8126fcc30204823 100644 |
--- a/include/effects/SkDisplacementMapEffect.h |
+++ b/include/effects/SkDisplacementMapEffect.h |
@@ -27,11 +27,7 @@ public: |
ChannelSelectorType yChannelSelector, |
SkScalar scale, SkImageFilter* displacement, |
SkImageFilter* color = NULL, |
- const CropRect* cropRect = NULL) { |
- SkImageFilter* inputs[2] = { displacement, color }; |
- return SkNEW_ARGS(SkDisplacementMapEffect, (xChannelSelector, yChannelSelector, scale, |
- inputs, cropRect)); |
- } |
+ const CropRect* cropRect = NULL); |
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect) |
@@ -56,7 +52,9 @@ protected: |
ChannelSelectorType yChannelSelector, |
SkScalar scale, SkImageFilter* inputs[2], |
const CropRect* cropRect); |
+#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING |
explicit SkDisplacementMapEffect(SkReadBuffer& buffer); |
+#endif |
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; |
private: |