Revert "SkTypeface::getAdvancedMetrics(): cleanup"
authorHal Canary <halcanary@google.com>
Thu, 4 May 2017 18:20:35 +0000 (18:20 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Thu, 4 May 2017 18:20:45 +0000 (18:20 +0000)
commit59ad782b2b05b07aa6eb961aa4d62e934093cbd1
treecc6445f595afe8117786aa94f0d9a25e0be31c99
parenta4677b5db51fca9f2d1077a4d09dd8f7c80df3d1
Revert "SkTypeface::getAdvancedMetrics(): cleanup"

This reverts commit cef018896e5cad8eb46a536b60cdf79ebe2b0191.

Reason for revert: broke chromium roll (windows).

Original change's description:
> 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>
>

TBR=halcanary@google.com,bungeman@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I84c7d53df566aaf83427e3368edaa02b7b5a9cb8
Reviewed-on: https://skia-review.googlesource.com/15319
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