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

Side by Side Diff: tools/test_font_index.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « tools/test_font_data.cpp ('k') | tools/timer/Timer.h » ('j') | 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 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 // Auto-generated by create_test_font.cpp 8 // Auto-generated by create_test_font.cpp
9 9
10 static SkTestFontData gTestFonts[] = { 10 static SkTestFontData gTestFonts[] = {
11 { LiberationMonoNormalPoints, LiberationMonoNormalVerbs, LiberationMonoNo rmalCharCodes, 11 { LiberationMonoNormalPoints, LiberationMonoNormalVerbs, LiberationMonoNo rmalCharCodes,
12 LiberationMonoNormalCharCodesCount, LiberationMonoNormalWidths, 12 LiberationMonoNormalCharCodesCount, LiberationMonoNormalWidths,
13 LiberationMonoNormalMetrics, "Toy Liberation Mono", SkTypeface::kNormal , NULL 13 LiberationMonoNormalMetrics, "Toy Liberation Mono", SkTypeface::kNormal , nullptr
14 }, 14 },
15 { LiberationMonoBoldPoints, LiberationMonoBoldVerbs, LiberationMonoBoldCh arCodes, 15 { LiberationMonoBoldPoints, LiberationMonoBoldVerbs, LiberationMonoBoldCh arCodes,
16 LiberationMonoBoldCharCodesCount, LiberationMonoBoldWidths, 16 LiberationMonoBoldCharCodesCount, LiberationMonoBoldWidths,
17 LiberationMonoBoldMetrics, "Toy Liberation Mono", SkTypeface::kBold, NU LL 17 LiberationMonoBoldMetrics, "Toy Liberation Mono", SkTypeface::kBold, nu llptr
18 }, 18 },
19 { LiberationMonoItalicPoints, LiberationMonoItalicVerbs, LiberationMonoIt alicCharCodes, 19 { LiberationMonoItalicPoints, LiberationMonoItalicVerbs, LiberationMonoIt alicCharCodes,
20 LiberationMonoItalicCharCodesCount, LiberationMonoItalicWidths, 20 LiberationMonoItalicCharCodesCount, LiberationMonoItalicWidths,
21 LiberationMonoItalicMetrics, "Toy Liberation Mono", SkTypeface::kItalic , NULL 21 LiberationMonoItalicMetrics, "Toy Liberation Mono", SkTypeface::kItalic , nullptr
22 }, 22 },
23 { LiberationMonoBoldItalicPoints, LiberationMonoBoldItalicVerbs, Liberati onMonoBoldItalicCharCodes, 23 { LiberationMonoBoldItalicPoints, LiberationMonoBoldItalicVerbs, Liberati onMonoBoldItalicCharCodes,
24 LiberationMonoBoldItalicCharCodesCount, LiberationMonoBoldItalicWidths, 24 LiberationMonoBoldItalicCharCodesCount, LiberationMonoBoldItalicWidths,
25 LiberationMonoBoldItalicMetrics, "Toy Liberation Mono", SkTypeface::kBo ldItalic, NULL 25 LiberationMonoBoldItalicMetrics, "Toy Liberation Mono", SkTypeface::kBo ldItalic, nullptr
26 }, 26 },
27 { LiberationSansNormalPoints, LiberationSansNormalVerbs, LiberationSansNo rmalCharCodes, 27 { LiberationSansNormalPoints, LiberationSansNormalVerbs, LiberationSansNo rmalCharCodes,
28 LiberationSansNormalCharCodesCount, LiberationSansNormalWidths, 28 LiberationSansNormalCharCodesCount, LiberationSansNormalWidths,
29 LiberationSansNormalMetrics, "Toy Liberation Sans", SkTypeface::kNormal , NULL 29 LiberationSansNormalMetrics, "Toy Liberation Sans", SkTypeface::kNormal , nullptr
30 }, 30 },
31 { LiberationSansBoldPoints, LiberationSansBoldVerbs, LiberationSansBoldCh arCodes, 31 { LiberationSansBoldPoints, LiberationSansBoldVerbs, LiberationSansBoldCh arCodes,
32 LiberationSansBoldCharCodesCount, LiberationSansBoldWidths, 32 LiberationSansBoldCharCodesCount, LiberationSansBoldWidths,
33 LiberationSansBoldMetrics, "Toy Liberation Sans", SkTypeface::kBold, NU LL 33 LiberationSansBoldMetrics, "Toy Liberation Sans", SkTypeface::kBold, nu llptr
34 }, 34 },
35 { LiberationSansItalicPoints, LiberationSansItalicVerbs, LiberationSansIt alicCharCodes, 35 { LiberationSansItalicPoints, LiberationSansItalicVerbs, LiberationSansIt alicCharCodes,
36 LiberationSansItalicCharCodesCount, LiberationSansItalicWidths, 36 LiberationSansItalicCharCodesCount, LiberationSansItalicWidths,
37 LiberationSansItalicMetrics, "Toy Liberation Sans", SkTypeface::kItalic , NULL 37 LiberationSansItalicMetrics, "Toy Liberation Sans", SkTypeface::kItalic , nullptr
38 }, 38 },
39 { LiberationSansBoldItalicPoints, LiberationSansBoldItalicVerbs, Liberati onSansBoldItalicCharCodes, 39 { LiberationSansBoldItalicPoints, LiberationSansBoldItalicVerbs, Liberati onSansBoldItalicCharCodes,
40 LiberationSansBoldItalicCharCodesCount, LiberationSansBoldItalicWidths, 40 LiberationSansBoldItalicCharCodesCount, LiberationSansBoldItalicWidths,
41 LiberationSansBoldItalicMetrics, "Toy Liberation Sans", SkTypeface::kBo ldItalic, NULL 41 LiberationSansBoldItalicMetrics, "Toy Liberation Sans", SkTypeface::kBo ldItalic, nullptr
42 }, 42 },
43 { LiberationSerifNormalPoints, LiberationSerifNormalVerbs, LiberationSeri fNormalCharCodes, 43 { LiberationSerifNormalPoints, LiberationSerifNormalVerbs, LiberationSeri fNormalCharCodes,
44 LiberationSerifNormalCharCodesCount, LiberationSerifNormalWidths, 44 LiberationSerifNormalCharCodesCount, LiberationSerifNormalWidths,
45 LiberationSerifNormalMetrics, "Toy Liberation Serif", SkTypeface::kNorm al, NULL 45 LiberationSerifNormalMetrics, "Toy Liberation Serif", SkTypeface::kNorm al, nullptr
46 }, 46 },
47 { LiberationSerifBoldPoints, LiberationSerifBoldVerbs, LiberationSerifBol dCharCodes, 47 { LiberationSerifBoldPoints, LiberationSerifBoldVerbs, LiberationSerifBol dCharCodes,
48 LiberationSerifBoldCharCodesCount, LiberationSerifBoldWidths, 48 LiberationSerifBoldCharCodesCount, LiberationSerifBoldWidths,
49 LiberationSerifBoldMetrics, "Toy Liberation Serif", SkTypeface::kBold, NULL 49 LiberationSerifBoldMetrics, "Toy Liberation Serif", SkTypeface::kBold, nullptr
50 }, 50 },
51 { LiberationSerifItalicPoints, LiberationSerifItalicVerbs, LiberationSeri fItalicCharCodes, 51 { LiberationSerifItalicPoints, LiberationSerifItalicVerbs, LiberationSeri fItalicCharCodes,
52 LiberationSerifItalicCharCodesCount, LiberationSerifItalicWidths, 52 LiberationSerifItalicCharCodesCount, LiberationSerifItalicWidths,
53 LiberationSerifItalicMetrics, "Toy Liberation Serif", SkTypeface::kItal ic, NULL 53 LiberationSerifItalicMetrics, "Toy Liberation Serif", SkTypeface::kItal ic, nullptr
54 }, 54 },
55 { LiberationSerifBoldItalicPoints, LiberationSerifBoldItalicVerbs, Libera tionSerifBoldItalicCharCodes, 55 { LiberationSerifBoldItalicPoints, LiberationSerifBoldItalicVerbs, Libera tionSerifBoldItalicCharCodes,
56 LiberationSerifBoldItalicCharCodesCount, LiberationSerifBoldItalicWidth s, 56 LiberationSerifBoldItalicCharCodesCount, LiberationSerifBoldItalicWidth s,
57 LiberationSerifBoldItalicMetrics, "Toy Liberation Serif", SkTypeface::k BoldItalic, NULL 57 LiberationSerifBoldItalicMetrics, "Toy Liberation Serif", SkTypeface::k BoldItalic, nullptr
58 }, 58 },
59 }; 59 };
60 60
61 const int gTestFontsCount = (int) SK_ARRAY_COUNT(gTestFonts); 61 const int gTestFontsCount = (int) SK_ARRAY_COUNT(gTestFonts);
62 62
63 struct SubFont { 63 struct SubFont {
64 const char* fName; 64 const char* fName;
65 SkTypeface::Style fStyle; 65 SkTypeface::Style fStyle;
66 SkTestFontData& fFont; 66 SkTestFontData& fFont;
67 const char* fFile; 67 const char* fFile;
(...skipping 22 matching lines...) Expand all
90 { "Toy Liberation Sans", SkTypeface::kBoldItalic, gTestFonts[7], "Liberation Sans-BoldItalic.ttf" }, 90 { "Toy Liberation Sans", SkTypeface::kBoldItalic, gTestFonts[7], "Liberation Sans-BoldItalic.ttf" },
91 { "Toy Liberation Serif", SkTypeface::kNormal, gTestFonts[8], "LiberationSer if-Regular.ttf" }, 91 { "Toy Liberation Serif", SkTypeface::kNormal, gTestFonts[8], "LiberationSer if-Regular.ttf" },
92 { "Toy Liberation Serif", SkTypeface::kBold, gTestFonts[9], "LiberationSerif -Bold.ttf" }, 92 { "Toy Liberation Serif", SkTypeface::kBold, gTestFonts[9], "LiberationSerif -Bold.ttf" },
93 { "Toy Liberation Serif", SkTypeface::kItalic, gTestFonts[10], "LiberationSe rif-Italic.ttf" }, 93 { "Toy Liberation Serif", SkTypeface::kItalic, gTestFonts[10], "LiberationSe rif-Italic.ttf" },
94 { "Toy Liberation Serif", SkTypeface::kBoldItalic, gTestFonts[11], "Liberati onSerif-BoldItalic.ttf" }, 94 { "Toy Liberation Serif", SkTypeface::kBoldItalic, gTestFonts[11], "Liberati onSerif-BoldItalic.ttf" },
95 }; 95 };
96 96
97 const int gSubFontsCount = (int) SK_ARRAY_COUNT(gSubFonts); 97 const int gSubFontsCount = (int) SK_ARRAY_COUNT(gSubFonts);
98 98
99 const int gDefaultFontIndex = 4; 99 const int gDefaultFontIndex = 4;
OLDNEW
« no previous file with comments | « tools/test_font_data.cpp ('k') | tools/timer/Timer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698