| Index: src/ports/SkFontHost_mac.cpp
|
| diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
|
| index 02c54640bbed585f9e345a34d41b15cb6eb3b4b2..72d4690870f4d54139b397055df95feb4f0a57d2 100644
|
| --- a/src/ports/SkFontHost_mac.cpp
|
| +++ b/src/ports/SkFontHost_mac.cpp
|
| @@ -417,7 +417,7 @@ static SkFontStyle fontstyle_from_descriptor(CTFontDescriptorRef desc) {
|
| return SkFontStyle(unit_weight_to_fontstyle(weight),
|
| unit_width_to_fontstyle(width),
|
| slant ? SkFontStyle::kItalic_Slant
|
| - : SkFontStyle::kUpright_Slant);
|
| + : SkFontStyle::kUpright_Slant);
|
| }
|
|
|
| #define WEIGHT_THRESHOLD ((SkFontStyle::kNormal_Weight + SkFontStyle::kBold_Weight)/2)
|
| @@ -2151,7 +2151,7 @@ static inline int sqr(int value) {
|
| static int compute_metric(const SkFontStyle& a, const SkFontStyle& b) {
|
| return sqr(a.weight() - b.weight()) +
|
| sqr((a.width() - b.width()) * 100) +
|
| - sqr((a.isItalic() != b.isItalic()) * 900);
|
| + sqr((a.slant() != b.slant()) * 900);
|
| }
|
|
|
| static SkTypeface* createFromDesc(CTFontDescriptorRef desc) {
|
|
|