| Index: gm/imagefiltersbase.cpp
|
| diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
|
| index ca45eafe9349dec8dfd05878dcdecaa0aa7af066..589b4f4f2258802445e07449ba5092db72db7a74 100644
|
| --- a/gm/imagefiltersbase.cpp
|
| +++ b/gm/imagefiltersbase.cpp
|
| @@ -20,7 +20,7 @@ class FailImageFilter : public SkImageFilter {
|
| public:
|
| FailImageFilter() : INHERITED(0) {}
|
|
|
| - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
|
| + SK_DEFINE_FLATTENABLE_SERIALIZABLE_TYPE(FailImageFilter)
|
| protected:
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
|
| SkBitmap* result, SkIPoint* offset) {
|
| @@ -35,13 +35,14 @@ private:
|
|
|
| // register the filter with the flattenable registry
|
| static SkFlattenable::Registrar gFailImageFilterReg("FailImageFilter",
|
| - FailImageFilter::CreateProc);
|
| + FailImageFilter::CreateProc,
|
| + FailImageFilter::IsA);
|
|
|
| class IdentityImageFilter : public SkImageFilter {
|
| public:
|
| IdentityImageFilter() : INHERITED(0) {}
|
|
|
| - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
|
| + SK_DEFINE_FLATTENABLE_SERIALIZABLE_TYPE(IdentityImageFilter)
|
| protected:
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
|
| SkBitmap* result, SkIPoint* offset) {
|
| @@ -57,7 +58,8 @@ private:
|
|
|
| // register the filter with the flattenable registry
|
| static SkFlattenable::Registrar gIdentityImageFilterReg("IdentityImageFilter",
|
| - IdentityImageFilter::CreateProc);
|
| + IdentityImageFilter::CreateProc,
|
| + IdentityImageFilter::IsA);
|
|
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|