diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/animator/SkDrawExtraPathEffect.cpp | 6 | ||||
| -rw-r--r-- | src/core/SkDraw.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp index cc097d0a9e..dc586055a7 100644 --- a/src/animator/SkDrawExtraPathEffect.cpp +++ b/src/animator/SkDrawExtraPathEffect.cpp @@ -89,7 +89,8 @@ public: 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 { @@ -228,6 +229,9 @@ public: 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); diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 0a6365c335..1e1ce07631 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -2035,7 +2035,9 @@ public: }; SK_TO_STRING_OVERRIDE() - SK_DECLARE_NOT_FLATTENABLE_PROCS(SkTriColorShader) + + // For serialization. This will never be called. + Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; } protected: virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { |