Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: src/utils/debugger/SkDrawCommand.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/debugger/SkDrawCommand.h ('k') | src/utils/debugger/SkObjectParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/debugger/SkDrawCommand.cpp
diff --git a/src/utils/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp
index 75d847493b8393db59b93ab4063ddd9e9e7e6954..a9415dd924ef97bb54be03f20ab85b498931cd56 100644
--- a/src/utils/debugger/SkDrawCommand.cpp
+++ b/src/utils/debugger/SkDrawCommand.cpp
@@ -63,7 +63,7 @@ const char* SkDrawCommand::GetCommandString(OpType type) {
break;
}
SkDEBUGFAIL("DrawType UNUSED\n");
- return NULL;
+ return nullptr;
}
SkString SkDrawCommand::toString() const {
@@ -114,7 +114,7 @@ void render_path(SkCanvas* canvas, const SkPath& path) {
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 @@ SkDrawBitmapCommand::SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left,
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fInfo.push(SkObjectParser::BitmapToString(bitmap));
@@ -300,7 +300,7 @@ SkDrawBitmapNineCommand::SkDrawBitmapNineCommand(const SkBitmap& bitmap, const S
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fInfo.push(SkObjectParser::BitmapToString(bitmap));
@@ -336,7 +336,7 @@ SkDrawBitmapRectCommand::SkDrawBitmapRectCommand(const SkBitmap& bitmap, const S
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fConstraint = constraint;
@@ -764,7 +764,7 @@ SkDrawSpriteCommand::SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int t
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fInfo.push(SkObjectParser::BitmapToString(bitmap));
@@ -829,7 +829,7 @@ SkDrawTextOnPathCommand::SkDrawTextOnPathCommand(const void* text, size_t byteLe
void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) const {
canvas->drawTextOnPath(fText, fByteLength, fPath,
- fMatrix.isIdentity() ? NULL : &fMatrix,
+ fMatrix.isIdentity() ? nullptr : &fMatrix,
fPaint);
}
@@ -850,14 +850,14 @@ SkDrawVerticesCommand::SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int ver
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 @@ SkDrawVerticesCommand::SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int ver
fIndices = new uint16_t[indexCount];
memcpy(fIndices, indices, indexCount * sizeof(uint16_t));
} else {
- fIndices = NULL;
+ fIndices = nullptr;
}
fIndexCount = indexCount;
@@ -924,7 +924,7 @@ SkSaveLayerCommand::SkSaveLayerCommand(const SkRect* bounds, const SkPaint* pain
fPaint = *paint;
fPaintPtr = &fPaint;
} else {
- fPaintPtr = NULL;
+ fPaintPtr = nullptr;
}
fFlags = flags;
@@ -938,7 +938,7 @@ SkSaveLayerCommand::SkSaveLayerCommand(const SkRect* bounds, const SkPaint* pain
}
void SkSaveLayerCommand::execute(SkCanvas* canvas) const {
- canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
+ canvas->saveLayer(fBounds.isEmpty() ? nullptr : &fBounds,
fPaintPtr,
fFlags);
}
« no previous file with comments | « src/utils/debugger/SkDrawCommand.h ('k') | src/utils/debugger/SkObjectParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698