| Index: src/animator/SkScriptRuntime.cpp
|
| diff --git a/src/animator/SkScriptRuntime.cpp b/src/animator/SkScriptRuntime.cpp
|
| index 5517b5142ae0abd788c6e6deb37b668e87e85ee9..7cb35a69db2c492133e07dc31b909e455f520306 100644
|
| --- a/src/animator/SkScriptRuntime.cpp
|
| +++ b/src/animator/SkScriptRuntime.cpp
|
| @@ -200,13 +200,13 @@ bool SkScriptRuntime::executeTokens(unsigned char* opCode) {
|
| operand[0].fScalar = SkScriptEngine2::IntToScalar(operand[op - SkScriptEngine2::kIntToScalar].fS32);
|
| break;
|
| case SkScriptEngine2::kStringToInt:
|
| - if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == NULL)
|
| + if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == nullptr)
|
| return false;
|
| break;
|
| case SkScriptEngine2::kStringToScalar:
|
| case SkScriptEngine2::kStringToScalar2:
|
| if (SkParse::FindScalar(operand[0].fString->c_str(),
|
| - &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == NULL)
|
| + &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == nullptr)
|
| return false;
|
| break;
|
| case SkScriptEngine2::kScalarToInt:
|
| @@ -341,11 +341,11 @@ void SkScriptRuntime::track(SkString* string) {
|
| void SkScriptRuntime::untrack(SkOpArray* array) {
|
| int index = fTrackArray.find(array);
|
| SkASSERT(index >= 0);
|
| - fTrackArray.begin()[index] = NULL;
|
| + fTrackArray.begin()[index] = nullptr;
|
| }
|
|
|
| void SkScriptRuntime::untrack(SkString* string) {
|
| int index = fTrackString.find(string);
|
| SkASSERT(index >= 0);
|
| - fTrackString.begin()[index] = NULL;
|
| + fTrackString.begin()[index] = nullptr;
|
| }
|
|
|