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() {
diff --git a/src/utils/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp
index 75d8474..a9415dd 100644
--- a/src/utils/debugger/SkDrawCommand.cpp
+++ b/src/utils/debugger/SkDrawCommand.cpp
@@ -63,7 +63,7 @@
break;
}
SkDEBUGFAIL("DrawType UNUSED\n");
- return NULL;
+ return nullptr;
}
SkString SkDrawCommand::toString() const {
@@ -114,7 +114,7 @@
canvas->restore();
}
-void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRect = NULL) {
+void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRect = nullptr) {
const SkISize& size = canvas->getDeviceSize();
SkScalar xScale = SkIntToScalar(size.fWidth-2) / input.width();
@@ -270,7 +270,7 @@
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fInfo.push(SkObjectParser::BitmapToString(bitmap));
@@ -300,7 +300,7 @@
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fInfo.push(SkObjectParser::BitmapToString(bitmap));
@@ -336,7 +336,7 @@
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fConstraint = constraint;
@@ -764,7 +764,7 @@
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fInfo.push(SkObjectParser::BitmapToString(bitmap));
@@ -829,7 +829,7 @@
void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) const {
canvas->drawTextOnPath(fText, fByteLength, fPath,
- fMatrix.isIdentity() ? NULL : &fMatrix,
+ fMatrix.isIdentity() ? nullptr : &fMatrix,
fPaint);
}
@@ -850,14 +850,14 @@
fTexs = new SkPoint[vertexCount];
memcpy(fTexs, texs, vertexCount * sizeof(SkPoint));
} else {
- fTexs = NULL;
+ fTexs = nullptr;
}
if (colors) {
fColors = new SkColor[vertexCount];
memcpy(fColors, colors, vertexCount * sizeof(SkColor));
} else {
- fColors = NULL;
+ fColors = nullptr;
}
fXfermode = xfermode;
@@ -869,7 +869,7 @@
fIndices = new uint16_t[indexCount];
memcpy(fIndices, indices, indexCount * sizeof(uint16_t));
} else {
- fIndices = NULL;
+ fIndices = nullptr;
}
fIndexCount = indexCount;
@@ -924,7 +924,7 @@
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fFlags = flags;
@@ -938,7 +938,7 @@
}
void SkSaveLayerCommand::execute(SkCanvas* canvas) const {
- canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
+ canvas->saveLayer(fBounds.isEmpty() ? nullptr : &fBounds,
fPaintPtr,
fFlags);
}
diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
index b8eca79..c7e5f00 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -250,7 +250,7 @@
void setPaint(const SkPaint& paint) { fPaint = paint; fPaintPtr = &fPaint; }
- const SkRect* srcRect() const { return fSrc.isEmpty() ? NULL : &fSrc; }
+ const SkRect* srcRect() const { return fSrc.isEmpty() ? nullptr : &fSrc; }
void setSrcRect(const SkRect& src) { fSrc = src; }
const SkRect& dstRect() const { return fDst; }
diff --git a/src/utils/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp
index cba8d06..03820e1 100644
--- a/src/utils/debugger/SkObjectParser.cpp
+++ b/src/utils/debugger/SkObjectParser.cpp
@@ -151,7 +151,7 @@
mPath->append(gConvexityStrings[path.getConvexity()]);
mPath->append(", ");
- if (path.isRect(NULL)) {
+ if (path.isRect(nullptr)) {
mPath->append("isRect, ");
} else {
mPath->append("isNotRect, ");
@@ -235,7 +235,7 @@
SkString* mRect = new SkString;
- if (NULL == title) {
+ if (nullptr == title) {
mRect->append("SkRect: ");
} else {
mRect->append(title);
@@ -256,7 +256,7 @@
SkString* mRRect = new SkString;
- if (NULL == title) {
+ if (nullptr == title) {
mRRect->append("SkRRect (");
if (rrect.isEmpty()) {
mRRect->append("empty");
@@ -358,7 +358,7 @@
decodedText->append("UTF-16: ");
size_t sizeNeeded = SkUTF16_ToUTF8((uint16_t*)text,
SkToS32(byteLength / 2),
- NULL);
+ nullptr);
SkAutoSTMalloc<0x100, char> utf8(sizeNeeded);
SkUTF16_ToUTF8((uint16_t*)text, SkToS32(byteLength / 2), utf8);
decodedText->append(utf8, sizeNeeded);
diff --git a/src/utils/debugger/SkObjectParser.h b/src/utils/debugger/SkObjectParser.h
index c4d0da0..4c04935 100644
--- a/src/utils/debugger/SkObjectParser.h
+++ b/src/utils/debugger/SkObjectParser.h
@@ -89,13 +89,13 @@
Returns a string representation of the SkRects coordinates.
@param rect SkRect
*/
- static SkString* RectToString(const SkRect& rect, const char* title = NULL);
+ static SkString* RectToString(const SkRect& rect, const char* title = nullptr);
/**
Returns a string representation of an SkRRect.
@param rrect SkRRect
*/
- static SkString* RRectToString(const SkRRect& rrect, const char* title = NULL);
+ static SkString* RRectToString(const SkRRect& rrect, const char* title = nullptr);
/**
Returns a string representation of the SkRegion enum.