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>

1 files changed, 4 insertions, 18 deletions

diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp
index 9fcee54c9f..78071ee227 100644
--- a/src/core/SkReadBuffer.cpp
+++ b/src/core/SkReadBuffer.cpp
@@ -374,26 +374,12 @@ sk_sp<SkTypeface> SkReadBuffer::readTypeface() {
         return sk_ref_sp(fInflator->getTypeface(this->read32()));
     }
 
-    // Read 32 bits (signed)
-    //   0 -- failure
-    //  >0 -- index
-    //  <0 -- custom (serial procs) : negative size in bytes
-
-    int32_t index = this->readUInt();
-    if (index == 0) {
+    uint32_t index = this->readUInt();
+    if (0 == index || index > (unsigned)fTFCount) {
         return nullptr;
-    } else if (index > 0) {
-        if (index > fTFCount) {
-            return nullptr;
-        }
+    } else {
+        SkASSERT(fTFArray);
         return sk_ref_sp(fTFArray[index - 1]);
-    } else {    // custom
-        size_t size = -index;
-        const void* data = this->skip(size);
-        if (!data) {
-            return nullptr;
-        }
-        return fProcs.fTypefaceProc(data, size, fProcs.fTypefaceCtx);
     }
 }