diff options
author | 2017-12-07 21:30:19 +0000 | |
---|---|---|
committer | 2017-12-07 21:30:31 +0000 | |
commit | 1a104bce20adc47a343fa910899ca6c4f261be40 (patch) | |
tree | dd210345afbae56f87d564284dfe8ce93680ed7b /src/core/SkReadBuffer.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 'src/core/SkReadBuffer.h')
-rw-r--r-- | src/core/SkReadBuffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h index b1c67fe95b..78038aa7af 100644 --- a/src/core/SkReadBuffer.h +++ b/src/core/SkReadBuffer.h @@ -185,7 +185,7 @@ public: // be created (e.g. it was not originally encoded) then this returns an image that doesn't // draw. sk_sp<SkImage> readImage(); - sk_sp<SkTypeface> readTypeface(); + virtual sk_sp<SkTypeface> readTypeface(); void setTypefaceArray(SkTypeface* array[], int count) { fTFArray = array; |