From 785586af7dc72c23d0ab30204ab2975a1451dc16 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 19 Jul 2018 10:07:01 -0400 Subject: remove unused serialization in textblob The SKTextBlob serialization code that is tested by Skia is unused by Chrome. The serialization code that is used by Chrome is untested by Skia. Remove the unused code; test the used code. The code path introduced nearly a year ago, likely for slimming paint, attempts to make text blobs smarter by allowing the reuse of typefaces. Maybe there needs to be a Chrome bug / feature request to use this? If if turns out there is no interest to do so, This CL aligns used interfaces with tests. R=reed@google.com,fmalita@google.com,bungeman@google.com Bug: skia:6818 Change-Id: I9b3ec0c326495322986ba26f20f901bcb208be73 Reviewed-on: https://skia-review.googlesource.com/141542 Reviewed-by: Cary Clark Reviewed-by: Florin Malita Reviewed-by: Ben Wagner Reviewed-by: Mike Reed Commit-Queue: Cary Clark Auto-Submit: Cary Clark --- include/core/SkTextBlob.h | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'include') diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h index 8dce082512..cf77a78ca5 100644 --- a/include/core/SkTextBlob.h +++ b/include/core/SkTextBlob.h @@ -17,9 +17,6 @@ struct SkSerialProcs; struct SkDeserialProcs; -typedef void (*SkTypefaceCatalogerProc)(SkTypeface*, void* ctx); -typedef sk_sp (*SkTypefaceResolverProc)(uint32_t id, void* ctx); - /** \class SkTextBlob SkTextBlob combines multiple text runs into an immutable, ref-counted structure. @@ -45,29 +42,16 @@ public: kFull_Positioning = 2 // Point positioning -- two scalars per glyph. }; - /** - * Serialize the typeface into a data blob, storing type uniqueID of each referenced typeface. - * During this process, each time a typeface is encountered, it is passed to the catalog, - * allowing the caller to what typeface IDs will need to be resolved in Deserialize(). - */ - sk_sp serialize(SkTypefaceCatalogerProc, void* ctx) const; - /** * Similar to serialize above, but writes directly into |memory|. Returns bytes written or 0u * if serialization failed due to insufficient size. */ size_t serialize(const SkSerialProcs& procs, void* memory, size_t memory_size) const; - /** - * Re-create a text blob previously serialized. Since the serialized form records the uniqueIDs - * of its typefaces, deserialization requires that the caller provide the corresponding - * SkTypefaces for those IDs. - */ - static sk_sp Deserialize(const void* data, size_t size, - SkTypefaceResolverProc, void* ctx); + sk_sp serialize(const SkSerialProcs& procs) const; - sk_sp serialize(const SkSerialProcs&) const; - static sk_sp Deserialize(const void* data, size_t size, const SkDeserialProcs&); + static sk_sp Deserialize(const void* data, size_t size, + const SkDeserialProcs& procs); private: friend class SkNVRefCnt; -- cgit v1.2.3