| 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 |
| 11 #include "SkTypes.h" | 11 #include "SkTypes.h" |
| 12 #include "SkFixed.h" |
| 12 | 13 |
| 13 class SK_API SkFontStyle { | 14 class SK_API SkFontStyle { |
| 14 public: | 15 public: |
| 15 enum Weight { | 16 enum Weight { |
| 16 kThin_Weight = 100, | 17 kThin_Weight = 100, |
| 17 kExtraLight_Weight = 200, | 18 kExtraLight_Weight = 200, |
| 18 kLight_Weight = 300, | 19 kLight_Weight = 300, |
| 19 kNormal_Weight = 400, | 20 kNormal_Weight = 400, |
| 20 kMedium_Weight = 500, | 21 kMedium_Weight = 500, |
| 21 kSemiBold_Weight = 600, | 22 kSemiBold_Weight = 600, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 struct { | 64 struct { |
| 64 uint16_t fWeight; // 100 .. 900 | 65 uint16_t fWeight; // 100 .. 900 |
| 65 uint8_t fWidth; // 1 .. 9 | 66 uint8_t fWidth; // 1 .. 9 |
| 66 uint8_t fSlant; // 0 .. 2 | 67 uint8_t fSlant; // 0 .. 2 |
| 67 } fR; | 68 } fR; |
| 68 uint32_t fU32; | 69 uint32_t fU32; |
| 69 } fUnion; | 70 } fUnion; |
| 70 }; | 71 }; |
| 71 | 72 |
| 72 #endif | 73 #endif |
| OLD | NEW |