diff options
| author |  Herb Derby <herb@google.com> | 2018-03-07 18:05:39 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-07 18:05:51 +0000 |
| commit | ab6fd7ef91aeca8a3fbbc6c6670cb89a5a7b6d53 (patch) | |
| tree | e98936f124d58dafe85aab73b3a85fd8279e1d8a /src/xps | |
| parent | e64b064f87018cc84ad843b3cad3185f87917fe8 (diff) | |
Revert "Remove attach and detach glyph cache."
This reverts commit 61d56b92a4076f8afd644d015913641d691e39c8.
Reason for revert: broke gldft text
Original change's description:
> Remove attach and detach glyph cache.
>
> BUG=skia:7515
>
> Change-Id: Ib978e3cf4cfffdefe6453feb520e5e73684abf2e
> Reviewed-on: https://skia-review.googlesource.com/112560
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
TBR=bungeman@google.com,herb@google.com
Change-Id: Id5723a3abcd103ed20197bba2dab06e8074be633
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7515
Reviewed-on: https://skia-review.googlesource.com/112745
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index b8387b9206..9f1a9609c1 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.get(); + SkGlyphCache* glyphCache = agc.getCache(); 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.get(); + SkGlyphCache* cache = autoCache.getCache(); // 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.get(); + SkGlyphCache* cache = autoCache.getCache(); // Advance width and offsets for glyphs measured in hundredths of the font em size // (XPS Spec 5.1.3). |