diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-29 15:18:04 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-29 15:18:04 +0000 |
| commit | 54924243c1b65b3ee6d8fa064b50a9b1bb2a19a5 (patch) | |
| tree | e27f07f67a7d5ecd2149ced9d389c1a078ebb656 /include/effects/Sk2DPathEffect.h | |
| parent | 5a64e58ebb19228828eaa800822afa4d9510ccf2 (diff) | |
Cleanup code related to SkFlattenable::flatten()
The following changes were made by this CL:
1. Make flatten() a protected method as callers should use
SkFlattenableWriteBuffer to flatten an object
2. Make flatten a const method (including subclasses)
3. Mark subclass implementation of flatten with SK_OVERRIDE
4. Ensure overridden flatten impls call their parent
5. Remove no-op implementations of flatten from subclasses
Additionally, if necessary the unflattening constructor was
also moved to the protected section of the subclasses
header if it was not already there.
git-svn-id: http://skia.googlecode.com/svn/trunk@3540 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/Sk2DPathEffect.h')
| -rw-r--r-- | include/effects/Sk2DPathEffect.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 28c5aea069..67e78579e3 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -21,8 +21,6 @@ public: // overrides virtual bool filterPath(SkPath*, const SkPath&, SkScalar* width) SK_OVERRIDE; - // overrides from SkFlattenable - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk2DPathEffect) protected: @@ -46,6 +44,7 @@ protected: // protected so that subclasses can call this during unflattening Sk2DPathEffect(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: SkMatrix fMatrix, fInverse; @@ -69,8 +68,8 @@ public: protected: SkPath2DPathEffect(SkFlattenableReadBuffer& buffer); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; - virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; virtual void next(const SkPoint&, int u, int v, SkPath* dst) SK_OVERRIDE; private: |