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/SkEmbossMaskFilter.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/SkEmbossMaskFilter.h')
| -rw-r--r-- | include/effects/SkEmbossMaskFilter.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index a03a2832e4..24815a54d6 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -34,14 +34,11 @@ public: virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin); - // overrides from SkFlattenable - // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter) - protected: SkEmbossMaskFilter(SkFlattenableReadBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; private: Light fLight; |