| Index: src/animator/SkAnimateSet.cpp
|
| diff --git a/src/animator/SkAnimateSet.cpp b/src/animator/SkAnimateSet.cpp
|
| index 6679a92fb5b125421855d7a5cf765a4c7a89f007..c05e0299d83cc1a01cb41a972735182d7ec0ec53 100644
|
| --- a/src/animator/SkAnimateSet.cpp
|
| +++ b/src/animator/SkAnimateSet.cpp
|
| @@ -48,14 +48,14 @@ void SkSet::dump(SkAnimateMaker* maker) {
|
| #endif
|
|
|
| void SkSet::refresh(SkAnimateMaker& maker) {
|
| - fFieldInfo->setValue(maker, &fValues, 0, fFieldInfo->fCount, NULL,
|
| + fFieldInfo->setValue(maker, &fValues, 0, fFieldInfo->fCount, nullptr,
|
| fFieldInfo->getType(), to);
|
| }
|
|
|
| void SkSet::onEndElement(SkAnimateMaker& maker) {
|
| if (resolveCommon(maker) == false)
|
| return;
|
| - if (fFieldInfo == NULL) {
|
| + if (fFieldInfo == nullptr) {
|
| maker.setErrorCode(SkDisplayXMLParserError::kFieldNotInTarget);
|
| return;
|
| }
|
|
|