diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-20 13:34:21 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-20 13:34:21 +0000 |
| commit | b5e391025e9859937fd6b4b3f4b8204d0bb73859 (patch) | |
| tree | f40d45d70ce0e68b6070a2b6f8f9bd54ff949a81 /include | |
| parent | 123671901abfa595d09ca789b487c4bc7c1f7cbc (diff) | |
Reverted due to Chromium compilation failures. Please see:
https://codereview.chromium.org/30973002/
git-svn-id: http://skia.googlecode.com/svn/trunk@11871 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkFlattenable.h | 6 | ||||
| -rw-r--r-- | include/core/SkFlattenableBuffers.h | 4 | ||||
| -rw-r--r-- | include/effects/SkDashPathEffect.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 6cc76db46e..58e69fd416 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -27,10 +27,10 @@ class SkFlattenableWriteBuffer; } #define SK_DECLARE_UNFLATTENABLE_OBJECT() \ - virtual Factory getFactory() const SK_OVERRIDE { return NULL; } + virtual Factory getFactory() SK_OVERRIDE { return NULL; } #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \ - virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } \ + virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } \ static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { \ return SkNEW_ARGS(flattenable, (buffer)); \ } @@ -53,7 +53,7 @@ public: to recreate your class given a buffer (previously written to by your override of flatten(). */ - virtual Factory getFactory() const = 0; + virtual Factory getFactory() = 0; static Factory NameToFactory(const char name[]); static const char* FactoryToName(Factory); diff --git a/include/core/SkFlattenableBuffers.h b/include/core/SkFlattenableBuffers.h index d71f7c025b..51016c737f 100644 --- a/include/core/SkFlattenableBuffers.h +++ b/include/core/SkFlattenableBuffers.h @@ -182,7 +182,7 @@ public: SkPaint::TextEncoding encoding) = 0; // common data structures - virtual void writeFlattenable(const SkFlattenable* flattenable) = 0; + virtual void writeFlattenable(SkFlattenable* flattenable) = 0; virtual void writeColor(const SkColor& color) = 0; virtual void writeColorArray(const SkColor* color, uint32_t count) = 0; virtual void writePoint(const SkPoint& point) = 0; @@ -222,7 +222,7 @@ public: protected: // A helper function so that each subclass does not have to be a friend of SkFlattenable - void flattenObject(const SkFlattenable* obj, SkFlattenableWriteBuffer& buffer); + void flattenObject(SkFlattenable* obj, SkFlattenableWriteBuffer& buffer); uint32_t fFlags; }; diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 4e83f45cb6..9c0775dfba 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -47,7 +47,7 @@ public: const SkStrokeRec&, const SkMatrix&, const SkRect*) const SK_OVERRIDE; - virtual Factory getFactory() const SK_OVERRIDE; + virtual Factory getFactory() SK_OVERRIDE; static SkFlattenable* CreateProc(SkFlattenableReadBuffer&); |