| Index: src/animator/SkDisplayType.cpp
|
| diff --git a/src/animator/SkDisplayType.cpp b/src/animator/SkDisplayType.cpp
|
| index 87ea560d80c09e2ed29cdc6c83aeafc2b7f14153..00158194ca3f9f5b770c93e945b3c32e91e16a3c 100644
|
| --- a/src/animator/SkDisplayType.cpp
|
| +++ b/src/animator/SkDisplayType.cpp
|
| @@ -146,7 +146,7 @@ SkDisplayable* SkDisplayType::CreateInstance(SkAnimateMaker* maker, SkDisplayTyp
|
| CASE_DRAW_NEW(Matrix);
|
| // memberfunction
|
| // memberproperty
|
| - CASE_NEW(Move);
|
| + CASE_NEW(Relocate);
|
| CASE_NEW(MoveTo);
|
| CASE_DISPLAY_NEW(Movie);
|
| // msec
|
| @@ -300,7 +300,7 @@ const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
|
| CASE_GET_DRAW_INFO(Matrix);
|
| // memberfunction
|
| // memberproperty
|
| - CASE_GET_INFO(Move);
|
| + CASE_GET_INFO(Relocate);
|
| CASE_GET_INFO(MoveTo);
|
| CASE_GET_DISPLAY_INFO(Movie);
|
| // msec
|
| @@ -466,7 +466,7 @@ const TypeNames gTypeNames[] = {
|
| DRAW_NAME("matrix", SkType_Matrix),
|
| // memberfunction
|
| // memberproperty
|
| - { "move", SkType_Move INIT_BOOL_FIELDS },
|
| + { "move", SkType_Relocate INIT_BOOL_FIELDS },
|
| { "moveTo", SkType_MoveTo INIT_BOOL_FIELDS },
|
| { "movie", SkType_Movie INIT_BOOL_FIELDS },
|
| // msec
|
| @@ -638,7 +638,7 @@ bool SkDisplayType::IsDisplayable(SkAnimateMaker* , SkDisplayTypes type) {
|
| case SkType_LineTo:
|
| case SkType_DrawLinearGradient:
|
| case SkType_Matrix:
|
| - case SkType_Move:
|
| + case SkType_Relocate:
|
| case SkType_MoveTo:
|
| case SkType_Movie:
|
| case SkType_Oval:
|
|
|