diff options
author | halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /gm/dftext.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 'gm/dftext.cpp')
-rw-r--r-- | gm/dftext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/dftext.cpp b/gm/dftext.cpp index f6bc0b2b9c..c66e03fdc8 100644 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -81,7 +81,7 @@ protected: canvas->scale(scales[i], scales[i]); paint.setTextSize(textSizes[i]); canvas->drawText(text, textLen, 0, 0, paint); - y += paint.getFontMetrics(NULL)*scales[i]; + y += paint.getFontMetrics(nullptr)*scales[i]; } // check rotation @@ -95,7 +95,7 @@ protected: for (int ps = 6; ps <= 32; ps += 3) { paint.setTextSize(SkIntToScalar(ps)); canvas->drawText(text, textLen, rotX, rotY, paint); - rotY += paint.getFontMetrics(NULL); + rotY += paint.getFontMetrics(nullptr); } } @@ -111,7 +111,7 @@ protected: canvas->scale(scaleFactor, scaleFactor); paint.setTextSize(textSizes[i]); canvas->drawText(text, textLen, 0, 0, paint); - y += paint.getFontMetrics(NULL)*scaleFactor; + y += paint.getFontMetrics(nullptr)*scaleFactor; } // check pos text @@ -156,7 +156,7 @@ protected: paint.setColor(fg[i]); canvas->drawText(text, textLen, x, y, paint); - y += paint.getFontMetrics(NULL); + y += paint.getFontMetrics(nullptr); } paint.setColor(0xFF181C18); @@ -170,7 +170,7 @@ protected: paint.setColor(fg[i]); canvas->drawText(text, textLen, x, y, paint); - y += paint.getFontMetrics(NULL); + y += paint.getFontMetrics(nullptr); } // check skew @@ -202,7 +202,7 @@ protected: // since we prepended this matrix already, we blit using identity inputCanvas->resetMatrix(); SkImage* image = surface->newImageSnapshot(); - inputCanvas->drawImage(image, 0, 0, NULL); + inputCanvas->drawImage(image, 0, 0, nullptr); image->unref(); } #endif |