| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index 36eaaf3df1776c7b61b47205ab8811efad3275b4..54170a3ec93e71a541e7b9d365a817d2721679e5 100755
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -14,14 +14,19 @@
|
|
|
| class SK_API SkMergeImageFilter : public SkImageFilter {
|
| public:
|
| - SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
|
| - SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
|
| - const CropRect* cropRect = NULL);
|
| - SkMergeImageFilter(SkImageFilter* filters[], int count,
|
| - const SkXfermode::Mode modes[] = NULL,
|
| - const CropRect* cropRect = NULL);
|
| virtual ~SkMergeImageFilter();
|
|
|
| + static SkMergeImageFilter* Create(SkImageFilter* first, SkImageFilter* second,
|
| + SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
|
| + const CropRect* cropRect = NULL) {
|
| + return SkNEW_ARGS(SkMergeImageFilter, (first, second, mode, cropRect));
|
| + }
|
| + static SkMergeImageFilter* Create(SkImageFilter* filters[], int count,
|
| + const SkXfermode::Mode modes[] = NULL,
|
| + const CropRect* cropRect = NULL) {
|
| + return SkNEW_ARGS(SkMergeImageFilter, (filters, count, modes, cropRect));
|
| + }
|
| +
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
|
|
|
| protected:
|
| @@ -30,6 +35,16 @@ protected:
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
|
| SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
|
| +
|
| +#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
| +public:
|
| +#endif
|
| + SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
|
| + SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
|
| + const CropRect* cropRect = NULL);
|
| + SkMergeImageFilter(SkImageFilter* filters[], int count,
|
| + const SkXfermode::Mode modes[] = NULL,
|
| + const CropRect* cropRect = NULL);
|
| private:
|
| uint8_t* fModes; // SkXfermode::Mode
|
|
|
|
|