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

Unified Diff: src/utils/SkInterpolator.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 | « src/utils/SkFrontBufferedStream.cpp ('k') | src/utils/SkLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkInterpolator.cpp
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp
index 03e7e4a83f9d230f60bf5b934601648dfb20ae04..cd9ad3a2db44a2927f160acfa827449c9ab70e32 100644
--- a/src/utils/SkInterpolator.cpp
+++ b/src/utils/SkInterpolator.cpp
@@ -12,9 +12,9 @@
#include "SkTSearch.h"
SkInterpolatorBase::SkInterpolatorBase() {
- fStorage = NULL;
- fTimes = NULL;
- SkDEBUGCODE(fTimesArray = NULL;)
+ fStorage = nullptr;
+ fTimes = nullptr;
+ SkDEBUGCODE(fTimesArray = nullptr;)
}
SkInterpolatorBase::~SkInterpolatorBase() {
@@ -30,9 +30,9 @@ void SkInterpolatorBase::reset(int elemCount, int frameCount) {
fRepeat = SK_Scalar1;
if (fStorage) {
sk_free(fStorage);
- fStorage = NULL;
- fTimes = NULL;
- SkDEBUGCODE(fTimesArray = NULL);
+ fStorage = nullptr;
+ fTimes = nullptr;
+ SkDEBUGCODE(fTimesArray = nullptr);
}
}
@@ -129,8 +129,8 @@ SkInterpolatorBase::Result SkInterpolatorBase::timeToT(SkMSec time, SkScalar* T,
SkInterpolator::SkInterpolator() {
INHERITED::reset(0, 0);
- fValues = NULL;
- SkDEBUGCODE(fScalarsArray = NULL;)
+ fValues = nullptr;
+ SkDEBUGCODE(fScalarsArray = nullptr;)
}
SkInterpolator::SkInterpolator(int elemCount, int frameCount) {
@@ -159,9 +159,9 @@ static const SkScalar gIdentityBlend[4] = {
bool SkInterpolator::setKeyFrame(int index, SkMSec time,
const SkScalar values[], const SkScalar blend[4]) {
- SkASSERT(values != NULL);
+ SkASSERT(values != nullptr);
- if (blend == NULL) {
+ if (blend == nullptr) {
blend = gIdentityBlend;
}
« no previous file with comments | « src/utils/SkFrontBufferedStream.cpp ('k') | src/utils/SkLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698