remove breakText, and all utf cache accessors
Bug: skia:
Change-Id: Ib7219e0844a4401f12f89d91eab60dbb7dda0121
Reviewed-on: https://skia-review.googlesource.com/c/188580
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
diff --git a/src/core/SkStrike.h b/src/core/SkStrike.h
index 1be520b..f410a7e 100644
--- a/src/core/SkStrike.h
+++ b/src/core/SkStrike.h
@@ -22,7 +22,7 @@
/** \class SkGlyphCache
This class represents a strike: a specific combination of typeface, size, matrix, etc., and
- holds the glyphs for that strike. Calling any of the getUnichar.../getGlyphID... methods will
+ holds the glyphs for that strike. Calling any of the getGlyphID... methods will
return the requested glyph, either instantly if it is already cached, or by first generating
it and then adding it to the strike.
@@ -47,10 +47,8 @@
SkGlyph* getRawGlyphByID(SkPackedGlyphID);
/** Returns a glyph with valid fAdvance and fDevKern fields. The remaining fields may be
- valid, but that is not guaranteed. If you require those, call getUnicharMetrics or
- getGlyphIDMetrics instead.
+ valid, but that is not guaranteed. If you require those, call getGlyphIDMetrics instead.
*/
- const SkGlyph& getUnicharAdvance(SkUnichar);
const SkGlyph& getGlyphIDAdvance(SkGlyphID);
/** Returns a glyph with all fields valid except fImage and fPath, which may be null. If they
@@ -59,23 +57,16 @@
This call is potentially slower than the matching ...Advance call. If you only need the
fAdvance/fDevKern fields, call those instead.
*/
- const SkGlyph& getUnicharMetrics(SkUnichar);
const SkGlyph& getGlyphIDMetrics(SkGlyphID);
/** These are variants that take the device position of the glyph. Call these only if you are
drawing in subpixel mode. Passing 0, 0 is effectively the same as calling the variants
w/o the extra params, though a tiny bit slower.
*/
- const SkGlyph& getUnicharMetrics(SkUnichar, SkFixed x, SkFixed y);
const SkGlyph& getGlyphIDMetrics(uint16_t, SkFixed x, SkFixed y);
void getAdvances(SkSpan<const SkGlyphID>, SkPoint[]);
- /** Return the glyphID for the specified Unichar. If the char has already been seen, use the
- existing cache entry. If not, ask the scalercontext to compute it for us.
- */
- SkGlyphID unicharToGlyph(SkUnichar);
-
/** Returns the number of glyphs for this strike.
*/
unsigned getGlyphCount() const;
@@ -186,26 +177,15 @@
kHashMask = kHashCount - 1
};
- struct CharGlyphRec {
- SkPackedUnicharID fPackedUnicharID;
- SkPackedGlyphID fPackedGlyphID;
- };
-
// Return the SkGlyph* associated with MakeID. The id parameter is the
// combined glyph/x/y id generated by MakeID. If it is just a glyph id
// then x and y are assumed to be zero.
SkGlyph* lookupByPackedGlyphID(SkPackedGlyphID packedGlyphID, MetricsType type);
- // Return a SkGlyph* associated with unicode id and position x and y.
- SkGlyph* lookupByChar(SkUnichar id, MetricsType type, SkFixed x = 0, SkFixed y = 0);
-
// Return a new SkGlyph for the glyph ID and subpixel position id. Limit the amount
// of work using type.
SkGlyph* allocateNewGlyph(SkPackedGlyphID packedGlyphID, MetricsType type);
- // The id arg is a combined id generated by MakeID.
- CharGlyphRec* getCharGlyphRec(SkPackedUnicharID id);
-
static void OffsetResults(const SkGlyph::Intercept* intercept, SkScalar scale,
SkScalar xPos, SkScalar* array, int* count);
static void AddInterval(SkScalar val, SkGlyph::Intercept* intercept);
@@ -246,8 +226,6 @@
SkArenaAlloc fAlloc {kMinAllocAmount};
- std::unique_ptr<CharGlyphRec[]> fPackedUnicharIDToPackedGlyphID;
-
// used to track (approx) how much ram is tied-up in this cache
size_t fMemoryUsed;