diff options
Diffstat (limited to 'include/effects')
-rw-r--r-- | include/effects/Sk1DPathEffect.h | 3 | ||||
-rw-r--r-- | include/effects/Sk2DPathEffect.h | 5 | ||||
-rw-r--r-- | include/effects/SkAvoidXfermode.h | 3 | ||||
-rw-r--r-- | include/effects/SkBlurDrawLooper.h | 3 | ||||
-rw-r--r-- | include/effects/SkBlurImageFilter.h | 2 | ||||
-rw-r--r-- | include/effects/SkColorMatrixFilter.h | 4 | ||||
-rw-r--r-- | include/effects/SkCornerPathEffect.h | 4 | ||||
-rw-r--r-- | include/effects/SkDashPathEffect.h | 4 | ||||
-rw-r--r-- | include/effects/SkDiscretePathEffect.h | 4 | ||||
-rw-r--r-- | include/effects/SkEmbossMaskFilter.h | 5 | ||||
-rw-r--r-- | include/effects/SkGroupShape.h | 4 | ||||
-rw-r--r-- | include/effects/SkKernel33MaskFilter.h | 7 | ||||
-rw-r--r-- | include/effects/SkLayerDrawLooper.h | 4 | ||||
-rw-r--r-- | include/effects/SkLayerRasterizer.h | 4 | ||||
-rw-r--r-- | include/effects/SkMorphologyImageFilter.h | 14 | ||||
-rw-r--r-- | include/effects/SkPixelXorXfermode.h | 8 | ||||
-rw-r--r-- | include/effects/SkRectShape.h | 8 | ||||
-rw-r--r-- | include/effects/SkTableMaskFilter.h | 3 | ||||
-rwxr-xr-x | include/effects/SkTestImageFilters.h | 15 | ||||
-rw-r--r-- | include/effects/SkTransparentShader.h | 2 |
20 files changed, 37 insertions, 69 deletions
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 53126f2b23..25b6ff32d8 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -63,12 +63,11 @@ public: protected: SkPath1DPathEffect(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; // overrides from Sk1DPathEffect virtual SkScalar begin(SkScalar contourLength) SK_OVERRIDE; virtual SkScalar next(SkPath*, SkScalar distance, SkPathMeasure&) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; private: SkPath fPath; // copied from constructor diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 28c5aea069..67e78579e3 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -21,8 +21,6 @@ public: // overrides virtual bool filterPath(SkPath*, const SkPath&, SkScalar* width) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk2DPathEffect) protected: @@ -46,6 +44,7 @@ protected: // protected so that subclasses can call this during unflattening Sk2DPathEffect(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkMatrix fMatrix, fInverse; @@ -69,8 +68,8 @@ public: protected: SkPath2DPathEffect(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; virtual void next(const SkPoint&, int u, int v, SkPath* dst) SK_OVERRIDE; private: diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h index db14f25181..298ce5b1b7 100644 --- a/include/effects/SkAvoidXfermode.h +++ b/include/effects/SkAvoidXfermode.h @@ -51,12 +51,11 @@ public: virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, const SkAlpha aa[]) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAvoidXfermode) protected: SkAvoidXfermode(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkColor fOpColor; diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h index 453a618f25..2aff2f3ad2 100644 --- a/include/effects/SkBlurDrawLooper.h +++ b/include/effects/SkBlurDrawLooper.h @@ -48,8 +48,7 @@ public: protected: SkBlurDrawLooper(SkFlattenableReadBuffer&); - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& ); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkMaskFilter* fBlur; diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index 846b900cb5..bf5173d381 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -21,10 +21,10 @@ public: protected: explicit SkBlurImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; - virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE; private: SkSize fSigma; diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index abfd95d7d1..1ac6fbf3ee 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -28,9 +28,6 @@ public: virtual uint32_t getFlags() SK_OVERRIDE; virtual bool asColorMatrix(SkScalar matrix[20]) SK_OVERRIDE; - // overrides for SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE; - struct State { int32_t fArray[20]; int fShift; @@ -41,6 +38,7 @@ public: protected: SkColorMatrixFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index 8c5847628b..01dae7e6f3 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -29,13 +29,11 @@ public: // This method is not exported to java. virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); - // overrides for SkFlattenable - // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCornerPathEffect) protected: SkCornerPathEffect(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkScalar fRadius; diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 29a6d1b59a..300edcd535 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -34,13 +34,11 @@ public: // overrides for SkFlattenable // This method is not exported to java. virtual Factory getFactory(); - // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); - static SkFlattenable* CreateProc(SkFlattenableReadBuffer&); protected: SkDashPathEffect(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkScalar* fIntervals; diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index 76a35237a6..30d07d3c21 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -28,13 +28,11 @@ public: // This method is not exported to java. virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); - // overrides for SkFlattenable - // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect) protected: SkDiscretePathEffect(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkScalar fSegLength, fPerterb; diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index a03a2832e4..24815a54d6 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -34,14 +34,11 @@ public: virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin); - // overrides from SkFlattenable - // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter) - protected: SkEmbossMaskFilter(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: Light fLight; diff --git a/include/effects/SkGroupShape.h b/include/effects/SkGroupShape.h index 56e9d322b1..ac0d99476f 100644 --- a/include/effects/SkGroupShape.h +++ b/include/effects/SkGroupShape.h @@ -131,9 +131,6 @@ public: */ void removeAllShapes(); - // overrides - virtual void flatten(SkFlattenableWriteBuffer&); - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkGroupShape) protected: @@ -141,6 +138,7 @@ protected: virtual void onDraw(SkCanvas*); SkGroupShape(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: struct Rec { diff --git a/include/effects/SkKernel33MaskFilter.h b/include/effects/SkKernel33MaskFilter.h index 9c43629179..bd47320529 100644 --- a/include/effects/SkKernel33MaskFilter.h +++ b/include/effects/SkKernel33MaskFilter.h @@ -23,11 +23,9 @@ public: virtual SkMask::Format getFormat(); virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*); - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& wb); - protected: SkKernel33ProcMaskFilter(SkFlattenableReadBuffer& rb); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: int fPercent256; @@ -48,8 +46,6 @@ public: // override from SkKernel33ProcMaskFilter virtual uint8_t computeValue(uint8_t* const* srcRows); - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& wb); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkKernel33MaskFilter) private: @@ -57,6 +53,7 @@ private: int fShift; SkKernel33MaskFilter(SkFlattenableReadBuffer& rb); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; typedef SkKernel33ProcMaskFilter INHERITED; }; diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index 3e7306fb93..0bc4af2d06 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -105,9 +105,7 @@ public: protected: SkLayerDrawLooper(SkFlattenableReadBuffer&); - - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& ); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: struct Rec { diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h index e31ed3362a..c51b174867 100644 --- a/include/effects/SkLayerRasterizer.h +++ b/include/effects/SkLayerRasterizer.h @@ -32,13 +32,11 @@ public: */ void addLayer(const SkPaint& paint, SkScalar dx, SkScalar dy); - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&); - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerRasterizer) protected: SkLayerRasterizer(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; // override from SkRasterizer virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix, diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index 368d17b495..5450576de9 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -13,11 +13,12 @@ class SK_API SkMorphologyImageFilter : public SkImageFilter { public: - explicit SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer); SkMorphologyImageFilter(int radiusX, int radiusY); protected: - virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE; + SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; + SkISize radius() const { return fRadius; } private: @@ -28,7 +29,6 @@ private: class SK_API SkDilateImageFilter : public SkMorphologyImageFilter { public: SkDilateImageFilter(int radiusX, int radiusY) : INHERITED(radiusX, radiusY) {} - explicit SkDilateImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} virtual bool asADilate(SkISize* radius) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, @@ -36,13 +36,16 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter) +protected: + SkDilateImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} + +private: typedef SkMorphologyImageFilter INHERITED; }; class SK_API SkErodeImageFilter : public SkMorphologyImageFilter { public: SkErodeImageFilter(int radiusX, int radiusY) : INHERITED(radiusX, radiusY) {} - explicit SkErodeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} virtual bool asAnErode(SkISize* radius) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, @@ -50,6 +53,9 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter) +protected: + SkErodeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} + private: typedef SkMorphologyImageFilter INHERITED; }; diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h index fe0536d31a..e991108c92 100644 --- a/include/effects/SkPixelXorXfermode.h +++ b/include/effects/SkPixelXorXfermode.h @@ -21,20 +21,18 @@ class SkPixelXorXfermode : public SkXfermode { public: SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {} - // override from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&); - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPixelXorXfermode) protected: + SkPixelXorXfermode(SkFlattenableReadBuffer& rb); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; + // override from SkXfermode virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst); private: SkColor fOpColor; - SkPixelXorXfermode(SkFlattenableReadBuffer& rb); - typedef SkXfermode INHERITED; }; diff --git a/include/effects/SkRectShape.h b/include/effects/SkRectShape.h index b0efc28d16..a06adfc3ba 100644 --- a/include/effects/SkRectShape.h +++ b/include/effects/SkRectShape.h @@ -19,11 +19,9 @@ public: SkPaint& paint() { return fPaint; } const SkPaint& paint() const { return fPaint; } - // overrides - virtual void flatten(SkFlattenableWriteBuffer&); - protected: SkPaintShape(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkPaint fPaint; @@ -40,13 +38,11 @@ public: void setCircle(SkScalar x, SkScalar y, SkScalar radius); void setRRect(const SkRect&, SkScalar rx, SkScalar ry); - // overrides - virtual void flatten(SkFlattenableWriteBuffer&); - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShape) protected: SkRectShape(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; // overrides virtual void onDraw(SkCanvas*); diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h index 15bb930454..e2472d7d86 100644 --- a/include/effects/SkTableMaskFilter.h +++ b/include/effects/SkTableMaskFilter.h @@ -51,12 +51,11 @@ public: virtual SkMask::Format getFormat(); virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*); - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer& wb); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter) protected: SkTableMaskFilter(SkFlattenableReadBuffer& rb); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: uint8_t fTable[256]; diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h index e2c9cf4657..a28ed8b98c 100755 --- a/include/effects/SkTestImageFilters.h +++ b/include/effects/SkTestImageFilters.h @@ -15,12 +15,11 @@ public: protected: SkOffsetImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; private: SkVector fOffset; @@ -42,12 +41,11 @@ public: protected: SkComposeImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; private: SkImageFilter* fOuter; @@ -70,12 +68,11 @@ public: protected: SkMergeImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; private: SkImageFilter** fFilters; @@ -103,11 +100,10 @@ public: protected: SkColorFilterImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; private: SkColorFilter* fColorFilter; @@ -126,11 +122,10 @@ public: protected: SkDownSampleImageFilter(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; private: SkScalar fScale; diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index 0aa9192e78..531da74cb1 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -23,8 +23,6 @@ public: virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; - // overrides for SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader) private: |