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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/skpmaker.cpp ('k') | tools/test_font_index.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/test_font_data.cpp
diff --git a/tools/test_font_data.cpp b/tools/test_font_data.cpp
index 2db09b736b76dfa674d7d88bab59dbb31f23cf87..ff0aaccc117701f51bec2979ce78d8b5d4bc2c54 100644
--- a/tools/test_font_data.cpp
+++ b/tools/test_font_data.cpp
@@ -8514,59 +8514,59 @@ const SkPaint::FontMetrics TimesNewRomankBoldItalicMetrics = {
static SkTestFontData gTestFonts[] = {
{ CourierNewkNormalPoints, CourierNewkNormalVerbs, CourierNewkNormalCharCodes,
CourierNewkNormalCharCodesCount, CourierNewkNormalWidths,
- CourierNewkNormalMetrics, "Courier New", SkTypeface::kNormal, NULL
+ CourierNewkNormalMetrics, "Courier New", SkTypeface::kNormal, nullptr
},
{ CourierNewkBoldPoints, CourierNewkBoldVerbs, CourierNewkBoldCharCodes,
CourierNewkBoldCharCodesCount, CourierNewkBoldWidths,
- CourierNewkBoldMetrics, "Courier New", SkTypeface::kBold, NULL
+ CourierNewkBoldMetrics, "Courier New", SkTypeface::kBold, nullptr
},
{ CourierNewkItalicPoints, CourierNewkItalicVerbs, CourierNewkItalicCharCodes,
CourierNewkItalicCharCodesCount, CourierNewkItalicWidths,
- CourierNewkItalicMetrics, "Courier New", SkTypeface::kItalic, NULL
+ CourierNewkItalicMetrics, "Courier New", SkTypeface::kItalic, nullptr
},
{ CourierNewkBoldItalicPoints, CourierNewkBoldItalicVerbs, CourierNewkBoldItalicCharCodes,
CourierNewkBoldItalicCharCodesCount, CourierNewkBoldItalicWidths,
- CourierNewkBoldItalicMetrics, "Courier New", SkTypeface::kBoldItalic, NULL
+ CourierNewkBoldItalicMetrics, "Courier New", SkTypeface::kBoldItalic, nullptr
},
{ LiberationSanskNormalPoints, LiberationSanskNormalVerbs, LiberationSanskNormalCharCodes,
LiberationSanskNormalCharCodesCount, LiberationSanskNormalWidths,
- LiberationSanskNormalMetrics, "Liberation Sans", SkTypeface::kNormal, NULL
+ LiberationSanskNormalMetrics, "Liberation Sans", SkTypeface::kNormal, nullptr
},
{ LiberationSanskBoldPoints, LiberationSanskBoldVerbs, LiberationSanskBoldCharCodes,
LiberationSanskBoldCharCodesCount, LiberationSanskBoldWidths,
- LiberationSanskBoldMetrics, "Liberation Sans", SkTypeface::kBold, NULL
+ LiberationSanskBoldMetrics, "Liberation Sans", SkTypeface::kBold, nullptr
},
{ LiberationSanskItalicPoints, LiberationSanskItalicVerbs, LiberationSanskItalicCharCodes,
LiberationSanskItalicCharCodesCount, LiberationSanskItalicWidths,
- LiberationSanskItalicMetrics, "Liberation Sans", SkTypeface::kItalic, NULL
+ LiberationSanskItalicMetrics, "Liberation Sans", SkTypeface::kItalic, nullptr
},
{ LiberationSanskBoldItalicPoints, LiberationSanskBoldItalicVerbs, LiberationSanskBoldItalicCharCodes,
LiberationSanskBoldItalicCharCodesCount, LiberationSanskBoldItalicWidths,
- LiberationSanskBoldItalicMetrics, "Liberation Sans", SkTypeface::kBoldItalic, NULL
+ LiberationSanskBoldItalicMetrics, "Liberation Sans", SkTypeface::kBoldItalic, nullptr
},
{ HiraginoMaruGothicProkNormalPoints, HiraginoMaruGothicProkNormalVerbs, HiraginoMaruGothicProkNormalCharCodes,
HiraginoMaruGothicProkNormalCharCodesCount, HiraginoMaruGothicProkNormalWidths,
- HiraginoMaruGothicProkNormalMetrics, "Hiragino Maru Gothic Pro", SkTypeface::kNormal, NULL
+ HiraginoMaruGothicProkNormalMetrics, "Hiragino Maru Gothic Pro", SkTypeface::kNormal, nullptr
},
{ PapyruskNormalPoints, PapyruskNormalVerbs, PapyruskNormalCharCodes,
PapyruskNormalCharCodesCount, PapyruskNormalWidths,
- PapyruskNormalMetrics, "Papyrus", SkTypeface::kNormal, NULL
+ PapyruskNormalMetrics, "Papyrus", SkTypeface::kNormal, nullptr
},
{ TimesNewRomankNormalPoints, TimesNewRomankNormalVerbs, TimesNewRomankNormalCharCodes,
TimesNewRomankNormalCharCodesCount, TimesNewRomankNormalWidths,
- TimesNewRomankNormalMetrics, "Times New Roman", SkTypeface::kNormal, NULL
+ TimesNewRomankNormalMetrics, "Times New Roman", SkTypeface::kNormal, nullptr
},
{ TimesNewRomankBoldPoints, TimesNewRomankBoldVerbs, TimesNewRomankBoldCharCodes,
TimesNewRomankBoldCharCodesCount, TimesNewRomankBoldWidths,
- TimesNewRomankBoldMetrics, "Times New Roman", SkTypeface::kBold, NULL
+ TimesNewRomankBoldMetrics, "Times New Roman", SkTypeface::kBold, nullptr
},
{ TimesNewRomankItalicPoints, TimesNewRomankItalicVerbs, TimesNewRomankItalicCharCodes,
TimesNewRomankItalicCharCodesCount, TimesNewRomankItalicWidths,
- TimesNewRomankItalicMetrics, "Times New Roman", SkTypeface::kItalic, NULL
+ TimesNewRomankItalicMetrics, "Times New Roman", SkTypeface::kItalic, nullptr
},
{ TimesNewRomankBoldItalicPoints, TimesNewRomankBoldItalicVerbs, TimesNewRomankBoldItalicCharCodes,
TimesNewRomankBoldItalicCharCodesCount, TimesNewRomankBoldItalicWidths,
- TimesNewRomankBoldItalicMetrics, "Times New Roman", SkTypeface::kBoldItalic, NULL
+ TimesNewRomankBoldItalicMetrics, "Times New Roman", SkTypeface::kBoldItalic, nullptr
},
};
« 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