Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 5ce9067..f163cc5 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -50,7 +50,7 @@
return gTable[idx];
}
- Factory getFactory() const override { return NULL; }
+ Factory getFactory() const override { return nullptr; }
#ifndef SK_IGNORE_TO_STRING
void toString(SkString* str) const override { str->set("OverdrawXfermode"); }
#endif
@@ -64,13 +64,13 @@
bool overrideFilterQuality,
SkFilterQuality quality)
: INHERITED(width, height)
- , fOverdrawXfermode(overdrawViz ? new OverdrawXfermode : NULL)
+ , fOverdrawXfermode(overdrawViz ? new OverdrawXfermode : nullptr)
, fOverrideFilterQuality(overrideFilterQuality)
, fFilterQuality(quality) {}
protected:
void onFilterPaint(SkPaint* paint, Type) const override {
- if (NULL != fOverdrawXfermode.get()) {
+ if (nullptr != fOverdrawXfermode.get()) {
paint->setAntiAlias(false);
paint->setXfermode(fOverdrawXfermode.get());
}
@@ -100,7 +100,7 @@
SkDebugCanvas::SkDebugCanvas(int width, int height)
: INHERITED(width, height)
- , fPicture(NULL)
+ , fPicture(nullptr)
, fFilter(false)
, fMegaVizMode(false)
, fOverdrawViz(false)
@@ -359,7 +359,7 @@
void SkDebugCanvas::updatePaintFilterCanvas() {
if (!fOverdrawViz && !fOverrideFilterQuality) {
- fPaintFilterCanvas.reset(NULL);
+ fPaintFilterCanvas.reset(nullptr);
return;
}
@@ -515,7 +515,7 @@
SkXfermode*, const uint16_t indices[], int indexCount,
const SkPaint& paint) {
this->addDrawCommand(new SkDrawVerticesCommand(vmode, vertexCount, vertices,
- texs, colors, NULL, indices, indexCount, paint));
+ texs, colors, nullptr, indices, indexCount, paint));
}
void SkDebugCanvas::willRestore() {