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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/animator/SkDisplayApply.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/SkDisplayAdd.h ('k') | src/animator/SkDisplayBounds.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 SkDisplayApply_DEFINED 10 #ifndef SkDisplayApply_DEFINED
(...skipping 20 matching lines...) Expand all
31 enum Mode { 31 enum Mode {
32 kMode_create, 32 kMode_create,
33 kMode_immediate, 33 kMode_immediate,
34 //kMode_once 34 //kMode_once
35 }; 35 };
36 void activate(SkAnimateMaker& ); 36 void activate(SkAnimateMaker& );
37 void append(SkApply* apply); 37 void append(SkApply* apply);
38 void appendActive(SkActive* ); 38 void appendActive(SkActive* );
39 void applyValues(int animatorIndex, SkOperand* values, int count, 39 void applyValues(int animatorIndex, SkOperand* values, int count,
40 SkDisplayTypes , SkMSec time); 40 SkDisplayTypes , SkMSec time);
41 bool contains(SkDisplayable*) SK_OVERRIDE; 41 bool contains(SkDisplayable*) override;
42 // void createActive(SkAnimateMaker& ); 42 // void createActive(SkAnimateMaker& );
43 SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; 43 SkDisplayable* deepCopy(SkAnimateMaker* ) override;
44 void disable(); 44 void disable();
45 bool draw(SkAnimateMaker& ) SK_OVERRIDE; 45 bool draw(SkAnimateMaker& ) override;
46 #ifdef SK_DUMP_ENABLED 46 #ifdef SK_DUMP_ENABLED
47 void dump(SkAnimateMaker* ) SK_OVERRIDE; 47 void dump(SkAnimateMaker* ) override;
48 #endif 48 #endif
49 bool enable(SkAnimateMaker& ) SK_OVERRIDE; 49 bool enable(SkAnimateMaker& ) override;
50 void enableCreate(SkAnimateMaker& ); 50 void enableCreate(SkAnimateMaker& );
51 void enableDynamic(SkAnimateMaker& ); 51 void enableDynamic(SkAnimateMaker& );
52 void endSave(int index); 52 void endSave(int index);
53 Mode getMode() { return mode; } 53 Mode getMode() { return mode; }
54 bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; 54 bool getProperty(int index, SkScriptValue* value) const override;
55 SkADrawable* getScope() { return scope; } 55 SkADrawable* getScope() { return scope; }
56 void getStep(SkScriptValue* ); 56 void getStep(SkScriptValue* );
57 SkADrawable* getTarget(SkAnimateBase* ); 57 SkADrawable* getTarget(SkAnimateBase* );
58 bool hasDelayedAnimator() const; 58 bool hasDelayedAnimator() const;
59 bool hasEnable() const SK_OVERRIDE; 59 bool hasEnable() const override;
60 bool inactivate(SkAnimateMaker& maker); 60 bool inactivate(SkAnimateMaker& maker);
61 void initialize() SK_OVERRIDE; 61 void initialize() override;
62 bool interpolate(SkAnimateMaker& , SkMSec time); 62 bool interpolate(SkAnimateMaker& , SkMSec time);
63 void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; 63 void onEndElement(SkAnimateMaker& ) override;
64 const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; 64 const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
65 void refresh(SkAnimateMaker& ); 65 void refresh(SkAnimateMaker& );
66 void reset(); 66 void reset();
67 bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) S K_OVERRIDE; 67 bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) o verride;
68 bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str); 68 bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str);
69 void save(int index); 69 void save(int index);
70 void setEmbedded() { fEmbedded = true; } 70 void setEmbedded() { fEmbedded = true; }
71 bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; 71 bool setProperty(int index, SkScriptValue& ) override;
72 void setSteps(int _steps) SK_OVERRIDE; 72 void setSteps(int _steps) override;
73 // virtual void setTime(SkMSec time); 73 // virtual void setTime(SkMSec time);
74 #ifdef SK_DEBUG 74 #ifdef SK_DEBUG
75 void validate() SK_OVERRIDE; 75 void validate() override;
76 #endif 76 #endif
77 private: 77 private:
78 SkMSec begin; 78 SkMSec begin;
79 SkBool dontDraw; 79 SkBool dontDraw;
80 SkString dynamicScope; 80 SkString dynamicScope;
81 SkMSec interval; 81 SkMSec interval;
82 Mode mode; 82 Mode mode;
83 #if 0 83 #if 0
84 SkBool pickup; 84 SkBool pickup;
85 #endif 85 #endif
(...skipping 11 matching lines...) Expand all
97 SkBool fDeleteScope : 1; 97 SkBool fDeleteScope : 1;
98 SkBool fEmbedded : 1; 98 SkBool fEmbedded : 1;
99 SkBool fEnabled : 1; 99 SkBool fEnabled : 1;
100 SkBool fEnabling : 1; // set if calling interpolate from enable 100 SkBool fEnabling : 1; // set if calling interpolate from enable
101 friend class SkActive; 101 friend class SkActive;
102 friend class SkDisplayList; 102 friend class SkDisplayList;
103 typedef SkADrawable INHERITED; 103 typedef SkADrawable INHERITED;
104 }; 104 };
105 105
106 #endif // SkDisplayApply_DEFINED 106 #endif // SkDisplayApply_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayAdd.h ('k') | src/animator/SkDisplayBounds.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698