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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/animator/SkDisplayTypes.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/SkDisplayRandom.h ('k') | src/animator/SkDrawBitmap.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 SkDisplayTypes_DEFINED 10 #ifndef SkDisplayTypes_DEFINED
(...skipping 16 matching lines...) Expand all
27 virtual void dirty(); 27 virtual void dirty();
28 private: 28 private:
29 SkTDDisplayableArray fDependents; 29 SkTDDisplayableArray fDependents;
30 typedef SkDisplayable INHERITED; 30 typedef SkDisplayable INHERITED;
31 }; 31 };
32 32
33 class SkDisplayBoolean : public SkDisplayDepend { 33 class SkDisplayBoolean : public SkDisplayDepend {
34 DECLARE_DISPLAY_MEMBER_INFO(Boolean); 34 DECLARE_DISPLAY_MEMBER_INFO(Boolean);
35 SkDisplayBoolean(); 35 SkDisplayBoolean();
36 #ifdef SK_DUMP_ENABLED 36 #ifdef SK_DUMP_ENABLED
37 virtual void dump(SkAnimateMaker* ); 37 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
38 #endif 38 #endif
39 SkBool value; 39 SkBool value;
40 friend class SkAnimatorScript; 40 friend class SkAnimatorScript;
41 friend class SkAnimatorScript_Box; 41 friend class SkAnimatorScript_Box;
42 friend class SkAnimatorScript_Unbox; 42 friend class SkAnimatorScript_Unbox;
43 typedef SkDisplayDepend INHERITED; 43 typedef SkDisplayDepend INHERITED;
44 }; 44 };
45 45
46 class SkDisplayInt : public SkDisplayDepend { 46 class SkDisplayInt : public SkDisplayDepend {
47 DECLARE_DISPLAY_MEMBER_INFO(Int); 47 DECLARE_DISPLAY_MEMBER_INFO(Int);
48 SkDisplayInt(); 48 SkDisplayInt();
49 #ifdef SK_DUMP_ENABLED 49 #ifdef SK_DUMP_ENABLED
50 virtual void dump(SkAnimateMaker* ); 50 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
51 #endif 51 #endif
52 private: 52 private:
53 int32_t value; 53 int32_t value;
54 friend class SkAnimatorScript; 54 friend class SkAnimatorScript;
55 friend class SkAnimatorScript_Box; 55 friend class SkAnimatorScript_Box;
56 friend class SkAnimatorScript_Unbox; 56 friend class SkAnimatorScript_Unbox;
57 typedef SkDisplayDepend INHERITED; 57 typedef SkDisplayDepend INHERITED;
58 }; 58 };
59 59
60 class SkDisplayFloat : public SkDisplayDepend { 60 class SkDisplayFloat : public SkDisplayDepend {
61 DECLARE_DISPLAY_MEMBER_INFO(Float); 61 DECLARE_DISPLAY_MEMBER_INFO(Float);
62 SkDisplayFloat(); 62 SkDisplayFloat();
63 #ifdef SK_DUMP_ENABLED 63 #ifdef SK_DUMP_ENABLED
64 virtual void dump(SkAnimateMaker* ); 64 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE;
65 #endif 65 #endif
66 private: 66 private:
67 SkScalar value; 67 SkScalar value;
68 friend class SkAnimatorScript; 68 friend class SkAnimatorScript;
69 friend class SkAnimatorScript_Box; 69 friend class SkAnimatorScript_Box;
70 friend class SkAnimatorScript_Unbox; 70 friend class SkAnimatorScript_Unbox;
71 typedef SkDisplayDepend INHERITED; 71 typedef SkDisplayDepend INHERITED;
72 }; 72 };
73 73
74 class SkDisplayString : public SkDisplayDepend { 74 class SkDisplayString : public SkDisplayDepend {
75 DECLARE_DISPLAY_MEMBER_INFO(String); 75 DECLARE_DISPLAY_MEMBER_INFO(String);
76 SkDisplayString(); 76 SkDisplayString();
77 SkDisplayString(SkString& ); 77 SkDisplayString(SkString& );
78 virtual void executeFunction(SkDisplayable* , int index, 78 virtual void executeFunction(SkDisplayable* , int index,
79 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, 79 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
80 SkScriptValue* ); 80 SkScriptValue* ) SK_OVERRIDE;
81 virtual const SkFunctionParamType* getFunctionsParameters(); 81 virtual const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
82 virtual bool getProperty(int index, SkScriptValue* ) const; 82 virtual bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE;
83 SkString value; 83 SkString value;
84 private: 84 private:
85 static const SkFunctionParamType fFunctionParameters[]; 85 static const SkFunctionParamType fFunctionParameters[];
86 }; 86 };
87 87
88 class SkDisplayArray : public SkDisplayDepend { 88 class SkDisplayArray : public SkDisplayDepend {
89 DECLARE_DISPLAY_MEMBER_INFO(Array); 89 DECLARE_DISPLAY_MEMBER_INFO(Array);
90 SkDisplayArray(); 90 SkDisplayArray();
91 SkDisplayArray(SkTypedArray& ); 91 SkDisplayArray(SkTypedArray& );
92 SkDisplayArray(SkOpArray& ); // compiled script experiment 92 SkDisplayArray(SkOpArray& ); // compiled script experiment
93 virtual ~SkDisplayArray(); 93 virtual ~SkDisplayArray();
94 virtual bool getProperty(int index, SkScriptValue* ) const; 94 virtual bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE;
95 private: 95 private:
96 SkTypedArray values; 96 SkTypedArray values;
97 friend class SkAnimator; 97 friend class SkAnimator;
98 friend class SkAnimatorScript; 98 friend class SkAnimatorScript;
99 friend class SkAnimatorScript2; 99 friend class SkAnimatorScript2;
100 friend class SkAnimatorScript_Unbox; 100 friend class SkAnimatorScript_Unbox;
101 friend class SkDisplayable; 101 friend class SkDisplayable;
102 friend struct SkMemberInfo; 102 friend struct SkMemberInfo;
103 friend class SkScriptEngine; 103 friend class SkScriptEngine;
104 }; 104 };
105 105
106 #endif // SkDisplayTypes_DEFINED 106 #endif // SkDisplayTypes_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayRandom.h ('k') | src/animator/SkDrawBitmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698