aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/animator/SkDrawMatrix.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-01-09 10:06:39 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-09 10:06:40 -0800
commit72c9faab45124e08c85f70ca38536914862d947c (patch)
tree611893b84bb33b1592d058ee0f2382f7f86601b8 /src/animator/SkDrawMatrix.h
parent4490da227f1475fb66af20532c14d6d9febd18b6 (diff)
Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line, which should be the bulk of cases. We'll have to manually clean up the rest over time unless I level up in regexes. for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end BUG=skia: Review URL: https://codereview.chromium.org/806653007
Diffstat (limited to 'src/animator/SkDrawMatrix.h')
-rw-r--r--src/animator/SkDrawMatrix.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/animator/SkDrawMatrix.h b/src/animator/SkDrawMatrix.h
index 60eb8e7db7..d5e19a59e9 100644
--- a/src/animator/SkDrawMatrix.h
+++ b/src/animator/SkDrawMatrix.h
@@ -21,25 +21,25 @@ class SkDrawMatrix : public SkADrawable {
DECLARE_DRAW_MEMBER_INFO(Matrix);
SkDrawMatrix();
virtual ~SkDrawMatrix();
- virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- virtual bool childrenNeedDisposing() const SK_OVERRIDE;
- virtual void dirty() SK_OVERRIDE;
- virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ bool childrenNeedDisposing() const SK_OVERRIDE;
+ void dirty() SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
- virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) SK_OVERRIDE;
#endif
SkMatrix& getMatrix();
- virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- virtual void initialize() SK_OVERRIDE;
- virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- virtual void setChildHasID() SK_OVERRIDE;
- virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ void initialize() SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void setChildHasID() SK_OVERRIDE;
+ bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
void concat(SkMatrix& inMatrix) {
fConcat.preConcat(inMatrix);
}
- virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
void rotate(SkScalar degrees, SkPoint& center) {