diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/svg/SkSVGDevice.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/svg/SkSVGDevice.cpp')
| -rw-r--r-- | src/svg/SkSVGDevice.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index a3f8af747e..4c679dfee7 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -38,7 +38,7 @@ static SkScalar svg_opacity(SkColor color) { // Keep in sync with SkPaint::Cap static const char* cap_map[] = { - NULL, // kButt_Cap (default) + nullptr, // kButt_Cap (default) "round", // kRound_Cap "square" // kSquare_Cap }; @@ -51,7 +51,7 @@ static const char* svg_cap(SkPaint::Cap cap) { // Keep in sync with SkPaint::Join static const char* join_map[] = { - NULL, // kMiter_Join (default) + nullptr, // kMiter_Join (default) "round", // kRound_Join "bevel" // kBevel_Join }; @@ -64,7 +64,7 @@ static const char* svg_join(SkPaint::Join join) { // Keep in sync with SkPaint::Align static const char* text_align_map[] = { - NULL, // kLeft_Align (default) + nullptr, // kLeft_Align (default) "middle", // kCenter_Align "end" // kRight_Align }; @@ -115,7 +115,7 @@ struct Resources { class SVGTextBuilder : SkNoncopyable { public: SVGTextBuilder(const void* text, size_t byteLen, const SkPaint& paint, const SkPoint& offset, - unsigned scalarsPerPos, const SkScalar pos[] = NULL) + unsigned scalarsPerPos, const SkScalar pos[] = nullptr) : fOffset(offset) , fScalarsPerPos(scalarsPerPos) , fPos(pos) @@ -277,7 +277,7 @@ class SkSVGDevice::AutoElement : ::SkNoncopyable { public: AutoElement(const char name[], SkXMLWriter* writer) : fWriter(writer) - , fResourceBucket(NULL) { + , fResourceBucket(nullptr) { fWriter->startElement(name); } @@ -563,7 +563,7 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) { SkBaseDevice* SkSVGDevice::Create(const SkISize& size, SkXMLWriter* writer) { if (!writer) { - return NULL; + return nullptr; } return new SkSVGDevice(size, writer); @@ -670,7 +670,7 @@ void SkSVGDevice::drawBitmapCommon(const SkDraw& draw, const SkBitmap& bm, return; } - size_t b64Size = SkBase64::Encode(pngData->data(), pngData->size(), NULL); + size_t b64Size = SkBase64::Encode(pngData->data(), pngData->size(), nullptr); SkAutoTMalloc<char> b64Data(b64Size); SkBase64::Encode(pngData->data(), pngData->size(), b64Data.get()); |