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

Side by Side Diff: tools/test_font_data.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/skpmaker.cpp ('k') | tools/test_font_index.cpp » ('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 2014 Google Inc. 2 * Copyright 2014 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 const SkScalar CourierNewkNormalPoints[] = { 10 const SkScalar CourierNewkNormalPoints[] = {
(...skipping 8496 matching lines...) Expand 10 before | Expand all | Expand 10 after
8507 const int TimesNewRomankBoldItalicCharCodesCount = (int) SK_ARRAY_COUNT(TimesNew RomankBoldItalicCharCodes); 8507 const int TimesNewRomankBoldItalicCharCodesCount = (int) SK_ARRAY_COUNT(TimesNew RomankBoldItalicCharCodes);
8508 8508
8509 const SkPaint::FontMetrics TimesNewRomankBoldItalicMetrics = { 8509 const SkPaint::FontMetrics TimesNewRomankBoldItalicMetrics = {
8510 0x3436342f, -1.03223f, -0.891113f, 0.216309f, 0.306641f, 0.0424805f, 1.94824f, 7 .98734e-16f, 8510 0x3436342f, -1.03223f, -0.891113f, 0.216309f, 0.306641f, 0.0424805f, 1.94824f, 7 .98734e-16f,
8511 -0.547363f, 1.40088f, 0.466309f, 9.77694e-15f, 0.0952148f, 0.108887f 8511 -0.547363f, 1.40088f, 0.466309f, 9.77694e-15f, 0.0952148f, 0.108887f
8512 }; 8512 };
8513 8513
8514 static SkTestFontData gTestFonts[] = { 8514 static SkTestFontData gTestFonts[] = {
8515 { CourierNewkNormalPoints, CourierNewkNormalVerbs, CourierNewkNormalCharC odes, 8515 { CourierNewkNormalPoints, CourierNewkNormalVerbs, CourierNewkNormalCharC odes,
8516 CourierNewkNormalCharCodesCount, CourierNewkNormalWidths, 8516 CourierNewkNormalCharCodesCount, CourierNewkNormalWidths,
8517 CourierNewkNormalMetrics, "Courier New", SkTypeface::kNormal, NULL 8517 CourierNewkNormalMetrics, "Courier New", SkTypeface::kNormal, nullptr
8518 }, 8518 },
8519 { CourierNewkBoldPoints, CourierNewkBoldVerbs, CourierNewkBoldCharCodes, 8519 { CourierNewkBoldPoints, CourierNewkBoldVerbs, CourierNewkBoldCharCodes,
8520 CourierNewkBoldCharCodesCount, CourierNewkBoldWidths, 8520 CourierNewkBoldCharCodesCount, CourierNewkBoldWidths,
8521 CourierNewkBoldMetrics, "Courier New", SkTypeface::kBold, NULL 8521 CourierNewkBoldMetrics, "Courier New", SkTypeface::kBold, nullptr
8522 }, 8522 },
8523 { CourierNewkItalicPoints, CourierNewkItalicVerbs, CourierNewkItalicCharC odes, 8523 { CourierNewkItalicPoints, CourierNewkItalicVerbs, CourierNewkItalicCharC odes,
8524 CourierNewkItalicCharCodesCount, CourierNewkItalicWidths, 8524 CourierNewkItalicCharCodesCount, CourierNewkItalicWidths,
8525 CourierNewkItalicMetrics, "Courier New", SkTypeface::kItalic, NULL 8525 CourierNewkItalicMetrics, "Courier New", SkTypeface::kItalic, nullptr
8526 }, 8526 },
8527 { CourierNewkBoldItalicPoints, CourierNewkBoldItalicVerbs, CourierNewkBol dItalicCharCodes, 8527 { CourierNewkBoldItalicPoints, CourierNewkBoldItalicVerbs, CourierNewkBol dItalicCharCodes,
8528 CourierNewkBoldItalicCharCodesCount, CourierNewkBoldItalicWidths, 8528 CourierNewkBoldItalicCharCodesCount, CourierNewkBoldItalicWidths,
8529 CourierNewkBoldItalicMetrics, "Courier New", SkTypeface::kBoldItalic, N ULL 8529 CourierNewkBoldItalicMetrics, "Courier New", SkTypeface::kBoldItalic, n ullptr
8530 }, 8530 },
8531 { LiberationSanskNormalPoints, LiberationSanskNormalVerbs, LiberationSans kNormalCharCodes, 8531 { LiberationSanskNormalPoints, LiberationSanskNormalVerbs, LiberationSans kNormalCharCodes,
8532 LiberationSanskNormalCharCodesCount, LiberationSanskNormalWidths, 8532 LiberationSanskNormalCharCodesCount, LiberationSanskNormalWidths,
8533 LiberationSanskNormalMetrics, "Liberation Sans", SkTypeface::kNormal, N ULL 8533 LiberationSanskNormalMetrics, "Liberation Sans", SkTypeface::kNormal, n ullptr
8534 }, 8534 },
8535 { LiberationSanskBoldPoints, LiberationSanskBoldVerbs, LiberationSanskBol dCharCodes, 8535 { LiberationSanskBoldPoints, LiberationSanskBoldVerbs, LiberationSanskBol dCharCodes,
8536 LiberationSanskBoldCharCodesCount, LiberationSanskBoldWidths, 8536 LiberationSanskBoldCharCodesCount, LiberationSanskBoldWidths,
8537 LiberationSanskBoldMetrics, "Liberation Sans", SkTypeface::kBold, NULL 8537 LiberationSanskBoldMetrics, "Liberation Sans", SkTypeface::kBold, nullp tr
8538 }, 8538 },
8539 { LiberationSanskItalicPoints, LiberationSanskItalicVerbs, LiberationSans kItalicCharCodes, 8539 { LiberationSanskItalicPoints, LiberationSanskItalicVerbs, LiberationSans kItalicCharCodes,
8540 LiberationSanskItalicCharCodesCount, LiberationSanskItalicWidths, 8540 LiberationSanskItalicCharCodesCount, LiberationSanskItalicWidths,
8541 LiberationSanskItalicMetrics, "Liberation Sans", SkTypeface::kItalic, N ULL 8541 LiberationSanskItalicMetrics, "Liberation Sans", SkTypeface::kItalic, n ullptr
8542 }, 8542 },
8543 { LiberationSanskBoldItalicPoints, LiberationSanskBoldItalicVerbs, Libera tionSanskBoldItalicCharCodes, 8543 { LiberationSanskBoldItalicPoints, LiberationSanskBoldItalicVerbs, Libera tionSanskBoldItalicCharCodes,
8544 LiberationSanskBoldItalicCharCodesCount, LiberationSanskBoldItalicWidth s, 8544 LiberationSanskBoldItalicCharCodesCount, LiberationSanskBoldItalicWidth s,
8545 LiberationSanskBoldItalicMetrics, "Liberation Sans", SkTypeface::kBoldI talic, NULL 8545 LiberationSanskBoldItalicMetrics, "Liberation Sans", SkTypeface::kBoldI talic, nullptr
8546 }, 8546 },
8547 { HiraginoMaruGothicProkNormalPoints, HiraginoMaruGothicProkNormalVerbs, HiraginoMaruGothicProkNormalCharCodes, 8547 { HiraginoMaruGothicProkNormalPoints, HiraginoMaruGothicProkNormalVerbs, HiraginoMaruGothicProkNormalCharCodes,
8548 HiraginoMaruGothicProkNormalCharCodesCount, HiraginoMaruGothicProkNorma lWidths, 8548 HiraginoMaruGothicProkNormalCharCodesCount, HiraginoMaruGothicProkNorma lWidths,
8549 HiraginoMaruGothicProkNormalMetrics, "Hiragino Maru Gothic Pro", SkType face::kNormal, NULL 8549 HiraginoMaruGothicProkNormalMetrics, "Hiragino Maru Gothic Pro", SkType face::kNormal, nullptr
8550 }, 8550 },
8551 { PapyruskNormalPoints, PapyruskNormalVerbs, PapyruskNormalCharCodes, 8551 { PapyruskNormalPoints, PapyruskNormalVerbs, PapyruskNormalCharCodes,
8552 PapyruskNormalCharCodesCount, PapyruskNormalWidths, 8552 PapyruskNormalCharCodesCount, PapyruskNormalWidths,
8553 PapyruskNormalMetrics, "Papyrus", SkTypeface::kNormal, NULL 8553 PapyruskNormalMetrics, "Papyrus", SkTypeface::kNormal, nullptr
8554 }, 8554 },
8555 { TimesNewRomankNormalPoints, TimesNewRomankNormalVerbs, TimesNewRomankNo rmalCharCodes, 8555 { TimesNewRomankNormalPoints, TimesNewRomankNormalVerbs, TimesNewRomankNo rmalCharCodes,
8556 TimesNewRomankNormalCharCodesCount, TimesNewRomankNormalWidths, 8556 TimesNewRomankNormalCharCodesCount, TimesNewRomankNormalWidths,
8557 TimesNewRomankNormalMetrics, "Times New Roman", SkTypeface::kNormal, NU LL 8557 TimesNewRomankNormalMetrics, "Times New Roman", SkTypeface::kNormal, nu llptr
8558 }, 8558 },
8559 { TimesNewRomankBoldPoints, TimesNewRomankBoldVerbs, TimesNewRomankBoldCh arCodes, 8559 { TimesNewRomankBoldPoints, TimesNewRomankBoldVerbs, TimesNewRomankBoldCh arCodes,
8560 TimesNewRomankBoldCharCodesCount, TimesNewRomankBoldWidths, 8560 TimesNewRomankBoldCharCodesCount, TimesNewRomankBoldWidths,
8561 TimesNewRomankBoldMetrics, "Times New Roman", SkTypeface::kBold, NULL 8561 TimesNewRomankBoldMetrics, "Times New Roman", SkTypeface::kBold, nullpt r
8562 }, 8562 },
8563 { TimesNewRomankItalicPoints, TimesNewRomankItalicVerbs, TimesNewRomankIt alicCharCodes, 8563 { TimesNewRomankItalicPoints, TimesNewRomankItalicVerbs, TimesNewRomankIt alicCharCodes,
8564 TimesNewRomankItalicCharCodesCount, TimesNewRomankItalicWidths, 8564 TimesNewRomankItalicCharCodesCount, TimesNewRomankItalicWidths,
8565 TimesNewRomankItalicMetrics, "Times New Roman", SkTypeface::kItalic, NU LL 8565 TimesNewRomankItalicMetrics, "Times New Roman", SkTypeface::kItalic, nu llptr
8566 }, 8566 },
8567 { TimesNewRomankBoldItalicPoints, TimesNewRomankBoldItalicVerbs, TimesNew RomankBoldItalicCharCodes, 8567 { TimesNewRomankBoldItalicPoints, TimesNewRomankBoldItalicVerbs, TimesNew RomankBoldItalicCharCodes,
8568 TimesNewRomankBoldItalicCharCodesCount, TimesNewRomankBoldItalicWidths, 8568 TimesNewRomankBoldItalicCharCodesCount, TimesNewRomankBoldItalicWidths,
8569 TimesNewRomankBoldItalicMetrics, "Times New Roman", SkTypeface::kBoldIt alic, NULL 8569 TimesNewRomankBoldItalicMetrics, "Times New Roman", SkTypeface::kBoldIt alic, nullptr
8570 }, 8570 },
8571 }; 8571 };
8572 8572
8573 const int gTestFontsCount = (int) SK_ARRAY_COUNT(gTestFonts); 8573 const int gTestFontsCount = (int) SK_ARRAY_COUNT(gTestFonts);
8574 8574
8575 struct SubFont { 8575 struct SubFont {
8576 const char* fName; 8576 const char* fName;
8577 SkTypeface::Style fStyle; 8577 SkTypeface::Style fStyle;
8578 SkTestFontData& fFont; 8578 SkTestFontData& fFont;
8579 const char* fFile; 8579 const char* fFile;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
8613 { "Times New Roman", SkTypeface::kNormal, gTestFonts[10], "Times New Roman.t tf"}, 8613 { "Times New Roman", SkTypeface::kNormal, gTestFonts[10], "Times New Roman.t tf"},
8614 { "Times New Roman", SkTypeface::kBold, gTestFonts[11], "Times New Roman Bol d.ttf"}, 8614 { "Times New Roman", SkTypeface::kBold, gTestFonts[11], "Times New Roman Bol d.ttf"},
8615 { "Times New Roman", SkTypeface::kItalic, gTestFonts[12], "Times New Roman I talic.ttf"}, 8615 { "Times New Roman", SkTypeface::kItalic, gTestFonts[12], "Times New Roman I talic.ttf"},
8616 { "Times New Roman", SkTypeface::kBoldItalic, gTestFonts[13], "Times New Rom an Bold Italic.ttf"}, 8616 { "Times New Roman", SkTypeface::kBoldItalic, gTestFonts[13], "Times New Rom an Bold Italic.ttf"},
8617 { "Times Roman", SkTypeface::kNormal, gTestFonts[4], "LiberationSans-Regular .ttf"}, 8617 { "Times Roman", SkTypeface::kNormal, gTestFonts[4], "LiberationSans-Regular .ttf"},
8618 }; 8618 };
8619 8619
8620 const int gSubFontsCount = (int) SK_ARRAY_COUNT(gSubFonts); 8620 const int gSubFontsCount = (int) SK_ARRAY_COUNT(gSubFonts);
8621 8621
8622 const int gDefaultFontIndex = 12; 8622 const int gDefaultFontIndex = 12;
OLDNEW
« no previous file with comments | « tools/skpmaker.cpp ('k') | tools/test_font_index.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698