From 61d56b92a4076f8afd644d015913641d691e39c8 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 5 Mar 2018 14:23:47 -0500 Subject: Remove attach and detach glyph cache. BUG=skia:7515 Change-Id: Ib978e3cf4cfffdefe6453feb520e5e73684abf2e Reviewed-on: https://skia-review.googlesource.com/112560 Reviewed-by: Ben Wagner Commit-Queue: Herb Derby --- src/xps/SkXPSDevice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/xps') diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 9f1a9609c1..b8387b9206 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -1877,7 +1877,7 @@ HRESULT SkXPSDevice::CreateTypefaceUse(const SkPaint& paint, newTypefaceUse.xpsFont = xpsFontResource.release(); SkAutoGlyphCache agc(paint, &this->surfaceProps(), &SkMatrix::I()); - SkGlyphCache* glyphCache = agc.getCache(); + SkGlyphCache* glyphCache = agc.get(); unsigned int glyphCount = glyphCache->getGlyphCount(); newTypefaceUse.glyphsUsed = new SkBitSet(glyphCount); @@ -2064,7 +2064,7 @@ void SkXPSDevice::drawText(const void* text, size_t byteLen, const SkMatrix& matrix = SkMatrix::I(); SkAutoGlyphCache autoCache(paint, &this->surfaceProps(), &matrix); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); // Advance width and offsets for glyphs measured in hundredths of the font em size // (XPS Spec 5.1.3). @@ -2122,7 +2122,7 @@ void SkXPSDevice::drawPosText(const void* text, size_t byteLen, const SkMatrix& matrix = SkMatrix::I(); SkAutoGlyphCache autoCache(paint, &this->surfaceProps(), &matrix); - SkGlyphCache* cache = autoCache.getCache(); + SkGlyphCache* cache = autoCache.get(); // Advance width and offsets for glyphs measured in hundredths of the font em size // (XPS Spec 5.1.3). -- cgit v1.2.3