Allow all font weights on Android and respect overrides.
authorbungeman <bungeman@google.com>
Tue, 4 Nov 2014 18:54:31 +0000 (10:54 -0800)
committerCommit bot <commit-bot@chromium.org>
Tue, 4 Nov 2014 18:54:32 +0000 (10:54 -0800)
commit4b86bacb0428b07cba01fd46452d5c46e6f21af0
treeb273459e0f50bec0fc419f15846988a43aee4c24
parent47eda52e8fb88f0725b401762a3e0bddc98e9fb3
Allow all font weights on Android and respect overrides.

This removes the code which forces 400 and 700 weights only,
and also overrides the font weight with the configured weight.

Review URL: https://codereview.chromium.org/694533006
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
src/ports/SkFontConfigParser_android.cpp
src/ports/SkFontMgr_android.cpp
tests/FontConfigParser.cpp