diff options
| author |  Hal Canary <halcanary@google.com> | 2017-05-04 14:23:55 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-05 13:53:40 +0000 |
| commit | 209e4b1b70a5e9c2f504de15f038999ed9ee4ae5 (patch) | |
| tree | 137e2b6ce3d37f25c0bd20caf1838676d0fc7c0f /src/pdf/SkPDFFont.cpp | |
| parent | 452f92016ba3144f1e58466727074a859d39c072 (diff) | |
Revert "Revert "SkTypeface::getAdvancedMetrics(): cleanup""
This reverts commit 59ad782b2b05b07aa6eb961aa4d62e934093cbd1.
- SkAdvancedTypefaceMetrics is a struct not a class
- SkTypeface::PerGlyphInfo is gone
- s/getAdvancedTypefaceMetrics/getAdvancedMetrics/g
- s/onGetAdvancedTypefaceMetrics/onGetAdvancedMetrics/g
- [on]getAdvancedMetrics now return unique_ptr rather than bare ptr.
- [on]getAdvancedMetrics no longer has parameters. (Only caller always
used same arguments.)
- SkAdvancedTypefaceMetrics uses C++11 in-class member initializers.
- SkAdvancedTypefaceMetrics no longer inherits from SkRefCnt
Change-Id: I91b56e60f7d9de7d46c426c6bd34ce124e0cf00e
Reviewed-on: https://skia-review.googlesource.com/15360
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/pdf/SkPDFFont.cpp')
| -rw-r--r-- | src/pdf/SkPDFFont.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index b373514808..f94dba7080 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -7,14 +7,15 @@ #include "SkData.h" #include "SkGlyphCache.h" -#include "SkPaint.h" +#include "SkMakeUnique.h" #include "SkPDFCanon.h" #include "SkPDFConvertType1FontStream.h" #include "SkPDFDevice.h" +#include "SkPDFFont.h" #include "SkPDFMakeCIDGlyphWidthsArray.h" #include "SkPDFMakeToUnicodeCmap.h" -#include "SkPDFFont.h" #include "SkPDFUtils.h" +#include "SkPaint.h" #include "SkRefCnt.h" #include "SkScalar.h" #include "SkStream.h" @@ -142,7 +143,7 @@ const SkAdvancedTypefaceMetrics* SkPDFFont::GetMetrics(SkTypeface* typeface, SkPDFCanon* canon) { SkASSERT(typeface); SkFontID id = typeface->uniqueID(); - if (sk_sp<SkAdvancedTypefaceMetrics>* ptr = canon->fTypefaceMetrics.find(id)) { + if (std::unique_ptr<SkAdvancedTypefaceMetrics>* ptr = canon->fTypefaceMetrics.find(id)) { return ptr->get(); // canon retains ownership. } int count = typeface->countGlyphs(); @@ -151,12 +152,9 @@ const SkAdvancedTypefaceMetrics* SkPDFFont::GetMetrics(SkTypeface* typeface, canon->fTypefaceMetrics.set(id, nullptr); return nullptr; } - sk_sp<SkAdvancedTypefaceMetrics> metrics( - typeface->getAdvancedTypefaceMetrics( - SkTypeface::kGlyphNames_PerGlyphInfo | SkTypeface::kToUnicode_PerGlyphInfo, - nullptr, 0)); + std::unique_ptr<SkAdvancedTypefaceMetrics> metrics = typeface->getAdvancedMetrics(); if (!metrics) { - metrics = sk_make_sp<SkAdvancedTypefaceMetrics>(); + metrics = skstd::make_unique<SkAdvancedTypefaceMetrics>(); } return canon->fTypefaceMetrics.set(id, std::move(metrics))->get(); } |