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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/animator/SkDrawGroup.h

Issue 815883002: Cleanup: Another round of override fixes. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: revert include changes Created 6 years 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/SkDrawGradient.h ('k') | src/animator/SkDrawMatrix.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 SkDrawGroup_DEFINED 10 #ifndef SkDrawGroup_DEFINED
11 #define SkDrawGroup_DEFINED 11 #define SkDrawGroup_DEFINED
12 12
13 #include "SkADrawable.h" 13 #include "SkADrawable.h"
14 #include "SkIntArray.h" 14 #include "SkIntArray.h"
15 #include "SkMemberInfo.h" 15 #include "SkMemberInfo.h"
16 16
17 class SkGroup : public SkADrawable { //interface for schema element <g> 17 class SkGroup : public SkADrawable { //interface for schema element <g>
18 public: 18 public:
19 DECLARE_MEMBER_INFO(Group); 19 DECLARE_MEMBER_INFO(Group);
20 SkGroup(); 20 SkGroup();
21 virtual ~SkGroup(); 21 virtual ~SkGroup();
22 virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE; 22 virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
23 virtual bool contains(SkDisplayable* ); 23 virtual bool contains(SkDisplayable* ) SK_OVERRIDE;
24 SkGroup* copy(); 24 SkGroup* copy();
25 SkBool copySet(int index); 25 SkBool copySet(int index);
26 virtual SkDisplayable* deepCopy(SkAnimateMaker* ); 26 virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
27 virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state ); 27 virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRID E;
28 virtual bool draw(SkAnimateMaker& ); 28 virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
29 #ifdef SK_DUMP_ENABLED 29 #ifdef SK_DUMP_ENABLED
30 virtual void dump(SkAnimateMaker* ); 30 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
31 virtual void dumpDrawables(SkAnimateMaker* ); 31 virtual void dumpDrawables(SkAnimateMaker* );
32 virtual void dumpEvents(); 32 virtual void dumpEvents() SK_OVERRIDE;
33 #endif 33 #endif
34 int findGroup(SkADrawable* drawable, SkTDDrawableArray** list, 34 int findGroup(SkADrawable* drawable, SkTDDrawableArray** list,
35 SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList); 35 SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList);
36 virtual bool enable(SkAnimateMaker& ); 36 virtual bool enable(SkAnimateMaker& ) SK_OVERRIDE;
37 SkTDDrawableArray* getChildren() { return &fChildren; } 37 SkTDDrawableArray* getChildren() { return &fChildren; }
38 SkGroup* getOriginal() { return fOriginal; } 38 SkGroup* getOriginal() { return fOriginal; }
39 virtual bool hasEnable() const; 39 virtual bool hasEnable() const SK_OVERRIDE;
40 virtual void initialize(); 40 virtual void initialize() SK_OVERRIDE;
41 SkBool isACopy() { return fOriginal != NULL; } 41 SkBool isACopy() { return fOriginal != NULL; }
42 void markCopyClear(int index); 42 void markCopyClear(int index);
43 void markCopySet(int index); 43 void markCopySet(int index);
44 void markCopySize(int index); 44 void markCopySize(int index);
45 bool markedForDelete(int index) const { return (fCopies[index >> 5] & 1 << ( index & 0x1f)) == 0; } 45 bool markedForDelete(int index) const { return (fCopies[index >> 5] & 1 << ( index & 0x1f)) == 0; }
46 void reset(); 46 void reset();
47 bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ); 47 bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) S K_OVERRIDE;
48 virtual void setSteps(int steps); 48 virtual void setSteps(int steps) SK_OVERRIDE;
49 #ifdef SK_DEBUG 49 #ifdef SK_DEBUG
50 virtual void validate(); 50 virtual void validate() SK_OVERRIDE;
51 #endif 51 #endif
52 protected: 52 protected:
53 bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable, 53 bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable,
54 SkString& conditionString); 54 SkString& conditionString);
55 SkString condition; 55 SkString condition;
56 SkString enableCondition; 56 SkString enableCondition;
57 SkTDDrawableArray fChildren; 57 SkTDDrawableArray fChildren;
58 SkTDDrawableArray* fParentList; 58 SkTDDrawableArray* fParentList;
59 SkTDIntArray fCopies; 59 SkTDIntArray fCopies;
60 SkGroup* fOriginal; 60 SkGroup* fOriginal;
61 private: 61 private:
62 typedef SkADrawable INHERITED; 62 typedef SkADrawable INHERITED;
63 }; 63 };
64 64
65 class SkSave: public SkGroup { 65 class SkSave: public SkGroup {
66 DECLARE_MEMBER_INFO(Save); 66 DECLARE_MEMBER_INFO(Save);
67 virtual bool draw(SkAnimateMaker& ); 67 virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE;
68 private: 68 private:
69 typedef SkGroup INHERITED; 69 typedef SkGroup INHERITED;
70 }; 70 };
71 71
72 #endif // SkDrawGroup_DEFINED 72 #endif // SkDrawGroup_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDrawGradient.h ('k') | src/animator/SkDrawMatrix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698