OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 #ifndef SkFontStyle_DEFINED | 8 #ifndef SkFontStyle_DEFINED |
9 #define SkFontStyle_DEFINED | 9 #define SkFontStyle_DEFINED |
10 | 10 |
(...skipping 21 matching lines...) Expand all Loading... |
32 kNormal_Width = 5, | 32 kNormal_Width = 5, |
33 kSemiExpanded_Width = 6, | 33 kSemiExpanded_Width = 6, |
34 kExpanded_Width = 7, | 34 kExpanded_Width = 7, |
35 kExtraExpanded_Width = 8, | 35 kExtraExpanded_Width = 8, |
36 kUltaExpanded_Width = 9 | 36 kUltaExpanded_Width = 9 |
37 }; | 37 }; |
38 | 38 |
39 enum Slant { | 39 enum Slant { |
40 kUpright_Slant, | 40 kUpright_Slant, |
41 kItalic_Slant, | 41 kItalic_Slant, |
| 42 kOblique_Slant, |
42 }; | 43 }; |
43 | 44 |
44 SkFontStyle(); | 45 SkFontStyle(); |
45 SkFontStyle(int weight, int width, Slant); | 46 SkFontStyle(int weight, int width, Slant); |
46 | 47 |
47 static SkFontStyle FromOldStyle(unsigned oldStyle); | 48 static SkFontStyle FromOldStyle(unsigned oldStyle); |
48 | 49 |
49 bool operator==(const SkFontStyle& rhs) const { | 50 bool operator==(const SkFontStyle& rhs) const { |
50 return fUnion.fU32 == rhs.fUnion.fU32; | 51 return fUnion.fU32 == rhs.fUnion.fU32; |
51 } | 52 } |
52 | 53 |
53 int weight() const { return fUnion.fR.fWeight; } | 54 int weight() const { return fUnion.fR.fWeight; } |
54 int width() const { return fUnion.fR.fWidth; } | 55 int width() const { return fUnion.fR.fWidth; } |
55 Slant slant() const { return (Slant)fUnion.fR.fSlant; } | 56 Slant slant() const { return (Slant)fUnion.fR.fSlant; } |
56 | 57 |
57 bool isItalic() const { | |
58 return kItalic_Slant == fUnion.fR.fSlant; | |
59 } | |
60 | |
61 private: | 58 private: |
62 union { | 59 union { |
63 struct { | 60 struct { |
64 uint16_t fWeight; // 100 .. 900 | 61 uint16_t fWeight; // 100 .. 900 |
65 uint8_t fWidth; // 1 .. 9 | 62 uint8_t fWidth; // 1 .. 9 |
66 uint8_t fSlant; // 0 .. 2 | 63 uint8_t fSlant; // 0 .. 2 |
67 } fR; | 64 } fR; |
68 uint32_t fU32; | 65 uint32_t fU32; |
69 } fUnion; | 66 } fUnion; |
70 }; | 67 }; |
71 | 68 |
72 #endif | 69 #endif |
OLD | NEW |