diff options
| -rw-r--r-- | include/core/SkFlattenable.h | 6 | ||||
| -rw-r--r-- | include/core/SkFlattenableBuffers.h | 4 | ||||
| -rw-r--r-- | include/effects/SkDashPathEffect.h | 2 | ||||
| -rw-r--r-- | src/core/SkFlattenableBuffers.cpp | 3 | ||||
| -rw-r--r-- | src/core/SkOrderedWriteBuffer.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkOrderedWriteBuffer.h | 2 | ||||
| -rw-r--r-- | src/effects/SkColorFilters.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkDashPathEffect.cpp | 2 |
8 files changed, 12 insertions, 11 deletions
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 58e69fd416..6cc76db46e 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() SK_OVERRIDE { return NULL; } + virtual Factory getFactory() const SK_OVERRIDE { return NULL; } #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \ - virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } \ + virtual Factory getFactory() const 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() = 0; + virtual Factory getFactory() const = 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 51016c737f..d71f7c025b 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(SkFlattenable* flattenable) = 0; + virtual void writeFlattenable(const 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(SkFlattenable* obj, SkFlattenableWriteBuffer& buffer); + void flattenObject(const SkFlattenable* obj, SkFlattenableWriteBuffer& buffer); uint32_t fFlags; }; diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 9c0775dfba..4e83f45cb6 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() SK_OVERRIDE; + virtual Factory getFactory() const SK_OVERRIDE; static SkFlattenable* CreateProc(SkFlattenableReadBuffer&); diff --git a/src/core/SkFlattenableBuffers.cpp b/src/core/SkFlattenableBuffers.cpp index 50a47d5c47..5167c2ebe9 100644 --- a/src/core/SkFlattenableBuffers.cpp +++ b/src/core/SkFlattenableBuffers.cpp @@ -51,6 +51,7 @@ void SkFlattenableWriteBuffer::writePaint(const SkPaint& paint) { paint.flatten(*this); } -void SkFlattenableWriteBuffer::flattenObject(SkFlattenable* obj, SkFlattenableWriteBuffer& buffer) { +void SkFlattenableWriteBuffer::flattenObject(const SkFlattenable* obj, + SkFlattenableWriteBuffer& buffer) { obj->flatten(buffer); } diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp index 64f52193ac..9c31b4c4d7 100644 --- a/src/core/SkOrderedWriteBuffer.cpp +++ b/src/core/SkOrderedWriteBuffer.cpp @@ -253,7 +253,7 @@ void SkOrderedWriteBuffer::setBitmapEncoder(SkPicture::EncodeBitmap bitmapEncode } } -void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) { +void SkOrderedWriteBuffer::writeFlattenable(const SkFlattenable* flattenable) { /* * If we have a factoryset, then the first 32bits tell us... * 0: failure to write the flattenable diff --git a/src/core/SkOrderedWriteBuffer.h b/src/core/SkOrderedWriteBuffer.h index 277b7bfd81..f3b414e104 100644 --- a/src/core/SkOrderedWriteBuffer.h +++ b/src/core/SkOrderedWriteBuffer.h @@ -59,7 +59,7 @@ public: virtual void writeEncodedString(const void* value, size_t byteLength, SkPaint::TextEncoding encoding) SK_OVERRIDE; - virtual void writeFlattenable(SkFlattenable* flattenable) SK_OVERRIDE; + virtual void writeFlattenable(const SkFlattenable* flattenable) SK_OVERRIDE; virtual void writeColor(const SkColor& color) SK_OVERRIDE; virtual void writeColorArray(const SkColor* color, uint32_t count) SK_OVERRIDE; virtual void writePoint(const SkPoint& point) SK_OVERRIDE; diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index 41a201ef39..a821129e85 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -498,7 +498,7 @@ protected: virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {} - virtual Factory getFactory() { + virtual Factory getFactory() const { return CreateProc; } diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index be065919ce..4aa46ab6bf 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -528,7 +528,7 @@ bool SkDashPathEffect::asPoints(PointData* results, return true; } -SkFlattenable::Factory SkDashPathEffect::getFactory() { +SkFlattenable::Factory SkDashPathEffect::getFactory() const { return fInitialDashLength < 0 ? NULL : CreateProc; } |