diff options
Diffstat (limited to 'include/effects')
36 files changed, 7 insertions, 138 deletions
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 87047e4ec2..9ba11b0812 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -64,9 +64,6 @@ public: protected: SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkPath1DPathEffect(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; // overrides from Sk1DPathEffect diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 80a27a3793..97c86ec7f2 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -39,9 +39,6 @@ protected: // protected so that subclasses can call this during unflattening explicit Sk2DPathEffect(const SkMatrix& mat); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit Sk2DPathEffect(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: @@ -70,10 +67,6 @@ public: protected: SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix) : Sk2DPathEffect(matrix), fWidth(width) {} -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkLine2DPathEffect(SkReadBuffer&); -#endif - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE; @@ -98,9 +91,6 @@ public: protected: SkPath2DPathEffect(const SkMatrix&, const SkPath&); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkPath2DPathEffect(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE; diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h index 53ce708e36..c79227f762 100644 --- a/include/effects/SkAvoidXfermode.h +++ b/include/effects/SkAvoidXfermode.h @@ -54,9 +54,6 @@ public: protected: SkAvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkAvoidXfermode(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h index 27c7ae204f..8b678b2eb8 100644 --- a/include/effects/SkBitmapSource.h +++ b/include/effects/SkBitmapSource.h @@ -27,9 +27,6 @@ public: protected: explicit SkBitmapSource(const SkBitmap& bitmap); SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkBitmapSource(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h index 9db9f0d7d2..cb912c1a85 100644 --- a/include/effects/SkBlurDrawLooper.h +++ b/include/effects/SkBlurDrawLooper.h @@ -53,9 +53,6 @@ protected: SkBlurDrawLooper(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy, uint32_t flags); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkBlurDrawLooper(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool asABlurShadow(BlurShadowRec*) const SK_OVERRIDE; diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index cfa895a6cf..9064579bea 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -30,9 +30,6 @@ protected: SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkBlurImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h index 2cfee45e9c..ebd5e5fbb5 100644 --- a/include/effects/SkColorCubeFilter.h +++ b/include/effects/SkColorCubeFilter.h @@ -32,9 +32,6 @@ public: protected: SkColorCubeFilter(SkData* cubeData, int cubeDimension); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkColorCubeFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h index 46f2d2aede..ff163c7cd4 100644 --- a/include/effects/SkColorFilterImageFilter.h +++ b/include/effects/SkColorFilterImageFilter.h @@ -23,9 +23,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter) protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkColorFilterImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index dad40623f1..379ca5755a 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -41,9 +41,6 @@ public: protected: explicit SkColorMatrixFilter(const SkColorMatrix&); explicit SkColorMatrixFilter(const SkScalar array[20]); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkColorMatrixFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h index 26eed37872..0478909cd1 100644 --- a/include/effects/SkComposeImageFilter.h +++ b/include/effects/SkComposeImageFilter.h @@ -32,10 +32,6 @@ protected: SkASSERT(inputs[0]); SkASSERT(inputs[1]); } -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkComposeImageFilter(SkReadBuffer& buffer); -#endif - virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index e61d49405d..6b75da66e3 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -32,9 +32,6 @@ public: protected: explicit SkCornerPathEffect(SkScalar radius); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkCornerPathEffect(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 394622426d..210b378fb2 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -55,9 +55,6 @@ public: protected: SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkDashPathEffect(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index 8f1082cb40..18c7b4bdf8 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -45,9 +45,6 @@ protected: SkDiscretePathEffect(SkScalar segLength, SkScalar deviation, uint32_t seedAssist); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkDiscretePathEffect(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h index 0a658aceaf..a5296fd6a7 100644 --- a/include/effects/SkDisplacementMapEffect.h +++ b/include/effects/SkDisplacementMapEffect.h @@ -54,9 +54,6 @@ protected: SkScalar scale, SkImageFilter* inputs[2], const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkDisplacementMapEffect(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h index c6b936a23c..a931ad00ff 100644 --- a/include/effects/SkDropShadowImageFilter.h +++ b/include/effects/SkDropShadowImageFilter.h @@ -51,9 +51,6 @@ protected: SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor, ShadowMode shadowMode, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkDropShadowImageFilter(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index 74895fb0cf..8b6a3c3ac2 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -37,9 +37,6 @@ public: protected: SkEmbossMaskFilter(SkScalar blurSigma, const Light& light); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkEmbossMaskFilter(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index 5bb8b6646b..d21e399762 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -81,14 +81,7 @@ public: SK_TO_STRING_OVERRIDE() -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - static SkFlattenable* DeepCreateProc(SkReadBuffer& buffer) { - return CreateProc(buffer); - } - virtual Factory getFactory() const SK_OVERRIDE { return DeepCreateProc; } -#else virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } -#endif static SkFlattenable* CreateProc(SkReadBuffer& buffer); protected: diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h index 60b3f205c3..1d66383ec9 100644 --- a/include/effects/SkLayerRasterizer.h +++ b/include/effects/SkLayerRasterizer.h @@ -69,9 +69,6 @@ public: protected: SkLayerRasterizer(); SkLayerRasterizer(SkDeque* layers); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkLayerRasterizer(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; // override from SkRasterizer diff --git a/include/effects/SkLerpXfermode.h b/include/effects/SkLerpXfermode.h index d779f16777..923e840c5d 100644 --- a/include/effects/SkLerpXfermode.h +++ b/include/effects/SkLerpXfermode.h @@ -32,9 +32,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLerpXfermode) protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkLerpXfermode(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h index 5fb0822666..323da88ec8 100644 --- a/include/effects/SkLightingImageFilter.h +++ b/include/effects/SkLightingImageFilter.h @@ -75,9 +75,6 @@ protected: SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkLightingImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; const SkLight* light() const { return fLight.get(); } SkScalar surfaceScale() const { return fSurfaceScale; } diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index 420999f2e8..ae666c0bca 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -35,9 +35,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter) protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkLumaColorFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 4dd47ef7bd..68c3fdfee4 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -20,9 +20,6 @@ public: protected: SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset, SkImageFilter* input); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkMagnifierImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index c04d7d1568..b97dabe269 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -76,9 +76,6 @@ protected: SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkMatrixConvolutionImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkMatrixImageFilter.h b/include/effects/SkMatrixImageFilter.h index ae6a0b7abb..0063e41630 100644 --- a/include/effects/SkMatrixImageFilter.h +++ b/include/effects/SkMatrixImageFilter.h @@ -43,9 +43,6 @@ protected: SkPaint::FilterLevel, SkImageFilter* input, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkMatrixImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 5e723aa290..59183e3fc1 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -38,9 +38,6 @@ protected: const SkXfermode::Mode modes[], const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkMergeImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index 3f2be45cc5..ff7ed89d43 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -34,9 +34,6 @@ protected: bool filterImageGeneric(Proc procX, Proc procY, Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const; -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkMorphologyImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; #if SK_SUPPORT_GPU virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } @@ -76,10 +73,6 @@ public: protected: SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID) : INHERITED(radiusX, radiusY, input, cropRect, uniqueID) {} -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} -#endif - private: typedef SkMorphologyImageFilter INHERITED; }; @@ -108,9 +101,6 @@ public: protected: SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID) : INHERITED(radiusX, radiusY, input, cropRect, uniqueID) {} -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} -#endif private: typedef SkMorphologyImageFilter INHERITED; diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h index a870c0b8ee..6a60e62bda 100644 --- a/include/effects/SkOffsetImageFilter.h +++ b/include/effects/SkOffsetImageFilter.h @@ -28,9 +28,6 @@ public: protected: SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input, const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkOffsetImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 2937926cd7..fc6748462c 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -103,9 +103,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkPerlinNoiseShader(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; @@ -115,16 +112,13 @@ private: const SkISize* tileSize); virtual ~SkPerlinNoiseShader(); - // TODO (scroggo): Once all SkShaders are created from a factory, and we have removed the - // constructor that creates SkPerlinNoiseShader from an SkReadBuffer, several fields can - // be made constant. - /*const*/ SkPerlinNoiseShader::Type fType; - /*const*/ SkScalar fBaseFrequencyX; - /*const*/ SkScalar fBaseFrequencyY; - /*const*/ int fNumOctaves; - /*const*/ SkScalar fSeed; - /*const*/ SkISize fTileSize; - /*const*/ bool fStitchTiles; + const SkPerlinNoiseShader::Type fType; + const SkScalar fBaseFrequencyX; + const SkScalar fBaseFrequencyY; + const int fNumOctaves; + const SkScalar fSeed; + const SkISize fTileSize; + const bool fStitchTiles; typedef SkShader INHERITED; }; diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h index ed5c63c18a..f4f1fff4ef 100644 --- a/include/effects/SkPictureImageFilter.h +++ b/include/effects/SkPictureImageFilter.h @@ -40,9 +40,6 @@ protected: * SkReadBuffer::setBitmapDecoder() before calling this constructor. * @param SkReadBuffer Serialized picture data. */ -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkPictureImageFilter(SkReadBuffer&); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h index eb485b4652..758a5e9815 100644 --- a/include/effects/SkPixelXorXfermode.h +++ b/include/effects/SkPixelXorXfermode.h @@ -26,9 +26,6 @@ public: protected: explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {} -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkPixelXorXfermode(SkReadBuffer& rb); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; // override from SkXfermode diff --git a/include/effects/SkRectShaderImageFilter.h b/include/effects/SkRectShaderImageFilter.h index c4311db43e..dc35c947ba 100644 --- a/include/effects/SkRectShaderImageFilter.h +++ b/include/effects/SkRectShaderImageFilter.h @@ -34,9 +34,6 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShaderImageFilter) protected: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkRectShaderImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h index 8b9417900e..ec071d0e6a 100644 --- a/include/effects/SkTableMaskFilter.h +++ b/include/effects/SkTableMaskFilter.h @@ -55,9 +55,6 @@ public: protected: SkTableMaskFilter(); explicit SkTableMaskFilter(const uint8_t table[256]); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkTableMaskFilter(SkReadBuffer& rb); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h index a8186e08c2..6acd1d293c 100644 --- a/include/effects/SkTestImageFilters.h +++ b/include/effects/SkTestImageFilters.h @@ -23,9 +23,6 @@ public: protected: SkDownSampleImageFilter(SkScalar scale, SkImageFilter* input) : INHERITED(1, &input), fScale(scale) {} -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkDownSampleImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 440337a642..49d69a0ebf 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -32,9 +32,6 @@ public: protected: SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input, uint32_t uniqueID) : INHERITED(1, &input, NULL, uniqueID), fSrcRect(srcRect), fDstRect(dstRect) {} -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkTileImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index e23687c021..96de80abe5 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -41,10 +41,6 @@ protected: virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE {} private: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkTransparentShader(SkReadBuffer& buffer) : INHERITED(buffer) {} -#endif - typedef SkShader INHERITED; }; diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 6736889ac8..96d258fd08 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -47,9 +47,6 @@ public: protected: SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* inputs[2], const CropRect* cropRect, uint32_t uniqueID); -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - explicit SkXfermodeImageFilter(SkReadBuffer& buffer); -#endif virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; private: |