| Index: gm/imagefiltersbase.cpp
 | 
| diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
 | 
| index ca45eafe9349dec8dfd05878dcdecaa0aa7af066..05822662061d69ff65eb5fe377ccb8c738edb071 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_EXTERN(FailImageFilter)
 | 
|  protected:
 | 
|      virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
 | 
|                                 SkBitmap* result, SkIPoint* offset) {
 | 
| @@ -41,7 +41,7 @@ class IdentityImageFilter : public SkImageFilter {
 | 
|  public:
 | 
|      IdentityImageFilter() : INHERITED(0) {}
 | 
|  
 | 
| -    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
 | 
| +    SK_DEFINE_FLATTENABLE_EXTERN(IdentityImageFilter)
 | 
|  protected:
 | 
|      virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
 | 
|                                 SkBitmap* result, SkIPoint* offset) {
 | 
| 
 |