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..d514f3975834d9ca03ec7960f653f84f18eb71c4 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -27,6 +27,8 @@ class SkString;
     then objects drawn with that paint have the xfermode applied.
 */
 class SK_API SkXfermode : public SkFlattenable {
+    typedef SkFlattenable INHERITED;
+
 public:
     SK_DECLARE_INST_COUNT(SkXfermode)
 
@@ -220,6 +222,7 @@ public:
 
     SkDEVCODE(virtual void toString(SkString* str) const = 0;)
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
+    SK_DEFINE_FLATTENABLE_TYPE(SkXfermode)
 protected:
     SkXfermode(SkFlattenableReadBuffer& rb) : SkFlattenable(rb) {}
 
@@ -237,7 +240,6 @@ private:
     enum {
         kModeCount = kLastMode + 1
     };
-    typedef SkFlattenable INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -248,6 +250,8 @@ private:
     This class is not exported to java.
 */
 class SkProcXfermode : public SkXfermode {
+    typedef SkXfermode INHERITED;
+
 public:
     SkProcXfermode(SkXfermodeProc proc) : fProc(proc) {}
 
@@ -261,6 +265,7 @@ public:
 
     SK_DEVELOPER_TO_STRING()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcXfermode)
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_UTILS()
 
 protected:
     SkProcXfermode(SkFlattenableReadBuffer&);
@@ -273,8 +278,6 @@ protected:
 
 private:
     SkXfermodeProc  fProc;
-
-    typedef SkXfermode INHERITED;
 };
 
 #endif