diff options
Diffstat (limited to 'src/fonts/SkRandomScalerContext.cpp')
| -rw-r--r-- | src/fonts/SkRandomScalerContext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fonts/SkRandomScalerContext.cpp b/src/fonts/SkRandomScalerContext.cpp index 96a2619876..55c7fb30d4 100644 --- a/src/fonts/SkRandomScalerContext.cpp +++ b/src/fonts/SkRandomScalerContext.cpp @@ -25,7 +25,7 @@ protected: void generateAdvance(SkGlyph*) override; void generateMetrics(SkGlyph*) override; void generateImage(const SkGlyph&) override; - void generatePath(const SkGlyph&, SkPath*) override; + void generatePath(SkGlyphID, SkPath*) override; void generateFontMetrics(SkPaint::FontMetrics*) override; private: @@ -84,7 +84,7 @@ void SkRandomScalerContext::generateMetrics(SkGlyph* glyph) { } if (SkMask::kARGB32_Format == format) { SkPath path; - fProxy->getPath(*glyph, &path); + fProxy->getPath(glyph->getPackedID(), &path); SkRect storage; const SkPaint& paint = this->getRandomTypeface()->paint(); @@ -101,7 +101,7 @@ void SkRandomScalerContext::generateMetrics(SkGlyph* glyph) { SkPath devPath, fillPath; SkMatrix fillToDevMatrix; - this->internalGetPath(*glyph, &fillPath, &devPath, &fillToDevMatrix); + this->internalGetPath(glyph->getPackedID(), &fillPath, &devPath, &fillToDevMatrix); // just use devPath const SkIRect ir = devPath.getBounds().roundOut(); @@ -154,7 +154,7 @@ void SkRandomScalerContext::generateImage(const SkGlyph& glyph) { if (!fFakeIt) { if (SkMask::kARGB32_Format == glyph.fMaskFormat) { SkPath path; - fProxy->getPath(glyph, &path); + fProxy->getPath(glyph.getPackedID(), &path); SkBitmap bm; bm.installPixels(SkImageInfo::MakeN32Premul(glyph.fWidth, glyph.fHeight), @@ -175,8 +175,8 @@ void SkRandomScalerContext::generateImage(const SkGlyph& glyph) { } } -void SkRandomScalerContext::generatePath(const SkGlyph& glyph, SkPath* path) { - fProxy->getPath(glyph, path); +void SkRandomScalerContext::generatePath(SkGlyphID glyph, SkPath* path) { + fProxy->generatePath(glyph, path); } void SkRandomScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) { |