diff options
| author |  reed <reed@chromium.org> | 2014-11-26 08:50:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-26 08:50:45 -0800 |
| commit | 986ca61cf7be3ec590f8820e9b7ba042ac2948fe (patch) | |
| tree | cae88b225a53c3151006b4f18510cc16d59d6c39 /src/animator/SkDisplayApply.h | |
| parent | adc8d984678a64e30f3c70b2d76ba1e8345566bb (diff) | |
rename SkDrawable to SkADrawable
BUG=skia:
Review URL: https://codereview.chromium.org/764463002
Diffstat (limited to 'src/animator/SkDisplayApply.h')
| -rw-r--r-- | src/animator/SkDisplayApply.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/animator/SkDisplayApply.h b/src/animator/SkDisplayApply.h index e128c2929d..0cfab51031 100644 --- a/src/animator/SkDisplayApply.h +++ b/src/animator/SkDisplayApply.h @@ -11,12 +11,12 @@ #define SkDisplayApply_DEFINED #include "SkAnimateBase.h" -#include "SkDrawable.h" +#include "SkADrawable.h" #include "SkIntArray.h" class SkActive; -class SkApply : public SkDrawable { +class SkApply : public SkADrawable { DECLARE_MEMBER_INFO(Apply); public: @@ -52,9 +52,9 @@ public: void endSave(int index); Mode getMode() { return mode; } virtual bool getProperty(int index, SkScriptValue* value) const; - SkDrawable* getScope() { return scope; } + SkADrawable* getScope() { return scope; } void getStep(SkScriptValue* ); - SkDrawable* getTarget(SkAnimateBase* ); + SkADrawable* getTarget(SkAnimateBase* ); bool hasDelayedAnimator() const; virtual bool hasEnable() const; bool inactivate(SkAnimateMaker& maker); @@ -84,12 +84,12 @@ private: SkBool pickup; #endif SkBool restore; - SkDrawable* scope; + SkADrawable* scope; int32_t steps; Transition transition; SkActive* fActive; SkTDAnimateArray fAnimators; -// SkDrawable* fCurrentScope; +// SkADrawable* fCurrentScope; SkMSec fLastTime; // used only to return script property time SkTDDrawableArray fScopes; SkBool fAppended : 1; @@ -100,7 +100,7 @@ private: SkBool fEnabling : 1; // set if calling interpolate from enable friend class SkActive; friend class SkDisplayList; - typedef SkDrawable INHERITED; + typedef SkADrawable INHERITED; }; #endif // SkDisplayApply_DEFINED |