diff options
| author |  Hal Canary <halcanary@google.com> | 2017-05-04 10:10:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-04 16:57:43 +0000 |
| commit | cef018896e5cad8eb46a536b60cdf79ebe2b0191 (patch) | |
| tree | 2085d6071e90287f8dcacc31d801eaa99f35c035 /src/ports/SkFontMgr_fontconfig.cpp | |
| parent | ba9028440be7cd651759be3ff517809aad189de3 (diff) | |
SkTypeface::getAdvancedMetrics(): cleanup
- 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: I37571ebcc383ba9eb21bc20c60c734e3ca317582
Reviewed-on: https://skia-review.googlesource.com/15311
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/ports/SkFontMgr_fontconfig.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_fontconfig.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index f27ad40da6..be4b17dd12 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -489,12 +489,9 @@ public: this->INHERITED::onFilterRec(rec); } - SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(PerGlyphInfo perGlyphInfo, - const uint32_t* glyphIDs, - uint32_t glyphIDsCount) const override - { - SkAdvancedTypefaceMetrics* info = - this->INHERITED::onGetAdvancedTypefaceMetrics(perGlyphInfo, glyphIDs, glyphIDsCount); + std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const override { + std::unique_ptr<SkAdvancedTypefaceMetrics> info = + this->INHERITED::onGetAdvancedMetrics(); // Simulated fonts shouldn't be considered to be of the type of their data. if (get_matrix(fPattern, FC_MATRIX) || get_bool(fPattern, FC_EMBOLDEN)) { |