Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Side by Side Diff: include/core/SkFontStyle.h

Issue 2206453003: Remove 'Ulta' width. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 enum Width { 29 enum Width {
30 kUltraCondensed_Width = 1, 30 kUltraCondensed_Width = 1,
31 kExtraCondensed_Width = 2, 31 kExtraCondensed_Width = 2,
32 kCondensed_Width = 3, 32 kCondensed_Width = 3,
33 kSemiCondensed_Width = 4, 33 kSemiCondensed_Width = 4,
34 kNormal_Width = 5, 34 kNormal_Width = 5,
35 kSemiExpanded_Width = 6, 35 kSemiExpanded_Width = 6,
36 kExpanded_Width = 7, 36 kExpanded_Width = 7,
37 kExtraExpanded_Width = 8, 37 kExtraExpanded_Width = 8,
38 kUltraExpanded_Width = 9, 38 kUltraExpanded_Width = 9,
39 kUltaExpanded_Width = 9, // deprecated, typo
40 }; 39 };
41 40
42 enum Slant { 41 enum Slant {
43 kUpright_Slant, 42 kUpright_Slant,
44 kItalic_Slant, 43 kItalic_Slant,
45 kOblique_Slant, 44 kOblique_Slant,
46 }; 45 };
47 46
48 SkFontStyle(); 47 SkFontStyle();
49 SkFontStyle(int weight, int width, Slant); 48 SkFontStyle(int weight, int width, Slant);
(...skipping 13 matching lines...) Expand all
63 struct { 62 struct {
64 uint16_t fWeight; // 100 .. 900 63 uint16_t fWeight; // 100 .. 900
65 uint8_t fWidth; // 1 .. 9 64 uint8_t fWidth; // 1 .. 9
66 uint8_t fSlant; // 0 .. 2 65 uint8_t fSlant; // 0 .. 2
67 } fR; 66 } fR;
68 uint32_t fU32; 67 uint32_t fU32;
69 } fUnion; 68 } fUnion;
70 }; 69 };
71 70
72 #endif 71 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698