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

Side by Side Diff: src/animator/SkDisplayPost.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/SkDisplayNumber.h ('k') | src/animator/SkDisplayRandom.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 SkDisplayPost_DEFINED 10 #ifndef SkDisplayPost_DEFINED
11 #define SkDisplayPost_DEFINED 11 #define SkDisplayPost_DEFINED
12 12
13 #include "SkDisplayable.h" 13 #include "SkDisplayable.h"
14 #include "SkEvent.h" 14 #include "SkEvent.h"
15 #include "SkEventSink.h" 15 #include "SkEventSink.h"
16 #include "SkMemberInfo.h" 16 #include "SkMemberInfo.h"
17 #include "SkIntArray.h" 17 #include "SkIntArray.h"
18 18
19 class SkDataInput; 19 class SkDataInput;
20 class SkAnimateMaker; 20 class SkAnimateMaker;
21 21
22 class SkPost : public SkDisplayable { 22 class SkPost : public SkDisplayable {
23 DECLARE_MEMBER_INFO(Post); 23 DECLARE_MEMBER_INFO(Post);
24 enum Mode { 24 enum Mode {
25 kDeferred, 25 kDeferred,
26 kImmediate 26 kImmediate
27 }; 27 };
28 SkPost(); 28 SkPost();
29 virtual ~SkPost(); 29 virtual ~SkPost();
30 bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; 30 bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
31 bool childrenNeedDisposing() const SK_OVERRIDE; 31 bool childrenNeedDisposing() const override;
32 void dirty() SK_OVERRIDE; 32 void dirty() override;
33 #ifdef SK_DUMP_ENABLED 33 #ifdef SK_DUMP_ENABLED
34 void dump(SkAnimateMaker* ) SK_OVERRIDE; 34 void dump(SkAnimateMaker* ) override;
35 #endif 35 #endif
36 bool enable(SkAnimateMaker& ) SK_OVERRIDE; 36 bool enable(SkAnimateMaker& ) override;
37 bool hasEnable() const SK_OVERRIDE; 37 bool hasEnable() const override;
38 void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; 38 void onEndElement(SkAnimateMaker& ) override;
39 void setChildHasID() SK_OVERRIDE; 39 void setChildHasID() override;
40 bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; 40 bool setProperty(int index, SkScriptValue& ) override;
41 protected: 41 protected:
42 SkMSec delay; 42 SkMSec delay;
43 SkString sink; 43 SkString sink;
44 // SkBool initialized; 44 // SkBool initialized;
45 Mode mode; 45 Mode mode;
46 SkEvent fEvent; 46 SkEvent fEvent;
47 SkAnimateMaker* fMaker; 47 SkAnimateMaker* fMaker;
48 SkTDDataArray fParts; 48 SkTDDataArray fParts;
49 SkEventSinkID fSinkID; 49 SkEventSinkID fSinkID;
50 SkAnimateMaker* fTargetMaker; 50 SkAnimateMaker* fTargetMaker;
51 SkBool8 fChildHasID; 51 SkBool8 fChildHasID;
52 SkBool8 fDirty; 52 SkBool8 fDirty;
53 private: 53 private:
54 void findSinkID(); 54 void findSinkID();
55 friend class SkDataInput; 55 friend class SkDataInput;
56 typedef SkDisplayable INHERITED; 56 typedef SkDisplayable INHERITED;
57 }; 57 };
58 58
59 #endif //SkDisplayPost_DEFINED 59 #endif //SkDisplayPost_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayNumber.h ('k') | src/animator/SkDisplayRandom.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698