aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkFont.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/core/SkFont.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'src/core/SkFont.cpp')
-rw-r--r--src/core/SkFont.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp
index d6895a480b..c39cc185d3 100644
--- a/src/core/SkFont.cpp
+++ b/src/core/SkFont.cpp
@@ -31,13 +31,13 @@ SkFont::SkFont(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX,
SkFont* SkFont::Create(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX,
MaskType mt, uint32_t flags) {
if (size <= 0 || !SkScalarIsFinite(size)) {
- return NULL;
+ return nullptr;
}
if (scaleX <= 0 || !SkScalarIsFinite(scaleX)) {
- return NULL;
+ return nullptr;
}
if (!SkScalarIsFinite(skewX)) {
- return NULL;
+ return nullptr;
}
flags &= kAllFlags;
return new SkFont(face, size, scaleX, skewX, mt, flags);
@@ -82,7 +82,7 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
count = SkToInt(byteLength >> 1);
break;
}
- if (NULL == glyphs) {
+ if (nullptr == glyphs) {
return count;
}