| Index: src/utils/SkDumpCanvas.cpp
|
| diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
|
| index e8997ab573c240eda9d85be21f8a9fd9e0570710..8d0209d96422249bac2a51faa82fd4b391368b3e 100644
|
| --- a/src/utils/SkDumpCanvas.cpp
|
| +++ b/src/utils/SkDumpCanvas.cpp
|
| @@ -195,7 +195,7 @@ void SkDumpCanvas::dump(Verb verb, const SkPaint* paint,
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| void SkDumpCanvas::willSave() {
|
| - this->dump(kSave_Verb, NULL, "save()");
|
| + this->dump(kSave_Verb, nullptr, "save()");
|
| this->INHERITED::willSave();
|
| }
|
|
|
| @@ -220,7 +220,7 @@ SkCanvas::SaveLayerStrategy SkDumpCanvas::willSaveLayer(const SkRect* bounds, co
|
| }
|
|
|
| void SkDumpCanvas::willRestore() {
|
| - this->dump(kRestore_Verb, NULL, "restore");
|
| + this->dump(kRestore_Verb, nullptr, "restore");
|
| this->INHERITED::willRestore();
|
| }
|
|
|
| @@ -229,18 +229,18 @@ void SkDumpCanvas::didConcat(const SkMatrix& matrix) {
|
|
|
| switch (matrix.getType()) {
|
| case SkMatrix::kTranslate_Mask:
|
| - this->dump(kMatrix_Verb, NULL, "translate(%g %g)",
|
| + this->dump(kMatrix_Verb, nullptr, "translate(%g %g)",
|
| SkScalarToFloat(matrix.getTranslateX()),
|
| SkScalarToFloat(matrix.getTranslateY()));
|
| break;
|
| case SkMatrix::kScale_Mask:
|
| - this->dump(kMatrix_Verb, NULL, "scale(%g %g)",
|
| + this->dump(kMatrix_Verb, nullptr, "scale(%g %g)",
|
| SkScalarToFloat(matrix.getScaleX()),
|
| SkScalarToFloat(matrix.getScaleY()));
|
| break;
|
| default:
|
| matrix.toString(&str);
|
| - this->dump(kMatrix_Verb, NULL, "concat(%s)", str.c_str());
|
| + this->dump(kMatrix_Verb, nullptr, "concat(%s)", str.c_str());
|
| break;
|
| }
|
|
|
| @@ -250,7 +250,7 @@ void SkDumpCanvas::didConcat(const SkMatrix& matrix) {
|
| void SkDumpCanvas::didSetMatrix(const SkMatrix& matrix) {
|
| SkString str;
|
| matrix.toString(&str);
|
| - this->dump(kMatrix_Verb, NULL, "setMatrix(%s)", str.c_str());
|
| + this->dump(kMatrix_Verb, nullptr, "setMatrix(%s)", str.c_str());
|
| this->INHERITED::didSetMatrix(matrix);
|
| }
|
|
|
| @@ -263,7 +263,7 @@ const char* SkDumpCanvas::EdgeStyleToAAString(ClipEdgeStyle edgeStyle) {
|
| void SkDumpCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
|
| SkString str;
|
| toString(rect, &str);
|
| - this->dump(kClip_Verb, NULL, "clipRect(%s %s %s)", str.c_str(), toString(op),
|
| + this->dump(kClip_Verb, nullptr, "clipRect(%s %s %s)", str.c_str(), toString(op),
|
| EdgeStyleToAAString(edgeStyle));
|
| this->INHERITED::onClipRect(rect, op, edgeStyle);
|
| }
|
| @@ -271,7 +271,7 @@ void SkDumpCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle
|
| void SkDumpCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
|
| SkString str;
|
| toString(rrect, &str);
|
| - this->dump(kClip_Verb, NULL, "clipRRect(%s %s %s)", str.c_str(), toString(op),
|
| + this->dump(kClip_Verb, nullptr, "clipRRect(%s %s %s)", str.c_str(), toString(op),
|
| EdgeStyleToAAString(edgeStyle));
|
| this->INHERITED::onClipRRect(rrect, op, edgeStyle);
|
| }
|
| @@ -279,7 +279,7 @@ void SkDumpCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeSt
|
| void SkDumpCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
|
| SkString str;
|
| toString(path, &str);
|
| - this->dump(kClip_Verb, NULL, "clipPath(%s %s %s)", str.c_str(), toString(op),
|
| + this->dump(kClip_Verb, nullptr, "clipPath(%s %s %s)", str.c_str(), toString(op),
|
| EdgeStyleToAAString(edgeStyle));
|
| this->INHERITED::onClipPath(path, op, edgeStyle);
|
| }
|
| @@ -287,7 +287,7 @@ void SkDumpCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle
|
| void SkDumpCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
|
| SkString str;
|
| toString(deviceRgn, &str);
|
| - this->dump(kClip_Verb, NULL, "clipRegion(%s %s)", str.c_str(),
|
| + this->dump(kClip_Verb, nullptr, "clipRegion(%s %s)", str.c_str(),
|
| toString(op));
|
| this->INHERITED::onClipRegion(deviceRgn, op);
|
| }
|
| @@ -448,13 +448,13 @@ void SkDumpCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y
|
|
|
| void SkDumpCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
|
| const SkPaint* paint) {
|
| - this->dump(kDrawPicture_Verb, NULL, "drawPicture(%p) %f:%f:%f:%f", picture,
|
| + this->dump(kDrawPicture_Verb, nullptr, "drawPicture(%p) %f:%f:%f:%f", picture,
|
| picture->cullRect().fLeft, picture->cullRect().fTop,
|
| picture->cullRect().fRight, picture->cullRect().fBottom);
|
| fNestLevel += 1;
|
| this->INHERITED::onDrawPicture(picture, matrix, paint);
|
| fNestLevel -= 1;
|
| - this->dump(kDrawPicture_Verb, NULL, "endPicture(%p) %f:%f:%f:%f", &picture,
|
| + this->dump(kDrawPicture_Verb, nullptr, "endPicture(%p) %f:%f:%f:%f", &picture,
|
| picture->cullRect().fLeft, picture->cullRect().fTop,
|
| picture->cullRect().fRight, picture->cullRect().fBottom);
|
| }
|
| @@ -552,6 +552,6 @@ static void dumpToDebugf(const char text[], void*) {
|
| SkDebugf("%s\n", text);
|
| }
|
|
|
| -SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, NULL) {}
|
| +SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, nullptr) {}
|
|
|
| #endif
|
|
|