| Index: src/animator/SkDisplayAdd.cpp
|
| diff --git a/src/animator/SkDisplayAdd.cpp b/src/animator/SkDisplayAdd.cpp
|
| index ffc9ba4cfb0da4b1e6e81acf18d54c09a940bc1a..edaa09da979edab4993791b38c3e7971949601f7 100644
|
| --- a/src/animator/SkDisplayAdd.cpp
|
| +++ b/src/animator/SkDisplayAdd.cpp
|
| @@ -93,7 +93,7 @@ bool SkAdd::enable(SkAnimateMaker& maker ) {
|
| if (index < 0)
|
| return true;
|
| int max = parentList->count();
|
| - if (where == NULL && type == SkType_Move)
|
| + if (where == NULL && type == SkType_Relocate)
|
| index = max;
|
| if (offset != SK_MaxS32) {
|
| index += offset;
|
| @@ -135,7 +135,7 @@ bool SkAdd::enable(SkAnimateMaker& maker ) {
|
| ((SkApply*) use)->setEmbedded();
|
| }
|
| break;
|
| - case SkType_Move: {
|
| + case SkType_Relocate: {
|
| int priorLocation = parentList->find(use);
|
| if (priorLocation < 0)
|
| break;
|
| @@ -211,13 +211,13 @@ bool SkClear::enable(SkAnimateMaker& maker ) {
|
|
|
| #if SK_USE_CONDENSED_INFO == 0
|
|
|
| -const SkMemberInfo SkMove::fInfo[] = {
|
| +const SkMemberInfo SkRelocate::fInfo[] = {
|
| SK_MEMBER_INHERITED
|
| };
|
|
|
| #endif
|
|
|
| -DEFINE_GET_MEMBER(SkMove);
|
| +DEFINE_GET_MEMBER(SkRelocate);
|
|
|
| #if SK_USE_CONDENSED_INFO == 0
|
|
|
|
|