remove unused untested parts of text blob
SkTextBlob has a number of untested entry points
to serialize and deserialize. Privitize ones only used
by Skia, and remove ones suspected to be unused
and untested.
R=fmalita@chromium.org
TBR=reed@google.com,bsalomon@google.com
Bug: skia:6818
Change-Id: I6a9982a26a883982af3592f3302029a1bcdf5aa3
Reviewed-on: https://skia-review.googlesource.com/141820
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
diff --git a/include/core/SkTextBlob.h b/include/core/SkTextBlob.h
index c68ad41..40d5130 100644
--- a/include/core/SkTextBlob.h
+++ b/include/core/SkTextBlob.h
@@ -14,10 +14,6 @@
#include "SkString.h"
#include "SkRefCnt.h"
-class SkGlyphRunList;
-class SkReadBuffer;
-class SkWriteBuffer;
-
struct SkSerialProcs;
struct SkDeserialProcs;
@@ -40,20 +36,6 @@
*/
uint32_t uniqueID() const { return fUniqueID; }
- /**
- * Serialize to a buffer.
- */
- void flatten(SkWriteBuffer&) const;
-
- /**
- * Recreate an SkTextBlob that was serialized into a buffer.
- *
- * @param SkReadBuffer Serialized blob data.
- * @return A new SkTextBlob representing the serialized data, or NULL if the buffer is
- * invalid.
- */
- static sk_sp<SkTextBlob> MakeFromBuffer(SkReadBuffer&);
-
enum GlyphPositioning : uint8_t {
kDefault_Positioning = 0, // Default glyph advances -- zero scalars per glyph.
kHorizontal_Positioning = 1, // Horizontal positioning -- one scalar per glyph.
@@ -82,9 +64,7 @@
SkTypefaceResolverProc, void* ctx);
sk_sp<SkData> serialize(const SkSerialProcs&) const;
- sk_sp<SkData> serialize() const;
static sk_sp<SkTextBlob> Deserialize(const void* data, size_t size, const SkDeserialProcs&);
- static sk_sp<SkTextBlob> Deserialize(const void* data, size_t size);
private:
friend class SkNVRefCnt<SkTextBlob>;
@@ -111,6 +91,7 @@
friend class SkGlyphRunList;
friend class GrTextBlobCache;
friend class SkTextBlobBuilder;
+ friend class SkTextBlobPriv;
friend class SkTextBlobRunIterator;
const SkRect fBounds;