diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-26 17:57:35 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-26 17:57:35 +0000 |
| commit | ba28d03e94dc221d6a803bf2a84a420b9159255c (patch) | |
| tree | 1130187c2342abd92cc0782e724ad57fc551872a /src/core/SkXfermode.cpp | |
| parent | d43b0a87f85ca26ec771e094c62df33b0537b563 (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 'src/core/SkXfermode.cpp')
| -rw-r--r-- | src/core/SkXfermode.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 952e0f2f20..bcb721d35f 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -729,15 +729,12 @@ public: return true; } - virtual Factory getFactory() { return CreateProc; } virtual void flatten(SkFlattenableWriteBuffer& buffer) { this->INHERITED::flatten(buffer); buffer.write32(fMode); } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { - return SkNEW_ARGS(SkProcCoeffXfermode, (buffer)); - } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode) protected: SkProcCoeffXfermode(SkFlattenableReadBuffer& buffer) @@ -768,11 +765,8 @@ public: virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) SK_OVERRIDE; virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) SK_OVERRIDE; - virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { - return SkNEW_ARGS(SkClearXfermode, (buffer)); - } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkClearXfermode) private: SkClearXfermode(SkFlattenableReadBuffer& buffer) @@ -825,11 +819,8 @@ public: virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) SK_OVERRIDE; virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) SK_OVERRIDE; - virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { - return SkNEW_ARGS(SkSrcXfermode, (buffer)); - } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSrcXfermode) private: SkSrcXfermode(SkFlattenableReadBuffer& buffer) @@ -887,11 +878,8 @@ public: SkDstInXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kDstIn_Mode) {} virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) SK_OVERRIDE; - virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { - return SkNEW_ARGS(SkDstInXfermode, (buffer)); - } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDstInXfermode) private: SkDstInXfermode(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} @@ -926,11 +914,8 @@ public: SkDstOutXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kDstOut_Mode) {} virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) SK_OVERRIDE; - virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { - return SkNEW_ARGS(SkDstOutXfermode, (buffer)); - } + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDstOutXfermode) private: SkDstOutXfermode(SkFlattenableReadBuffer& buffer) |