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

Unified Diff: src/pathops/SkOpSpan.h

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/pathops/SkOpSegment.cpp ('k') | src/pathops/SkOpSpan.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpSpan.h
diff --git a/src/pathops/SkOpSpan.h b/src/pathops/SkOpSpan.h
index 2a11c96dd70708fde306c177cc5578b420ec7f70..a2115df4d79d2d83c3e7726f421d5955ff1fc80b 100644
--- a/src/pathops/SkOpSpan.h
+++ b/src/pathops/SkOpSpan.h
@@ -105,11 +105,11 @@ public:
SkOpPtT* start1 = s1->fT < e1->fT ? s1 : e1;
SkOpPtT* start2 = s2->fT < e2->fT ? s2 : e2;
*sOut = between(s1->fT, start2->fT, e1->fT) ? start2
- : between(s2->fT, start1->fT, e2->fT) ? start1 : NULL;
+ : between(s2->fT, start1->fT, e2->fT) ? start1 : nullptr;
SkOpPtT* end1 = s1->fT < e1->fT ? e1 : s1;
SkOpPtT* end2 = s2->fT < e2->fT ? e2 : s2;
*eOut = between(s1->fT, end2->fT, e1->fT) ? end2
- : between(s2->fT, end1->fT, e2->fT) ? end1 : NULL;
+ : between(s2->fT, end1->fT, e2->fT) ? end1 : nullptr;
if (*sOut == *eOut) {
SkASSERT(start1->fT >= end2->fT || start2->fT >= end1->fT);
return false;
@@ -341,11 +341,11 @@ public:
}
SkOpSpan* upCastable() {
- return final() ? NULL : upCast();
+ return final() ? nullptr : upCast();
}
const SkOpSpan* upCastable() const {
- return final() ? NULL : upCast();
+ return final() ? nullptr : upCast();
}
private:
« no previous file with comments | « src/pathops/SkOpSegment.cpp ('k') | src/pathops/SkOpSpan.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698