a4c4a2d - platform/external/chromium_org/third_party/skia

commit	a4c4a2d8cd65abb1e5ac20813831cdb9ace6c7ee	[log] [tgz]
author	bungeman <bungeman@google.com>	Mon Oct 20 13:33:19 2014 -0700
committer	Commit bot <commit-bot@chromium.org>	Mon Oct 20 13:33:19 2014 -0700
tree	cf64b94cb51a6316cf89080697cdd5d54e459ecc
parent	fca302ccf464933e44e00255654d27a7705abb7f [diff]

Replace SkTypeface::Style with SkFontStyle.

Committed: https://skia.googlesource.com/skia/+/43b8b36b20ae00e2d78421c4cda1f3f922983a20

Review URL: https://codereview.chromium.org/488143002

expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json[diff]
gyp/core.gypi[diff]
gyp/ports.gyp[diff]
include/core/SkFontStyle.h[Renamed from include/ports/SkFontStyle.h - diff]
include/core/SkTypeface.h[diff]
src/core/SkFontHost.cpp[diff]
src/core/SkTypeface.cpp[diff]
src/core/SkTypefaceCache.cpp[diff]
src/core/SkTypefaceCache.h[diff]
src/fonts/SkFontMgr_fontconfig.cpp[diff]
src/fonts/SkGScalerContext.cpp[diff]
src/fonts/SkTestScalerContext.cpp[diff]
src/fonts/SkTestScalerContext.h[diff]
src/ports/SkFontConfigTypeface.h[diff]
src/ports/SkFontHost_FreeType.cpp[diff]
src/ports/SkFontHost_FreeType_common.h[diff]
src/ports/SkFontHost_fontconfig.cpp[diff]
src/ports/SkFontHost_linux.cpp[diff]
src/ports/SkFontHost_mac.cpp[diff]
src/ports/SkFontHost_win.cpp[diff]
src/ports/SkFontMgr_android.cpp[diff]
src/ports/SkFontMgr_fontconfig.cpp[diff]
src/ports/SkFontMgr_win_dw.cpp[diff]
src/ports/SkTypeface_win_dw.h[diff]
tools/sk_tool_utils_font.cpp[diff]

30 files changed