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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « src/animator/SkDisplayBounds.h ('k') | src/animator/SkDisplayInclude.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkDisplayEvent_DEFINED 10 #ifndef SkDisplayEvent_DEFINED
(...skipping 16 matching lines...) Expand all
27 kMouseDown, 27 kMouseDown,
28 kMouseDrag, 28 kMouseDrag,
29 kMouseMove, 29 kMouseMove,
30 kMouseUp, 30 kMouseUp,
31 kOnEnd, 31 kOnEnd,
32 kOnload, 32 kOnload,
33 kUser 33 kUser
34 }; 34 };
35 SkDisplayEvent(); 35 SkDisplayEvent();
36 virtual ~SkDisplayEvent(); 36 virtual ~SkDisplayEvent();
37 bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; 37 bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
38 bool contains(SkDisplayable*) SK_OVERRIDE; 38 bool contains(SkDisplayable*) override;
39 SkDisplayable* contains(const SkString& ) SK_OVERRIDE; 39 SkDisplayable* contains(const SkString& ) override;
40 #ifdef SK_DEBUG 40 #ifdef SK_DEBUG
41 void dumpEvent(SkAnimateMaker* ); 41 void dumpEvent(SkAnimateMaker* );
42 #endif 42 #endif
43 bool enableEvent(SkAnimateMaker& ); 43 bool enableEvent(SkAnimateMaker& );
44 bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE; 44 bool getProperty(int index, SkScriptValue* ) const override;
45 void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; 45 void onEndElement(SkAnimateMaker& maker) override;
46 void populateInput(SkAnimateMaker& , const SkEvent& fEvent); 46 void populateInput(SkAnimateMaker& , const SkEvent& fEvent);
47 bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; 47 bool setProperty(int index, SkScriptValue& ) override;
48 protected: 48 protected:
49 SkKey code; 49 SkKey code;
50 SkBool disable; 50 SkBool disable;
51 Kind kind; 51 Kind kind;
52 SkString target; 52 SkString target;
53 SkScalar x; 53 SkScalar x;
54 SkScalar y; 54 SkScalar y;
55 SkTDDisplayableArray fChildren; 55 SkTDDisplayableArray fChildren;
56 mutable SkString fKeyString; 56 mutable SkString fKeyString;
57 SkKey fLastCode; // last key to trigger this event 57 SkKey fLastCode; // last key to trigger this event
58 SkKey fMax; // if the code expresses a range 58 SkKey fMax; // if the code expresses a range
59 SkDisplayable* fTarget; // used by onEnd 59 SkDisplayable* fTarget; // used by onEnd
60 private: 60 private:
61 void deleteMembers(); 61 void deleteMembers();
62 friend class SkEvents; 62 friend class SkEvents;
63 typedef SkDisplayable INHERITED; 63 typedef SkDisplayable INHERITED;
64 }; 64 };
65 65
66 #endif // SkDisplayEvent_DEFINED 66 #endif // SkDisplayEvent_DEFINED
OLDNEW
« 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