Index: src/gpu/GrTextContext.cpp |
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp |
index 387b7ebc6a4e28ab4c6fb8b9c0909df00dc90a51..bae8a72fb27e25ea626d7b2db9bec53a7ea26363 100644 |
--- a/src/gpu/GrTextContext.cpp |
+++ b/src/gpu/GrTextContext.cpp |
@@ -22,7 +22,7 @@ |
GrTextContext::GrTextContext(GrContext* context, GrDrawContext* drawContext, |
const SkSurfaceProps& surfaceProps) |
- : fFallbackTextContext(NULL) |
+ : fFallbackTextContext(nullptr) |
, fContext(context) |
, fSurfaceProps(surfaceProps) |
, fDrawContext(drawContext) { |
@@ -200,10 +200,10 @@ void GrTextContext::drawPosTextAsPath(GrRenderTarget* rt, |
// Temporarily jam in kFill, so we only ever ask for the raw outline from the cache. |
paint.setStyle(SkPaint::kFill_Style); |
- paint.setPathEffect(NULL); |
+ paint.setPathEffect(nullptr); |
SkDrawCacheProc glyphCacheProc = paint.getDrawCacheProc(); |
- SkAutoGlyphCache autoCache(paint, &fSurfaceProps, NULL); |
+ SkAutoGlyphCache autoCache(paint, &fSurfaceProps, nullptr); |
SkGlyphCache* cache = autoCache.getCache(); |
const char* stop = text + byteLength; |
@@ -266,12 +266,12 @@ static void GlyphCacheAuxProc(void* data) { |
GrFontScaler* GrTextContext::GetGrFontScaler(SkGlyphCache* cache) { |
void* auxData; |
- GrFontScaler* scaler = NULL; |
+ GrFontScaler* scaler = nullptr; |
if (cache->getAuxProcData(GlyphCacheAuxProc, &auxData)) { |
scaler = (GrFontScaler*)auxData; |
} |
- if (NULL == scaler) { |
+ if (nullptr == scaler) { |
scaler = new GrFontScaler(cache); |
cache->setAuxProc(GlyphCacheAuxProc, scaler); |
} |