Index: src/core/SkFontStyle.cpp |
diff --git a/src/core/SkFontStyle.cpp b/src/core/SkFontStyle.cpp |
index badf9d7a9d88ba959e5af42ce705da3ee07a009a..c28e7213377c8ea451a00db2ab41fb0d175de609 100644 |
--- a/src/core/SkFontStyle.cpp |
+++ b/src/core/SkFontStyle.cpp |
@@ -23,11 +23,10 @@ SkFontStyle::SkFontStyle(int weight, int width, Slant slant) { |
fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kItalic_Slant); |
} |
-SkFontStyle::SkFontStyle(unsigned oldStyle) { |
- fUnion.fU32 = 0; |
- fUnion.fR.fWeight = (oldStyle & SkTypeface::kBold) ? SkFontStyle::kBold_Weight |
- : SkFontStyle::kNormal_Weight; |
- fUnion.fR.fWidth = SkFontStyle::kNormal_Width; |
- fUnion.fR.fSlant = (oldStyle & SkTypeface::kItalic) ? SkFontStyle::kItalic_Slant |
- : SkFontStyle::kUpright_Slant; |
+/*static*/SkFontStyle SkFontStyle::FromOldStyle(unsigned oldStyle) { |
+ return SkFontStyle((oldStyle & SkTypeface::kBold) ? SkFontStyle::kBold_Weight |
+ : SkFontStyle::kNormal_Weight, |
+ SkFontStyle::kNormal_Width, |
+ (oldStyle & SkTypeface::kItalic) ? SkFontStyle::kItalic_Slant |
+ : SkFontStyle::kUpright_Slant); |
} |