aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils/SkUnitMappers.h
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-26 17:57:35 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-26 17:57:35 +0000
commitba28d03e94dc221d6a803bf2a84a420b9159255c (patch)
tree1130187c2342abd92cc0782e724ad57fc551872a /include/utils/SkUnitMappers.h
parentd43b0a87f85ca26ec771e094c62df33b0537b563 (diff)
Create macro for registering classes for deserialization
Review URL: https://codereview.appspot.com/5909063 git-svn-id: http://skia.googlecode.com/svn/trunk@3494 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils/SkUnitMappers.h')
-rw-r--r--include/utils/SkUnitMappers.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/utils/SkUnitMappers.h b/include/utils/SkUnitMappers.h
index a14f1af6bd..d8856aed41 100644
--- a/include/utils/SkUnitMappers.h
+++ b/include/utils/SkUnitMappers.h
@@ -20,17 +20,17 @@ public:
// override from SkUnitMapper
virtual uint16_t mapUnit16(uint16_t x);
+ SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscreteMapper)
+
protected:
SkDiscreteMapper(SkFlattenableReadBuffer& );
// overrides from SkFlattenable
virtual void flatten(SkFlattenableWriteBuffer& );
- virtual Factory getFactory();
+
private:
int fSegments;
SkFract fScale; // computed from fSegments
- static SkFlattenable* Create(SkFlattenableReadBuffer& buffer);
-
typedef SkUnitMapper INHERITED;
};
@@ -43,13 +43,12 @@ public:
// override from SkUnitMapper
virtual uint16_t mapUnit16(uint16_t x);
+ SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCosineMapper)
+
protected:
SkCosineMapper(SkFlattenableReadBuffer&);
- // overrides from SkFlattenable
- virtual Factory getFactory();
private:
- static SkFlattenable* Create(SkFlattenableReadBuffer&);
typedef SkUnitMapper INHERITED;
};