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 /tests/PathOpsExtendedTest.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 'tests/PathOpsExtendedTest.cpp')
-rw-r--r-- | tests/PathOpsExtendedTest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp index 1401290f83..7209617985 100644 --- a/tests/PathOpsExtendedTest.cpp +++ b/tests/PathOpsExtendedTest.cpp @@ -425,14 +425,14 @@ bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& st if (!state.fReporter->verbose()) { return true; } - int result = comparePaths(state.fReporter, NULL, path, out, *state.fBitmap); + int result = comparePaths(state.fReporter, nullptr, path, out, *state.fBitmap); if (result) { SkAutoMutexAcquire autoM(simplifyDebugOut); char temp[8192]; sk_bzero(temp, sizeof(temp)); SkMemoryWStream stream(temp, sizeof(temp)); - const char* pathPrefix = NULL; - const char* nameSuffix = NULL; + const char* pathPrefix = nullptr; + const char* nameSuffix = nullptr; if (fillType == SkPath::kEvenOdd_FillType) { pathPrefix = " path.setFillType(SkPath::kEvenOdd_FillType);\n"; nameSuffix = "x"; @@ -586,7 +586,7 @@ void initializeTests(skiatest::Reporter* reporter, const char* test) { inData.setCount((int) inFile.getLength()); size_t inLen = inData.count(); inFile.read(inData.begin(), inLen); - inFile.setPath(NULL); + inFile.setPath(nullptr); char* insert = strstr(inData.begin(), marker); if (insert) { insert += sizeof(marker) - 1; @@ -599,8 +599,8 @@ void initializeTests(skiatest::Reporter* reporter, const char* test) { void outputProgress(char* ramStr, const char* pathStr, SkPath::FillType pathFillType) { const char testFunction[] = "testSimplify(path);"; - const char* pathPrefix = NULL; - const char* nameSuffix = NULL; + const char* pathPrefix = nullptr; + const char* nameSuffix = nullptr; if (pathFillType == SkPath::kEvenOdd_FillType) { pathPrefix = " path.setFillType(SkPath::kEvenOdd_FillType);\n"; nameSuffix = "x"; @@ -614,7 +614,7 @@ void outputProgress(char* ramStr, const char* pathStr, SkPathOp op) { SkASSERT((size_t) op < SK_ARRAY_COUNT(opSuffixes)); const char* nameSuffix = opSuffixes[op]; SkMemoryWStream rRamStream(ramStr, PATH_STR_SIZE); - outputToStream(pathStr, NULL, nameSuffix, testFunction, true, rRamStream); + outputToStream(pathStr, nullptr, nameSuffix, testFunction, true, rRamStream); } void RunTestSet(skiatest::Reporter* reporter, TestDesc tests[], size_t count, |