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

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

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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/SkDisplayPost.h ('k') | src/animator/SkDisplayTypes.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 SkDisplayRandom_DEFINED 10 #ifndef SkDisplayRandom_DEFINED
11 #define SkDisplayRandom_DEFINED 11 #define SkDisplayRandom_DEFINED
12 12
13 #include "SkDisplayable.h" 13 #include "SkDisplayable.h"
14 #include "SkMemberInfo.h" 14 #include "SkMemberInfo.h"
15 #include "SkRandom.h" 15 #include "SkRandom.h"
16 16
17 #ifdef min 17 #ifdef min
18 #undef min 18 #undef min
19 #endif 19 #endif
20 20
21 #ifdef max 21 #ifdef max
22 #undef max 22 #undef max
23 #endif 23 #endif
24 24
25 class SkDisplayRandom : public SkDisplayable { 25 class SkDisplayRandom : public SkDisplayable {
26 DECLARE_DISPLAY_MEMBER_INFO(Random); 26 DECLARE_DISPLAY_MEMBER_INFO(Random);
27 SkDisplayRandom(); 27 SkDisplayRandom();
28 #ifdef SK_DUMP_ENABLED 28 #ifdef SK_DUMP_ENABLED
29 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; 29 void dump(SkAnimateMaker* ) SK_OVERRIDE;
30 #endif 30 #endif
31 virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; 31 bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
32 virtual bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; 32 bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
33 private: 33 private:
34 SkScalar blend; 34 SkScalar blend;
35 SkScalar min; 35 SkScalar min;
36 SkScalar max; 36 SkScalar max;
37 mutable SkRandom fRandom; 37 mutable SkRandom fRandom;
38 }; 38 };
39 39
40 #endif // SkDisplayRandom_DEFINED 40 #endif // SkDisplayRandom_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDisplayPost.h ('k') | src/animator/SkDisplayTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698