OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "SkFontStyle.h" | 8 #include "SkFontStyle.h" |
9 #include "SkTypeface.h" | 9 #include "SkTypeface.h" |
10 #include "SkTypes.h" | 10 #include "SkTypes.h" |
11 | 11 |
12 SkFontStyle::SkFontStyle() { | 12 SkFontStyle::SkFontStyle() { |
13 fUnion.fU32 = 0; | 13 fUnion.fU32 = 0; |
14 fUnion.fR.fWeight = kNormal_Weight; | 14 fUnion.fR.fWeight = kNormal_Weight; |
15 fUnion.fR.fWidth = kNormal_Width; | 15 fUnion.fR.fWidth = kNormal_Width; |
16 fUnion.fR.fSlant = kUpright_Slant; | 16 fUnion.fR.fSlant = kUpright_Slant; |
17 } | 17 } |
18 | 18 |
19 SkFontStyle::SkFontStyle(int weight, int width, Slant slant) { | 19 SkFontStyle::SkFontStyle(int weight, int width, Slant slant) { |
20 fUnion.fU32 = 0; | 20 fUnion.fU32 = 0; |
21 fUnion.fR.fWeight = SkPin32(weight, kThin_Weight, kBlack_Weight); | 21 fUnion.fR.fWeight = SkTPin<int>(weight, kThin_Weight, kBlack_Weight); |
22 fUnion.fR.fWidth = SkPin32(width, kUltraCondensed_Width, kUltaExpanded_Width
); | 22 fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltaExpanded_W
idth); |
23 fUnion.fR.fSlant = SkPin32(slant, kUpright_Slant, kItalic_Slant); | 23 fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kItalic_Slant); |
24 } | 24 } |
25 | 25 |
26 SkFontStyle::SkFontStyle(unsigned oldStyle) { | 26 SkFontStyle::SkFontStyle(unsigned oldStyle) { |
27 fUnion.fU32 = 0; | 27 fUnion.fU32 = 0; |
28 fUnion.fR.fWeight = (oldStyle & SkTypeface::kBold) ? SkFontStyle::kBold_Weig
ht | 28 fUnion.fR.fWeight = (oldStyle & SkTypeface::kBold) ? SkFontStyle::kBold_Weig
ht |
29 : SkFontStyle::kNormal_We
ight; | 29 : SkFontStyle::kNormal_We
ight; |
30 fUnion.fR.fWidth = SkFontStyle::kNormal_Width; | 30 fUnion.fR.fWidth = SkFontStyle::kNormal_Width; |
31 fUnion.fR.fSlant = (oldStyle & SkTypeface::kItalic) ? SkFontStyle::kItalic_S
lant | 31 fUnion.fR.fSlant = (oldStyle & SkTypeface::kItalic) ? SkFontStyle::kItalic_S
lant |
32 : SkFontStyle::kUpright_
Slant; | 32 : SkFontStyle::kUpright_
Slant; |
33 } | 33 } |
OLD | NEW |