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

Unified Diff: src/animator/SkTDArray_Experimental.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/animator/SkScriptTokenizer.cpp ('k') | src/animator/SkTextOnPath.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkTDArray_Experimental.h
diff --git a/src/animator/SkTDArray_Experimental.h b/src/animator/SkTDArray_Experimental.h
index 4b3970fde07c64673cae798c2feed858233c9a5d..ff693ac39b5f733859dfc9e698572351b82abad4 100644
--- a/src/animator/SkTDArray_Experimental.h
+++ b/src/animator/SkTDArray_Experimental.h
@@ -35,8 +35,8 @@ protected:
SkDS32Array(const int32_t src[], U16CPU count);
SkDS32Array& operator=(const SkDS32Array& src);
friend int operator==(const SkDS32Array& a, const SkDS32Array& b);
- int32_t* append() { return this->append(1, NULL); }
- int32_t* append(U16CPU count, const int32_t* src = NULL);
+ int32_t* append() { return this->append(1, nullptr); }
+ int32_t* append(U16CPU count, const int32_t* src = nullptr);
int32_t* appendClear()
{
@@ -65,9 +65,9 @@ public:
if (fArray)
{
sk_free(fArray);
- fArray = NULL;
+ fArray = nullptr;
#ifdef SK_DEBUG
- fData = NULL;
+ fData = nullptr;
#endif
fReserve = fCount = 0;
}
@@ -104,7 +104,7 @@ protected:
template <typename T> class SkTDS32Array : public SkDS32Array {
public:
- SkTDS32Array() { SkDEBUGCODE(fTData=NULL); SkASSERT(sizeof(T) == sizeof(int32_t)); }
+ SkTDS32Array() { SkDEBUGCODE(fTData=nullptr); SkASSERT(sizeof(T) == sizeof(int32_t)); }
SkTDS32Array(const SkTDS32Array<T>& src) : SkDS32Array(src) {}
~SkTDS32Array() { sk_free(fArray); }
T& operator[](int index) const { SYNC(); SkASSERT((unsigned)index < fCount); return ((T*) fArray)[index]; }
@@ -114,12 +114,12 @@ public:
return operator==((const SkDS32Array&) a, (const SkDS32Array&) b); }
T* append() { return (T*) SkDS32Array::append(); }
T* appendClear() { return (T*) SkDS32Array::appendClear(); }
- T* append(U16CPU count, const T* src = NULL) { return (T*) SkDS32Array::append(count, (const int32_t*) src); }
+ T* append(U16CPU count, const T* src = nullptr) { return (T*) SkDS32Array::append(count, (const int32_t*) src); }
T* begin() const { SYNC(); return (T*) fArray; }
- T* end() const { return (T*) (fArray ? fArray + fCount : NULL); }
+ T* end() const { return (T*) (fArray ? fArray + fCount : nullptr); }
int find(const T& elem) const { return SkDS32Array::find((const int32_t&) elem); }
- T* insert(U16CPU index) { return this->insert(index, 1, NULL); }
- T* insert(U16CPU index, U16CPU count, const T* src = NULL) {
+ T* insert(U16CPU index) { return this->insert(index, 1, nullptr); }
+ T* insert(U16CPU index, U16CPU count, const T* src = nullptr) {
return (T*) SkDS32Array::insert(index, count, (const int32_t*) src); }
int rfind(const T& elem) const { return SkDS32Array::rfind((const int32_t&) elem); }
T* push() { return this->append(); }
« no previous file with comments | « src/animator/SkScriptTokenizer.cpp ('k') | src/animator/SkTextOnPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698