diff options
author | 2013-08-15 21:20:14 +0000 | |
---|---|---|
committer | 2013-08-15 21:20:14 +0000 | |
commit | 2822c9a92b9a6a1308f2106b7c364ae7e8473ab1 (patch) | |
tree | 622507fb3adb37689d5d7bc37cbef5ff7cb2ece7 /src/ports/SkFontHost_FreeType.cpp | |
parent | cb8b0eeacfc2ff79a2b9721e3ef21d1efb507dc8 (diff) |
Nobody defines SK_SUPPORT_HINTING_SCALE_FACTOR any more, so remove it.
I left the dummy value in the flattened paint. I'm hoping to do an overhaul of
the paint serialization format which will need a picture version bump anyway,
so it can all go together. If that doesn't pan out we can remove this on its
own later.
BUG=
R=reed@google.com
Review URL: https://codereview.chromium.org/23056005
git-svn-id: http://skia.googlecode.com/svn/trunk@10757 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkFontHost_FreeType.cpp')
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 3a8a1ae207..8d6c4d0cb3 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -794,34 +794,9 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, fMatrix22.xx = fMatrix22.yy = SK_Fixed1; fMatrix22.xy = fMatrix22.yx = 0; } - -#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR - if (fRec.getHinting() == SkPaint::kNo_Hinting) { - fScale.set(sx, sy); - fScaleX = SkScalarToFixed(sx); - fScaleY = SkScalarToFixed(sy); - } else { - SkScalar hintingScaleFactor = fRec.fHintingScaleFactor; - - fScale.set(sx / hintingScaleFactor, sy / hintingScaleFactor); - fScaleX = SkScalarToFixed(fScale.fX); - fScaleY = SkScalarToFixed(fScale.fY); - - fMatrix22.xx *= hintingScaleFactor; - fMatrix22.xy *= hintingScaleFactor; - fMatrix22.yx *= hintingScaleFactor; - fMatrix22.yy *= hintingScaleFactor; - - fMatrix22Scalar.setScaleX(fMatrix22Scalar.getScaleX() * hintingScaleFactor); - fMatrix22Scalar.setSkewX(fMatrix22Scalar..getSkewX() * hintingScaleFactor); - fMatrix22Scalar.setSkewY(fMatrix22Scalar..getSkewY() * hintingScaleFactor); - fMatrix22Scalar.setScaleY(fMatrix22Scalar..getScaleY() * hintingScaleFactor); - } -#else fScale.set(sx, sy); fScaleX = SkScalarToFixed(sx); fScaleY = SkScalarToFixed(sy); -#endif fLCDIsVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag); |