Add skstd::move and skstd::forward.

src/animator/SkDisplayAdd.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDisplayAdd.h"
@@ skipping 75 matching lines @@
     bool skipAddToParent = true;
     SkASSERT(type != SkType_Replace || where);
     SkTDDrawableArray* grandList SK_INIT_TO_AVOID_WARNING;
     SkGroup* parentGroup = NULL;
     SkGroup* thisGroup = NULL;
     int index = where ? displayList.findGroup(where, &parentList, &parentGroup,
         &thisGroup, &grandList) : 0;
     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;
         if (index > max) {
             maker.setErrorCode(SkDisplayXMLParserError::kIndexOutOfRange);
             return true;    // caller should not add
         }
     }
     if (offset < 0 && where == NULL)
         index += max + 1;
@@ skipping 21 matching lines @@
             } else {
                 if (thisGroup)
                     thisGroup->markCopySize(index);
                 *parentList->insert(index) = use;
                 if (thisGroup)
                     thisGroup->markCopySet(index);
                 if (use->isApply())
                     ((SkApply*) use)->setEmbedded();
             }
             break;
-        case SkType_Move: {
+        case SkType_Relocate: {
             int priorLocation = parentList->find(use);
             if (priorLocation < 0)
                 break;
             *parentList->insert(index) = use;
             if (index < priorLocation)
                 priorLocation++;
             parentList->remove(priorLocation);
             } break;
         case SkType_Remove: {
             SkDisplayable* old = (*parentList)[index];
@@ skipping 55 matching lines @@
 
 bool SkClear::enable(SkAnimateMaker& maker ) {
     SkDisplayList& displayList = maker.fDisplayList;
     displayList.clear();
     return true;
 }
 
 
 #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
 
 const SkMemberInfo SkRemove::fInfo[] = {
     SK_MEMBER_ALIAS(delete, fDelete, Boolean),  // !!! experimental
     SK_MEMBER(offset, Int),
     SK_MEMBER(where, Drawable)
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkRemove);
 
 SkRemove::SkRemove() : fDelete(false) {
 }
 
 #if SK_USE_CONDENSED_INFO == 0
 
 const SkMemberInfo SkReplace::fInfo[] = {
     SK_MEMBER_INHERITED
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkReplace);