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

Unified Diff: src/animator/SkDisplayEvent.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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/SkDisplayBounds.h ('k') | src/animator/SkDisplayInclude.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkDisplayEvent.h
diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h
index 4da49b989fb2439d2987b8e030b65e6a9ce3bc7e..d223771a7d60be9c7877cc14f9fc98bacd89a1b8 100644
--- a/src/animator/SkDisplayEvent.h
+++ b/src/animator/SkDisplayEvent.h
@@ -34,17 +34,17 @@ class SkDisplayEvent : public SkDisplayable {
};
SkDisplayEvent();
virtual ~SkDisplayEvent();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- bool contains(SkDisplayable*) SK_OVERRIDE;
- SkDisplayable* contains(const SkString& ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+ bool contains(SkDisplayable*) override;
+ SkDisplayable* contains(const SkString& ) override;
#ifdef SK_DEBUG
void dumpEvent(SkAnimateMaker* );
#endif
bool enableEvent(SkAnimateMaker& );
- bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* ) const override;
+ void onEndElement(SkAnimateMaker& maker) override;
void populateInput(SkAnimateMaker& , const SkEvent& fEvent);
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool setProperty(int index, SkScriptValue& ) override;
protected:
SkKey code;
SkBool disable;
« no previous file with comments | « src/animator/SkDisplayBounds.h ('k') | src/animator/SkDisplayInclude.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698