aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/animator
diff options
context:
space:
mode:
Diffstat (limited to 'src/animator')
-rw-r--r--src/animator/SkDisplayPost.cpp14
-rw-r--r--src/animator/SkDisplayPost.h4
-rw-r--r--src/animator/SkDisplayType.cpp8
-rw-r--r--src/animator/SkDisplayType.h2
-rw-r--r--src/animator/SkDisplayable.h2
-rw-r--r--src/animator/SkIntArray.h4
-rw-r--r--src/animator/SkPostParts.cpp16
-rw-r--r--src/animator/SkPostParts.h6
8 files changed, 28 insertions, 28 deletions
diff --git a/src/animator/SkDisplayPost.cpp b/src/animator/SkDisplayPost.cpp
index 17e7c761e9..e46cdbd0c7 100644
--- a/src/animator/SkDisplayPost.cpp
+++ b/src/animator/SkDisplayPost.cpp
@@ -51,13 +51,13 @@ SkPost::SkPost() : delay(0), /*initialized(SkBool(-1)), */ mode(kImmediate), fMa
}
SkPost::~SkPost() {
- for (SkData** part = fParts.begin(); part < fParts.end(); part++)
+ for (SkDataInput** part = fParts.begin(); part < fParts.end(); part++)
delete *part;
}
bool SkPost::add(SkAnimateMaker& , SkDisplayable* child) {
- SkASSERT(child && child->isData());
- SkData* part = (SkData*) child;
+ SkASSERT(child && child->isDataInput());
+ SkDataInput* part = (SkDataInput*) child;
*fParts.append() = part;
return true;
}
@@ -113,8 +113,8 @@ void SkPost::dump(SkAnimateMaker* maker) {
//for some reason the last part is id, which i don't want
//and the parts seem to be in the reverse order from the one in which we find the
//data itself
- //SkData** ptr = fParts.end();
- //SkData* data;
+ //SkDataInput** ptr = fParts.end();
+ //SkDataInput* data;
//const char* ID;
while ((name = iter.next(&type, &number)) != NULL) {
//ptr--;
@@ -190,7 +190,7 @@ bool SkPost::enable(SkAnimateMaker& maker ) {
fEvent.getMetaData().reset();
if (preserveID.size() > 0)
fEvent.setString("id", preserveID);
- for (SkData** part = fParts.begin(); part < fParts.end(); part++) {
+ for (SkDataInput** part = fParts.begin(); part < fParts.end(); part++) {
if ((*part)->add())
maker.setErrorCode(SkDisplayXMLParserError::kErrorAddingDataToPost);
}
@@ -284,7 +284,7 @@ bool SkPost::hasEnable() const {
void SkPost::onEndElement(SkAnimateMaker& maker) {
fTargetMaker = fMaker = &maker;
if (fChildHasID == false) {
- for (SkData** part = fParts.begin(); part < fParts.end(); part++)
+ for (SkDataInput** part = fParts.begin(); part < fParts.end(); part++)
delete *part;
fParts.reset();
}
diff --git a/src/animator/SkDisplayPost.h b/src/animator/SkDisplayPost.h
index 4b75b078d0..95c4042277 100644
--- a/src/animator/SkDisplayPost.h
+++ b/src/animator/SkDisplayPost.h
@@ -24,7 +24,7 @@
#include "SkMemberInfo.h"
#include "SkIntArray.h"
-class SkData;
+class SkDataInput;
class SkAnimateMaker;
class SkPost : public SkDisplayable {
@@ -60,7 +60,7 @@ protected:
SkBool8 fDirty;
private:
void findSinkID();
- friend class SkData;
+ friend class SkDataInput;
typedef SkDisplayable INHERITED;
};
diff --git a/src/animator/SkDisplayType.cpp b/src/animator/SkDisplayType.cpp
index 90fcd89837..564cd3f1b2 100644
--- a/src/animator/SkDisplayType.cpp
+++ b/src/animator/SkDisplayType.cpp
@@ -119,7 +119,7 @@ SkDisplayable* SkDisplayType::CreateInstance(SkAnimateMaker* maker, SkDisplayTyp
CASE_DRAW_NEW(Color);
CASE_NEW(CubicTo);
CASE_NEW(Dash);
- CASE_NEW(Data);
+ CASE_NEW(DataInput);
CASE_NEW(Discrete);
// displayable
// drawable
@@ -274,7 +274,7 @@ const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
CASE_GET_DRAW_INFO(Color);
CASE_GET_INFO(CubicTo);
CASE_GET_INFO(Dash);
- CASE_GET_INFO(Data);
+ CASE_GET_INFO(DataInput);
CASE_GET_INFO(Discrete);
// displayable
// drawable
@@ -441,7 +441,7 @@ const TypeNames gTypeNames[] = {
DRAW_NAME("color", SkType_Color),
{ "cubicTo", SkType_CubicTo INIT_BOOL_FIELDS },
{ "dash", SkType_Dash INIT_BOOL_FIELDS },
- { "data", SkType_Data INIT_BOOL_FIELDS },
+ { "data", SkType_DataInput INIT_BOOL_FIELDS },
{ "discrete", SkType_Discrete INIT_BOOL_FIELDS },
// displayable
// drawable
@@ -634,7 +634,7 @@ bool SkDisplayType::IsDisplayable(SkAnimateMaker* , SkDisplayTypes type) {
case SkType_Color:
case SkType_CubicTo:
case SkType_Dash:
- case SkType_Data:
+ case SkType_DataInput:
case SkType_Discrete:
case SkType_Displayable:
case SkType_Drawable:
diff --git a/src/animator/SkDisplayType.h b/src/animator/SkDisplayType.h
index a29b2859e5..13ff2a1809 100644
--- a/src/animator/SkDisplayType.h
+++ b/src/animator/SkDisplayType.h
@@ -75,7 +75,7 @@ enum SkDisplayTypes {
SkType_Color,
SkType_CubicTo,
SkType_Dash,
- SkType_Data,
+ SkType_DataInput,
SkType_Discrete,
SkType_Displayable,
SkType_Drawable,
diff --git a/src/animator/SkDisplayable.h b/src/animator/SkDisplayable.h
index cbc96de30b..822f70ce36 100644
--- a/src/animator/SkDisplayable.h
+++ b/src/animator/SkDisplayable.h
@@ -96,7 +96,7 @@ public:
virtual bool setProperty(int index, SkScriptValue& );
void setReference(const SkMemberInfo* info, SkDisplayable* ref);
#ifdef SK_DEBUG
- bool isData() const { return getType() == SkType_Data; };
+ bool isDataInput() const { return getType() == SkType_DataInput; };
bool isEvent() const { return getType() == SkType_Event; }
virtual bool isMatrixPart() const { return false; }
bool isPatch() const { return getType() == SkType_3D_Patch; }
diff --git a/src/animator/SkIntArray.h b/src/animator/SkIntArray.h
index b2a49c19c0..ceffa94690 100644
--- a/src/animator/SkIntArray.h
+++ b/src/animator/SkIntArray.h
@@ -25,7 +25,7 @@
class SkActive;
class SkAnimateBase;
-class SkData;
+class SkDataInput;
class SkDisplayable;
class SkDisplayEvent;
class SkDrawable;
@@ -46,7 +46,7 @@ typedef SkIntArray(SkScalar) SkTDScalarArray;
typedef SkLongArray(SkActive*) SkTDActiveArray;
typedef SkLongArray(SkAnimateBase*) SkTDAnimateArray;
-typedef SkLongArray(SkData*) SkTDDataArray;
+typedef SkLongArray(SkDataInput*) SkTDDataArray;
typedef SkLongArray(SkDisplayable*) SkTDDisplayableArray;
typedef SkLongArray(SkDisplayEvent*) SkTDDisplayEventArray;
typedef SkLongArray(SkDrawable*) SkTDDrawableArray;
diff --git a/src/animator/SkPostParts.cpp b/src/animator/SkPostParts.cpp
index 254b17db14..01eb23c0f0 100644
--- a/src/animator/SkPostParts.cpp
+++ b/src/animator/SkPostParts.cpp
@@ -20,17 +20,17 @@
#if SK_USE_CONDENSED_INFO == 0
-const SkMemberInfo SkData::fInfo[] = {
+const SkMemberInfo SkDataInput::fInfo[] = {
SK_MEMBER_INHERITED
};
#endif
-DEFINE_GET_MEMBER(SkData);
+DEFINE_GET_MEMBER(SkDataInput);
-SkData::SkData() : fParent(NULL) {}
+SkDataInput::SkDataInput() : fParent(NULL) {}
-bool SkData::add() {
+bool SkDataInput::add() {
SkASSERT(name.size() > 0);
const char* dataName = name.c_str();
if (fInt != (int) SK_NaN32)
@@ -44,22 +44,22 @@ bool SkData::add() {
return false;
}
-void SkData::dirty() {
+void SkDataInput::dirty() {
fParent->dirty();
}
-SkDisplayable* SkData::getParent() const {
+SkDisplayable* SkDataInput::getParent() const {
return fParent;
}
-bool SkData::setParent(SkDisplayable* displayable) {
+bool SkDataInput::setParent(SkDisplayable* displayable) {
if (displayable->isPost() == false)
return true;
fParent = (SkPost*) displayable;
return false;
}
-void SkData::onEndElement(SkAnimateMaker&) {
+void SkDataInput::onEndElement(SkAnimateMaker&) {
add();
}
diff --git a/src/animator/SkPostParts.h b/src/animator/SkPostParts.h
index ef41fe5cdc..f20be561d9 100644
--- a/src/animator/SkPostParts.h
+++ b/src/animator/SkPostParts.h
@@ -22,9 +22,9 @@
class SkPost;
-class SkData: public SkInput {
- DECLARE_MEMBER_INFO(Data);
- SkData();
+class SkDataInput: public SkInput {
+ DECLARE_MEMBER_INFO(DataInput);
+ SkDataInput();
bool add();
virtual void dirty();
virtual SkDisplayable* getParent() const;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 19:31:19 +0000