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 04f3bfe5b6f097db99ddd5049717e66c343db2d1..56b613925e66dadeeac2d59aa43c375856334e92 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) {}
 
@@ -240,7 +240,6 @@ private:
 
     friend class SkGraphics;
     static void Term();
-
     typedef SkFlattenable INHERITED;
 };
 
@@ -264,7 +263,7 @@ public:
                         const SkAlpha aa[]) const SK_OVERRIDE;
 
     SK_DEVELOPER_TO_STRING()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcXfermode)
+    SK_DEFINE_FLATTENABLE_SERIALIZABLE_TYPE(SkProcXfermode)
 
 protected:
     SkProcXfermode(SkFlattenableReadBuffer&);