diff options
author | 2015-08-27 07:41:13 -0700 | |
---|---|---|
committer | 2015-08-27 07:41:16 -0700 | |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /tools/test_font_index.cpp | |
parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'tools/test_font_index.cpp')
-rw-r--r-- | tools/test_font_index.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/test_font_index.cpp b/tools/test_font_index.cpp index ec135c1499..b9bc24c63f 100644 --- a/tools/test_font_index.cpp +++ b/tools/test_font_index.cpp @@ -10,51 +10,51 @@ static SkTestFontData gTestFonts[] = { { LiberationMonoNormalPoints, LiberationMonoNormalVerbs, LiberationMonoNormalCharCodes, LiberationMonoNormalCharCodesCount, LiberationMonoNormalWidths, - LiberationMonoNormalMetrics, "Toy Liberation Mono", SkTypeface::kNormal, NULL + LiberationMonoNormalMetrics, "Toy Liberation Mono", SkTypeface::kNormal, nullptr }, { LiberationMonoBoldPoints, LiberationMonoBoldVerbs, LiberationMonoBoldCharCodes, LiberationMonoBoldCharCodesCount, LiberationMonoBoldWidths, - LiberationMonoBoldMetrics, "Toy Liberation Mono", SkTypeface::kBold, NULL + LiberationMonoBoldMetrics, "Toy Liberation Mono", SkTypeface::kBold, nullptr }, { LiberationMonoItalicPoints, LiberationMonoItalicVerbs, LiberationMonoItalicCharCodes, LiberationMonoItalicCharCodesCount, LiberationMonoItalicWidths, - LiberationMonoItalicMetrics, "Toy Liberation Mono", SkTypeface::kItalic, NULL + LiberationMonoItalicMetrics, "Toy Liberation Mono", SkTypeface::kItalic, nullptr }, { LiberationMonoBoldItalicPoints, LiberationMonoBoldItalicVerbs, LiberationMonoBoldItalicCharCodes, LiberationMonoBoldItalicCharCodesCount, LiberationMonoBoldItalicWidths, - LiberationMonoBoldItalicMetrics, "Toy Liberation Mono", SkTypeface::kBoldItalic, NULL + LiberationMonoBoldItalicMetrics, "Toy Liberation Mono", SkTypeface::kBoldItalic, nullptr }, { LiberationSansNormalPoints, LiberationSansNormalVerbs, LiberationSansNormalCharCodes, LiberationSansNormalCharCodesCount, LiberationSansNormalWidths, - LiberationSansNormalMetrics, "Toy Liberation Sans", SkTypeface::kNormal, NULL + LiberationSansNormalMetrics, "Toy Liberation Sans", SkTypeface::kNormal, nullptr }, { LiberationSansBoldPoints, LiberationSansBoldVerbs, LiberationSansBoldCharCodes, LiberationSansBoldCharCodesCount, LiberationSansBoldWidths, - LiberationSansBoldMetrics, "Toy Liberation Sans", SkTypeface::kBold, NULL + LiberationSansBoldMetrics, "Toy Liberation Sans", SkTypeface::kBold, nullptr }, { LiberationSansItalicPoints, LiberationSansItalicVerbs, LiberationSansItalicCharCodes, LiberationSansItalicCharCodesCount, LiberationSansItalicWidths, - LiberationSansItalicMetrics, "Toy Liberation Sans", SkTypeface::kItalic, NULL + LiberationSansItalicMetrics, "Toy Liberation Sans", SkTypeface::kItalic, nullptr }, { LiberationSansBoldItalicPoints, LiberationSansBoldItalicVerbs, LiberationSansBoldItalicCharCodes, LiberationSansBoldItalicCharCodesCount, LiberationSansBoldItalicWidths, - LiberationSansBoldItalicMetrics, "Toy Liberation Sans", SkTypeface::kBoldItalic, NULL + LiberationSansBoldItalicMetrics, "Toy Liberation Sans", SkTypeface::kBoldItalic, nullptr }, { LiberationSerifNormalPoints, LiberationSerifNormalVerbs, LiberationSerifNormalCharCodes, LiberationSerifNormalCharCodesCount, LiberationSerifNormalWidths, - LiberationSerifNormalMetrics, "Toy Liberation Serif", SkTypeface::kNormal, NULL + LiberationSerifNormalMetrics, "Toy Liberation Serif", SkTypeface::kNormal, nullptr }, { LiberationSerifBoldPoints, LiberationSerifBoldVerbs, LiberationSerifBoldCharCodes, LiberationSerifBoldCharCodesCount, LiberationSerifBoldWidths, - LiberationSerifBoldMetrics, "Toy Liberation Serif", SkTypeface::kBold, NULL + LiberationSerifBoldMetrics, "Toy Liberation Serif", SkTypeface::kBold, nullptr }, { LiberationSerifItalicPoints, LiberationSerifItalicVerbs, LiberationSerifItalicCharCodes, LiberationSerifItalicCharCodesCount, LiberationSerifItalicWidths, - LiberationSerifItalicMetrics, "Toy Liberation Serif", SkTypeface::kItalic, NULL + LiberationSerifItalicMetrics, "Toy Liberation Serif", SkTypeface::kItalic, nullptr }, { LiberationSerifBoldItalicPoints, LiberationSerifBoldItalicVerbs, LiberationSerifBoldItalicCharCodes, LiberationSerifBoldItalicCharCodesCount, LiberationSerifBoldItalicWidths, - LiberationSerifBoldItalicMetrics, "Toy Liberation Serif", SkTypeface::kBoldItalic, NULL + LiberationSerifBoldItalicMetrics, "Toy Liberation Serif", SkTypeface::kBoldItalic, nullptr }, }; |