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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/animator/SkAnimateBase.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/SkAnimate.h ('k') | src/animator/SkAnimateSet.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 SkAnimateBase_DEFINED 10 #ifndef SkAnimateBase_DEFINED
11 #define SkAnimateBase_DEFINED 11 #define SkAnimateBase_DEFINED
12 12
13 #include "SkDisplayable.h" 13 #include "SkDisplayable.h"
14 #include "SkMath.h" 14 #include "SkMath.h"
15 #include "SkMemberInfo.h" 15 #include "SkMemberInfo.h"
16 #include "SkTypedArray.h" 16 #include "SkTypedArray.h"
17 17
18 class SkApply; 18 class SkApply;
19 class SkADrawable; 19 class SkADrawable;
20 20
21 class SkAnimateBase : public SkDisplayable { 21 class SkAnimateBase : public SkDisplayable {
22 public: 22 public:
23 DECLARE_MEMBER_INFO(AnimateBase); 23 DECLARE_MEMBER_INFO(AnimateBase);
24 SkAnimateBase(); 24 SkAnimateBase();
25 virtual ~SkAnimateBase(); 25 virtual ~SkAnimateBase();
26 virtual int components(); 26 virtual int components();
27 virtual SkDisplayable* deepCopy(SkAnimateMaker* ); 27 virtual SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
28 virtual void dirty(); 28 virtual void dirty() 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 #endif 31 #endif
32 int entries() { return fValues.count() / components(); } 32 int entries() { return fValues.count() / components(); }
33 virtual bool hasExecute() const; 33 virtual bool hasExecute() const;
34 bool isDynamic() const { return SkToBool(fDynamic); } 34 bool isDynamic() const { return SkToBool(fDynamic); }
35 virtual SkDisplayable* getParent() const; 35 virtual SkDisplayable* getParent() const SK_OVERRIDE;
36 virtual bool getProperty(int index, SkScriptValue* value) const; 36 virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
37 SkMSec getStart() const { return fStart; } 37 SkMSec getStart() const { return fStart; }
38 SkOperand* getValues() { return fValues.begin(); } 38 SkOperand* getValues() { return fValues.begin(); }
39 SkDisplayTypes getValuesType() { return fValues.getType(); } 39 SkDisplayTypes getValuesType() { return fValues.getType(); }
40 virtual void onEndElement(SkAnimateMaker& ); 40 virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
41 void packARGB(SkScalar [], int count, SkTDOperandArray* ); 41 void packARGB(SkScalar [], int count, SkTDOperandArray* );
42 virtual void refresh(SkAnimateMaker& ); 42 virtual void refresh(SkAnimateMaker& );
43 void setChanged(bool changed) { fChanged = changed; } 43 void setChanged(bool changed) { fChanged = changed; }
44 void setHasEndEvent() { fHasEndEvent = true; } 44 void setHasEndEvent() { fHasEndEvent = true; }
45 virtual bool setParent(SkDisplayable* ); 45 virtual bool setParent(SkDisplayable* ) SK_OVERRIDE;
46 virtual bool setProperty(int index, SkScriptValue& value); 46 virtual bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
47 void setTarget(SkAnimateMaker& ); 47 void setTarget(SkAnimateMaker& );
48 virtual bool targetNeedsInitialization() const; 48 virtual bool targetNeedsInitialization() const;
49 protected: 49 protected:
50 SkMSec begin; 50 SkMSec begin;
51 SkTDScalarArray blend; 51 SkTDScalarArray blend;
52 SkMSec dur; 52 SkMSec dur;
53 // !!! make field part of a union with fFieldInfo, or fValues, something kno wn later? 53 // !!! make field part of a union with fFieldInfo, or fValues, something kno wn later?
54 SkString field; // temporary; once target is known, this is reset 54 SkString field; // temporary; once target is known, this is reset
55 SkString formula; 55 SkString formula;
56 SkString from; 56 SkString from;
(...skipping 17 matching lines...) Expand all
74 unsigned fResetPending : 1; 74 unsigned fResetPending : 1;
75 unsigned fTargetIsScope : 1; 75 unsigned fTargetIsScope : 1;
76 private: 76 private:
77 typedef SkDisplayable INHERITED; 77 typedef SkDisplayable INHERITED;
78 friend class SkActive; 78 friend class SkActive;
79 friend class SkApply; 79 friend class SkApply;
80 friend class SkDisplayList; 80 friend class SkDisplayList;
81 }; 81 };
82 82
83 #endif // SkAnimateBase_DEFINED 83 #endif // SkAnimateBase_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkAnimate.h ('k') | src/animator/SkAnimateSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698