diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
| commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
| tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /src/animator/SkDisplayEvent.h | |
| parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (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/SkDisplayEvent.h')
| -rw-r--r-- | src/animator/SkDisplayEvent.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h index 92eb8cf2e9..4da49b989f 100644 --- a/src/animator/SkDisplayEvent.h +++ b/src/animator/SkDisplayEvent.h @@ -34,17 +34,17 @@ class SkDisplayEvent : public SkDisplayable { }; SkDisplayEvent(); virtual ~SkDisplayEvent(); - virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; - virtual bool contains(SkDisplayable*) SK_OVERRIDE; - virtual SkDisplayable* contains(const SkString& ) SK_OVERRIDE; + bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; + bool contains(SkDisplayable*) SK_OVERRIDE; + SkDisplayable* contains(const SkString& ) SK_OVERRIDE; #ifdef SK_DEBUG void dumpEvent(SkAnimateMaker* ); #endif bool enableEvent(SkAnimateMaker& ); - virtual bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; - virtual void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; + bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; + void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; void populateInput(SkAnimateMaker& , const SkEvent& fEvent); - virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; + bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; protected: SkKey code; SkBool disable; |