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

Unified Diff: tests/SVGDeviceTest.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 | « tests/ResourceCacheTest.cpp ('k') | tests/SerializationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/SVGDeviceTest.cpp
diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp
index c973f8b15fa660430246eef41f7c8262f7acafc8..494efbb3e7d6cdac988b62fe2c00c235544ac317 100644
--- a/tests/SVGDeviceTest.cpp
+++ b/tests/SVGDeviceTest.cpp
@@ -24,21 +24,21 @@ void check_text_node(skiatest::Reporter* reporter,
const SkPoint& offset,
unsigned scalarsPerPos,
const char* expected) {
- if (root == NULL) {
+ if (root == nullptr) {
ERRORF(reporter, "root element not found.");
return;
}
const SkDOM::Node* textElem = dom.getFirstChild(root, "text");
- if (textElem == NULL) {
+ if (textElem == nullptr) {
ERRORF(reporter, "<text> element not found.");
return;
}
REPORTER_ASSERT(reporter, dom.getType(textElem) == SkDOM::kElement_Type);
const SkDOM::Node* textNode= dom.getFirstChild(textElem);
- REPORTER_ASSERT(reporter, textNode != NULL);
- if (textNode != NULL) {
+ REPORTER_ASSERT(reporter, textNode != nullptr);
+ if (textNode != nullptr) {
REPORTER_ASSERT(reporter, dom.getType(textNode) == SkDOM::kText_Type);
REPORTER_ASSERT(reporter, strcmp(expected, dom.getName(textNode)) == 0);
}
@@ -46,8 +46,8 @@ void check_text_node(skiatest::Reporter* reporter,
int textLen = SkToInt(strlen(expected));
const char* x = dom.findAttr(textElem, "x");
- REPORTER_ASSERT(reporter, x != NULL);
- if (x != NULL) {
+ REPORTER_ASSERT(reporter, x != nullptr);
+ if (x != nullptr) {
int xposCount = (scalarsPerPos < 1) ? 1 : textLen;
REPORTER_ASSERT(reporter, SkParse::Count(x) == xposCount);
@@ -63,8 +63,8 @@ void check_text_node(skiatest::Reporter* reporter,
}
const char* y = dom.findAttr(textElem, "y");
- REPORTER_ASSERT(reporter, y != NULL);
- if (y != NULL) {
+ REPORTER_ASSERT(reporter, y != nullptr);
+ if (y != nullptr) {
int yposCount = (scalarsPerPos < 2) ? 1 : textLen;
REPORTER_ASSERT(reporter, SkParse::Count(y) == yposCount);
« no previous file with comments | « tests/ResourceCacheTest.cpp ('k') | tests/SerializationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698