diff options
author | Mike Reed <reed@google.com> | 2017-12-07 21:30:19 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-07 21:30:31 +0000 |
commit | 1a104bce20adc47a343fa910899ca6c4f261be40 (patch) | |
tree | dd210345afbae56f87d564284dfe8ce93680ed7b /include/core/SkTextBlob.h | |
parent | 990014d082e82e34ae53de05fabc012af3a24778 (diff) |
Revert "use serialprocs for typefaces"
This reverts commit b681972e79993e37adb9de9666cc9064b528db8b.
Reason for revert: need to handle null typeface in new procs
Original change's description:
> use serialprocs for typefaces
>
> Bug: skia:
> Change-Id: Ibf59a0fdcf68e8555bd4241e9473e733f6a30993
> Reviewed-on: https://skia-review.googlesource.com/81840
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reed@google.com
Change-Id: Id69500fbc291ecee753e7ee6b80abc2a7cd60d18
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/82341
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkTextBlob.h')
-rw-r--r-- | include/core/SkTextBlob.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h index 228747a1c8..a87c9a3d2e 100644 --- a/include/core/SkTextBlob.h +++ b/include/core/SkTextBlob.h @@ -17,9 +17,6 @@ class SkReadBuffer; class SkWriteBuffer; -struct SkSerialProcs; -struct SkDeserialProcs; - typedef void (*SkTypefaceCatalogerProc)(SkTypeface*, void* ctx); typedef sk_sp<SkTypeface> (*SkTypefaceResolverProc)(uint32_t id, void* ctx); @@ -74,9 +71,6 @@ public: static sk_sp<SkTextBlob> Deserialize(const void* data, size_t size, SkTypefaceResolverProc, void* ctx); - sk_sp<SkData> serialize(const SkSerialProcs&) const; - static sk_sp<SkTextBlob> Deserialize(const void* data, size_t size, const SkDeserialProcs&); - private: friend class SkNVRefCnt<SkTextBlob>; class RunRecord; |