Revert "Revert "SkTypeface::getAdvancedMetrics(): cleanup""
authorHal Canary <halcanary@google.com>
Thu, 4 May 2017 18:23:55 +0000 (14:23 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Fri, 5 May 2017 13:53:40 +0000 (13:53 +0000)
commit209e4b1b70a5e9c2f504de15f038999ed9ee4ae5
tree137e2b6ce3d37f25c0bd20caf1838676d0fc7c0f
parent452f92016ba3144f1e58466727074a859d39c072
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>
19 files changed:
include/core/SkTypeface.h
src/core/SkAdvancedTypefaceMetrics.h
src/core/SkTypeface.cpp
src/fonts/SkRandomScalerContext.cpp
src/fonts/SkRandomScalerContext.h
src/fonts/SkTestScalerContext.cpp
src/fonts/SkTestScalerContext.h
src/pdf/SkPDFCanon.h
src/pdf/SkPDFFont.cpp
src/pdf/SkPDFFont.h
src/ports/SkFontHost_FreeType.cpp
src/ports/SkFontHost_FreeType_common.h
src/ports/SkFontHost_mac.cpp
src/ports/SkFontHost_win.cpp
src/ports/SkFontMgr_fontconfig.cpp
src/ports/SkTypeface_win_dw.cpp
src/ports/SkTypeface_win_dw.h
tests/FontMgrTest.cpp
tests/TypefaceTest.cpp