diff options
author | Herb Derby <herb@google.com> | 2018-03-22 11:16:25 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-22 16:32:14 +0000 |
commit | 1a605cd396620d30a8f2b11bf57439fce5927a00 (patch) | |
tree | e8bec881bcbad2eb3290a82c7eed6b869905efa4 /src/pdf/SkPDFDevice.cpp | |
parent | ab46ac5ee801a048552425274804309eaaf9a805 (diff) |
Remove the last uses of auto glyph cache.
Change-Id: I15fdc5bbe29aaa969fe6ec57010919b52249fd7f
Reviewed-on: https://skia-review.googlesource.com/115886
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/pdf/SkPDFDevice.cpp')
-rw-r--r-- | src/pdf/SkPDFDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 58151ccdd4..2dbeda2c65 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -1432,7 +1432,7 @@ void SkPDFDevice::internalDrawText( paint.setHinting(SkPaint::kNo_Hinting); int emSize; - SkAutoGlyphCache glyphCache = SkPDFFont::MakeVectorCache(typeface, &emSize); + auto glyphCache = SkPDFFont::MakeVectorCache(typeface, &emSize); SkScalar textSize = paint.getTextSize(); SkScalar advanceScale = textSize * paint.getTextScaleX() / emSize; @@ -1588,7 +1588,7 @@ void SkPDFDevice::internalDrawText( scaledGlyphCachePaint.setTextScaleX(paint.getTextScaleX()); scaledGlyphCachePaint.setTextSkewX(paint.getTextSkewX()); scaledGlyphCachePaint.setTypeface(sk_ref_sp(typeface)); - SkAutoGlyphCache scaledGlyphCache(scaledGlyphCachePaint, nullptr, nullptr); + auto scaledGlyphCache = SkGlyphCache::FindOrCreateStrikeExclusive(scaledGlyphCachePaint); SkTHashMap<SkPDFCanon::BitmapGlyphKey, SkPDFCanon::BitmapGlyph>* map = &this->getCanon()->fBitmapGlyphImages; for (PositionedGlyph positionedGlyph : fMissingGlyphs) { |