Remove macros that make it look like it's a good idea to not be able to flatten.

src/animator/SkDrawExtraPathEffect.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDrawExtraPathEffect.h"
 #include "SkDrawPath.h"
 #include "Sk1DPathEffect.h"
@@ skipping 71 matching lines @@
 #include "SkDisplayApply.h"
 #include "SkDrawMatrix.h"
 #include "SkPaint.h"
 
 class SkShape1DPathEffect : public Sk1DPathEffect {
 public:
     SkShape1DPathEffect(SkDrawShape1DPathEffect* draw, SkAnimateMaker* maker) :
         fDraw(draw), fMaker(maker) {
     }
 
-    SK_DECLARE_UNFLATTENABLE_OBJECT()
+    // For serialization.  This will never be called.
+    Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
 
 protected:
     virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE {
         SkScriptValue value;
         SkAnimatorScript engine(*fMaker, NULL, SkType_Float);
         engine.propertyCallBack(GetContourLength, &contourLength);
         value.fOperand.fScalar = 0;
         engine.evaluate(fDraw->phase.c_str(), &value, SkType_Float);
         return value.fOperand.fScalar;
     }
@@ skipping 118 matching lines @@
 }
 
 ////////// SkShape2DPathEffect
 
 class SkShape2DPathEffect : public Sk2DPathEffect {
 public:
     SkShape2DPathEffect(SkDrawShape2DPathEffect* draw, SkAnimateMaker* maker,
         const SkMatrix& matrix) : Sk2DPathEffect(matrix), fDraw(draw), fMaker(maker) {
     }
 
+    // For serialization.  This will never be called.
+    Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
+
 protected:
     virtual void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE {
         const_cast<SkShape2DPathEffect*>(this)->setUVBounds(uvBounds);
     }
 
     virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
         const_cast<SkShape2DPathEffect*>(this)->addPath(loc, u, v, dst);
     }
 
 private:
@@ skipping 263 matching lines @@
 
 void InitializeSkExtraPathEffects(SkAnimator* animator) {
     animator->addExtras(new SkExtraPathEffects());
 }
 
 ////////////////
 
 
 SkExtras::SkExtras() : fExtraCallBack(NULL), fExtraStorage(NULL) {
 }