Initial error handling code

include/core/SkXfermode.h

Index: include/core/SkXfermode.h
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index ef00f71b75ecb95bf4a900718efb79356e0a1b35..44836ff68a56abd5cc42169d2d5835f92456c23c 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -219,7 +219,7 @@ public:
                                    GrTexture* background = NULL);
 
     SkDEVCODE(virtual void toString(SkString* str) const = 0;)
-    SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
+    SK_DECLARE_FLATTENABLE_GROUP_TYPE(SkXfermode)
 protected:
     SkXfermode(SkFlattenableReadBuffer& rb) : SkFlattenable(rb) {}
 
@@ -260,7 +260,7 @@ public:
                         const SkAlpha aa[]) const SK_OVERRIDE;
 
     SK_DEVELOPER_TO_STRING()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcXfermode)
+    SK_DECLARE_FLATTENABLE_BASE_SERIALIZABLE_TYPE(SkProcXfermode)
 
 protected:
     SkProcXfermode(SkFlattenableReadBuffer&);