Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Unified Diff: src/ports/SkFontHost_FreeType.cpp

Issue 23056005: Nobody defines SK_SUPPORT_HINTING_SCALE_FACTOR any more, so remove it. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: undo Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkScalerContext.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontHost_FreeType.cpp
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 3a8a1ae20769c8f873feb4b526f69516988bad3e..8d6c4d0cb322aafb124230255ff82c67f6d6de16 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);
« no previous file with comments | « src/core/SkScalerContext.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698