Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: src/animator/SkDisplayAdd.cpp

Issue 1273813002: Add skstd::move and skstd::forward. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: No need to change the string. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698