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

Unified Diff: src/animator/SkAnimateBase.h

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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
« no previous file with comments | « src/animator/SkAnimate.h ('k') | src/animator/SkAnimateSet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkAnimateBase.h
diff --git a/src/animator/SkAnimateBase.h b/src/animator/SkAnimateBase.h
index 63ee537bd34b007b3bfc3ea99c81da92029f2941..69272977b94a76287e781a123a977ea60bf6a47c 100644
--- a/src/animator/SkAnimateBase.h
+++ b/src/animator/SkAnimateBase.h
@@ -24,26 +24,26 @@ public:
SkAnimateBase();
virtual ~SkAnimateBase();
virtual int components();
- virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- virtual void dirty() SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ void dirty() SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
int entries() { return fValues.count() / components(); }
virtual bool hasExecute() const;
bool isDynamic() const { return SkToBool(fDynamic); }
- virtual SkDisplayable* getParent() const SK_OVERRIDE;
- virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ SkDisplayable* getParent() const SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
SkMSec getStart() const { return fStart; }
SkOperand* getValues() { return fValues.begin(); }
SkDisplayTypes getValuesType() { return fValues.getType(); }
- virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
void packARGB(SkScalar [], int count, SkTDOperandArray* );
virtual void refresh(SkAnimateMaker& );
void setChanged(bool changed) { fChanged = changed; }
void setHasEndEvent() { fHasEndEvent = true; }
- virtual bool setParent(SkDisplayable* ) SK_OVERRIDE;
- virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
+ bool setParent(SkDisplayable* ) SK_OVERRIDE;
+ bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
void setTarget(SkAnimateMaker& );
virtual bool targetNeedsInitialization() const;
protected:
« no previous file with comments | « src/animator/SkAnimate.h ('k') | src/animator/SkAnimateSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698