diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-21 12:26:10 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-21 12:26:10 +0000 |
| commit | c2eae4795478ab134a2315b1a9ff2c5de1d049e4 (patch) | |
| tree | e31eb15f77652bb4a81f82b68cc2b68da75684c6 /include/core/SkFlattenable.h | |
| parent | 466ea91886176919c8dad5c6e96686bda85cc976 (diff) | |
Reverting revert of r11862 (Constify SkFlattenable::getFactory()) or reverting r11871.
git-svn-id: http://skia.googlecode.com/svn/trunk@11876 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkFlattenable.h')
| -rw-r--r-- | include/core/SkFlattenable.h | 6 |
1 files changed, 3 insertions, 3 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); |