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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: tools/test_font_index.cpp

Issue 1818043002: SkTypeface::MakeFromName to take SkFontStyle. (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Android fix + nit fix Created 4 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 | « tools/sk_tool_utils_font.cpp ('k') | 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 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[] = {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, nullptr 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 SkFontStyle fStyle;
66 SkTestFontData& fFont; 66 SkTestFontData& fFont;
67 const char* fFile; 67 const char* fFile;
68 }; 68 };
69 69
70 const SubFont gSubFonts[] = { 70 const SubFont gSubFonts[] = {
71 { "monospace", SkTypeface::kNormal, gTestFonts[0], "LiberationMono-Regular.t tf" }, 71 { "monospace", SkFontStyle(), gTestFonts[0], "LiberationMono-Regular.ttf" },
72 { "monospace", SkTypeface::kBold, gTestFonts[1], "LiberationMono-Bold.ttf" } , 72 { "monospace", SkFontStyle::FromOldStyle(SkTypeface::kBold), gTestFonts[1], "LiberationMono-Bold.ttf" },
73 { "monospace", SkTypeface::kItalic, gTestFonts[2], "LiberationMono-Italic.tt f" }, 73 { "monospace", SkFontStyle::FromOldStyle(SkTypeface::kItalic), gTestFonts[2] , "LiberationMono-Italic.ttf" },
74 { "monospace", SkTypeface::kBoldItalic, gTestFonts[3], "LiberationMono-BoldI talic.ttf" }, 74 { "monospace", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic), gTestFont s[3], "LiberationMono-BoldItalic.ttf" },
75 { "sans-serif", SkTypeface::kNormal, gTestFonts[4], "LiberationSans-Regular. ttf" }, 75 { "sans-serif", SkFontStyle(), gTestFonts[4], "LiberationSans-Regular.ttf" } ,
76 { "sans-serif", SkTypeface::kBold, gTestFonts[5], "LiberationSans-Bold.ttf" }, 76 { "sans-serif", SkFontStyle::FromOldStyle(SkTypeface::kBold), gTestFonts[5], "LiberationSans-Bold.ttf" },
77 { "sans-serif", SkTypeface::kItalic, gTestFonts[6], "LiberationSans-Italic.t tf" }, 77 { "sans-serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic), gTestFonts[6 ], "LiberationSans-Italic.ttf" },
78 { "sans-serif", SkTypeface::kBoldItalic, gTestFonts[7], "LiberationSans-Bold Italic.ttf" }, 78 { "sans-serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic), gTestFon ts[7], "LiberationSans-BoldItalic.ttf" },
79 { "serif", SkTypeface::kNormal, gTestFonts[8], "LiberationSerif-Regular.ttf" }, 79 { "serif", SkFontStyle(), gTestFonts[8], "LiberationSerif-Regular.ttf" },
80 { "serif", SkTypeface::kBold, gTestFonts[9], "LiberationSerif-Bold.ttf" }, 80 { "serif", SkFontStyle::FromOldStyle(SkTypeface::kBold), gTestFonts[9], "Lib erationSerif-Bold.ttf" },
81 { "serif", SkTypeface::kItalic, gTestFonts[10], "LiberationSerif-Italic.ttf" }, 81 { "serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic), gTestFonts[10], " LiberationSerif-Italic.ttf" },
82 { "serif", SkTypeface::kBoldItalic, gTestFonts[11], "LiberationSerif-BoldIta lic.ttf" }, 82 { "serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic), gTestFonts[11 ], "LiberationSerif-BoldItalic.ttf" },
83 { "Toy Liberation Mono", SkTypeface::kNormal, gTestFonts[0], "LiberationMono -Regular.ttf" }, 83 { "Toy Liberation Mono", SkFontStyle(), gTestFonts[0], "LiberationMono-Regul ar.ttf" },
84 { "Toy Liberation Mono", SkTypeface::kBold, gTestFonts[1], "LiberationMono-B old.ttf" }, 84 { "Toy Liberation Mono", SkFontStyle::FromOldStyle(SkTypeface::kBold), gTest Fonts[1], "LiberationMono-Bold.ttf" },
85 { "Toy Liberation Mono", SkTypeface::kItalic, gTestFonts[2], "LiberationMono -Italic.ttf" }, 85 { "Toy Liberation Mono", SkFontStyle::FromOldStyle(SkTypeface::kItalic), gTe stFonts[2], "LiberationMono-Italic.ttf" },
86 { "Toy Liberation Mono", SkTypeface::kBoldItalic, gTestFonts[3], "Liberation Mono-BoldItalic.ttf" }, 86 { "Toy Liberation Mono", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic), gTestFonts[3], "LiberationMono-BoldItalic.ttf" },
87 { "Toy Liberation Sans", SkTypeface::kNormal, gTestFonts[4], "LiberationSans -Regular.ttf" }, 87 { "Toy Liberation Sans", SkFontStyle(), gTestFonts[4], "LiberationSans-Regul ar.ttf" },
88 { "Toy Liberation Sans", SkTypeface::kBold, gTestFonts[5], "LiberationSans-B old.ttf" }, 88 { "Toy Liberation Sans", SkFontStyle::FromOldStyle(SkTypeface::kBold), gTest Fonts[5], "LiberationSans-Bold.ttf" },
89 { "Toy Liberation Sans", SkTypeface::kItalic, gTestFonts[6], "LiberationSans -Italic.ttf" }, 89 { "Toy Liberation Sans", SkFontStyle::FromOldStyle(SkTypeface::kItalic), gTe stFonts[6], "LiberationSans-Italic.ttf" },
90 { "Toy Liberation Sans", SkTypeface::kBoldItalic, gTestFonts[7], "Liberation Sans-BoldItalic.ttf" }, 90 { "Toy Liberation Sans", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic), gTestFonts[7], "LiberationSans-BoldItalic.ttf" },
91 { "Toy Liberation Serif", SkTypeface::kNormal, gTestFonts[8], "LiberationSer if-Regular.ttf" }, 91 { "Toy Liberation Serif", SkFontStyle(), gTestFonts[8], "LiberationSerif-Reg ular.ttf" },
92 { "Toy Liberation Serif", SkTypeface::kBold, gTestFonts[9], "LiberationSerif -Bold.ttf" }, 92 { "Toy Liberation Serif", SkFontStyle::FromOldStyle(SkTypeface::kBold), gTes tFonts[9], "LiberationSerif-Bold.ttf" },
93 { "Toy Liberation Serif", SkTypeface::kItalic, gTestFonts[10], "LiberationSe rif-Italic.ttf" }, 93 { "Toy Liberation Serif", SkFontStyle::FromOldStyle(SkTypeface::kItalic), gT estFonts[10], "LiberationSerif-Italic.ttf" },
94 { "Toy Liberation Serif", SkTypeface::kBoldItalic, gTestFonts[11], "Liberati onSerif-BoldItalic.ttf" }, 94 { "Toy Liberation Serif", SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic) , gTestFonts[11], "LiberationSerif-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/sk_tool_utils_font.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698