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

Side by Side Diff: src/ports/SkFontConfigParser_android.h

Issue 1155383002: Use SkTArray instead of SkSTArray in movable. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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 2011 The Android Open Source Project 2 * Copyright 2011 The Android Open Source Project
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 SKFONTCONFIGPARSER_ANDROID_H_ 8 #ifndef SKFONTCONFIGPARSER_ANDROID_H_
9 #define SKFONTCONFIGPARSER_ANDROID_H_ 9 #define SKFONTCONFIGPARSER_ANDROID_H_
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 SkString fFileName; 70 SkString fFileName;
71 int fIndex; 71 int fIndex;
72 int fWeight; 72 int fWeight;
73 enum class Style { kAuto, kNormal, kItalic } fStyle; 73 enum class Style { kAuto, kNormal, kItalic } fStyle;
74 struct Axis { 74 struct Axis {
75 Axis() : fTag(SkSetFourByteTag('\0','\0','\0','\0')), fValue(0) { } 75 Axis() : fTag(SkSetFourByteTag('\0','\0','\0','\0')), fValue(0) { }
76 SkFourByteTag fTag; 76 SkFourByteTag fTag;
77 SkFixed fValue; 77 SkFixed fValue;
78 }; 78 };
79 SkSTArray<4, Axis, true> fAxes; 79 SkTArray<Axis, true> fAxes;
bungeman-skia 2015/05/27 14:43:27 Note comment above that FontFileInfo must remain t
80 }; 80 };
81 81
82 /** 82 /**
83 * A font family provides one or more names for a collection of fonts, each of 83 * A font family provides one or more names for a collection of fonts, each of
84 * which has a different style (normal, italic) or weight (thin, light, bold, 84 * which has a different style (normal, italic) or weight (thin, light, bold,
85 * etc). 85 * etc).
86 * Some fonts may occur in compact variants for use in the user interface. 86 * Some fonts may occur in compact variants for use in the user interface.
87 * Android distinguishes "fallback" fonts to support non-ASCII character sets. 87 * Android distinguishes "fallback" fonts to support non-ASCII character sets.
88 */ 88 */
89 struct FontFamily { 89 struct FontFamily {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 207 }
208 if (negate) { 208 if (negate) {
209 n = -n; 209 n = -n;
210 frac = -frac; 210 frac = -frac;
211 } 211 }
212 *value = (n << N) + frac; 212 *value = (n << N) + frac;
213 return true; 213 return true;
214 } 214 }
215 215
216 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */ 216 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */
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