Index: gm/all_bitmap_configs.cpp |
diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp |
index 2fbd71de249f1b4ce2318dd7f29ea3a9db644f83..4cabf2ec9b5ae5527aac67fc65f6965a12870d2c 100644 |
--- a/gm/all_bitmap_configs.cpp |
+++ b/gm/all_bitmap_configs.cpp |
@@ -75,7 +75,7 @@ static void color_wheel_native(SkCanvas* canvas) { |
const SkScalar D = 0.3f * SkIntToScalar(SCALE); |
const SkScalar X = SkDoubleToScalar(D * sqrt_3_over_2); |
const SkScalar Y = D * SK_ScalarHalf; |
- sk_tool_utils::set_portable_typeface(&p, NULL, SkTypeface::kBold); |
+ sk_tool_utils::set_portable_typeface(&p, nullptr, SkTypeface::kBold); |
p.setTextSize(0.28125f * SCALE); |
draw_center_letter('K', &p, SK_ColorBLACK, Z, Z, canvas); |
draw_center_letter('R', &p, SK_ColorRED, Z, D, canvas); |
@@ -127,7 +127,7 @@ static SkBitmap indexed_bitmap() { |
SkAutoTUnref<SkColorTable> ctable(new SkColorTable(pmColors, SK_ARRAY_COUNT(pmColors))); |
SkImageInfo info = SkImageInfo::Make(SCALE, SCALE, kIndex_8_SkColorType, |
kPremul_SkAlphaType); |
- bm.allocPixels(info, NULL, ctable); |
+ bm.allocPixels(info, nullptr, ctable); |
SkAutoLockPixels autoLockPixels1(n32bitmap); |
SkAutoLockPixels autoLockPixels2(bm); |
for (int y = 0; y < SCALE; ++y) { |
@@ -155,7 +155,7 @@ DEF_SIMPLE_GM(all_bitmap_configs, canvas, SCALE, 6 * SCALE) { |
SkPaint p; |
p.setColor(SK_ColorBLACK); |
p.setAntiAlias(true); |
- sk_tool_utils::set_portable_typeface(&p, NULL); |
+ sk_tool_utils::set_portable_typeface(&p, nullptr); |
sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8); |