diff options
Diffstat (limited to 'include/effects')
-rw-r--r-- | include/effects/SkBlendImageFilter.h | 4 | ||||
-rw-r--r-- | include/effects/SkSingleInputImageFilter.h | 3 | ||||
-rwxr-xr-x | include/effects/SkTestImageFilters.h | 20 |
3 files changed, 8 insertions, 19 deletions
diff --git a/include/effects/SkBlendImageFilter.h b/include/effects/SkBlendImageFilter.h index be1be68054..ff528ad2ad 100644 --- a/include/effects/SkBlendImageFilter.h +++ b/include/effects/SkBlendImageFilter.h @@ -43,9 +43,9 @@ protected: private: Mode fMode; - SkImageFilter* fBackground; - SkImageFilter* fForeground; typedef SkImageFilter INHERITED; + SkImageFilter* getBackgroundInput() { return getInput(0); } + SkImageFilter* getForegroundInput() { return getInput(1); } }; #endif diff --git a/include/effects/SkSingleInputImageFilter.h b/include/effects/SkSingleInputImageFilter.h index b29eca039d..e7819c4f2f 100644 --- a/include/effects/SkSingleInputImageFilter.h +++ b/include/effects/SkSingleInputImageFilter.h @@ -35,10 +35,9 @@ protected: GrTexture* getInputResultAsTexture(Proxy* proxy, GrTexture* src, const SkRect& rect); #endif - SkImageFilter* input() const { return fInput; } + SkImageFilter* input() const { return getInput(0); } private: typedef SkImageFilter INHERITED; - SkImageFilter* fInput; }; #endif diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h index 4c96776a00..c31a439ddb 100755 --- a/include/effects/SkTestImageFilters.h +++ b/include/effects/SkTestImageFilters.h @@ -7,7 +7,7 @@ class SkOffsetImageFilter : public SkImageFilter { public: - SkOffsetImageFilter(SkScalar dx, SkScalar dy) { + SkOffsetImageFilter(SkScalar dx, SkScalar dy) : INHERITED(0) { fOffset.set(dx, dy); } @@ -29,28 +29,19 @@ private: class SkComposeImageFilter : public SkImageFilter { public: - SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) { - fOuter = outer; - fInner = inner; - SkSafeRef(outer); - SkSafeRef(inner); - } + SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED(2, outer, inner) {} virtual ~SkComposeImageFilter(); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 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; private: - SkImageFilter* fOuter; - SkImageFilter* fInner; - typedef SkImageFilter INHERITED; }; @@ -75,7 +66,6 @@ protected: virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OVERRIDE; private: - SkImageFilter** fFilters; uint8_t* fModes; // SkXfermode::Mode int fCount; @@ -83,8 +73,8 @@ private: // of the filters and modes (unless fCount is so large we can't fit). intptr_t fStorage[16]; - void initAlloc(int count, bool hasModes); - void init(SkImageFilter* const [], int count, const SkXfermode::Mode []); + void initAllocModes(); + void initModes(const SkXfermode::Mode []); typedef SkImageFilter INHERITED; }; @@ -94,7 +84,7 @@ private: // Fun mode that scales down (only) and then scales back up to look pixelated class SkDownSampleImageFilter : public SkImageFilter { public: - SkDownSampleImageFilter(SkScalar scale) : fScale(scale) {} + SkDownSampleImageFilter(SkScalar scale) : INHERITED(0), fScale(scale) {} SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDownSampleImageFilter) |