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

Side by Side Diff: src/animator/SkDump.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/SkDrawTransparentShader.h ('k') | src/animator/SkHitClear.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 SkDump_DEFINED 10 #ifndef SkDump_DEFINED
11 #define SkDump_DEFINED 11 #define SkDump_DEFINED
12 12
13 #include "SkDisplayable.h" 13 #include "SkDisplayable.h"
14 #include "SkMemberInfo.h" 14 #include "SkMemberInfo.h"
15 15
16 class SkAnimateMaker; 16 class SkAnimateMaker;
17 class SkString; 17 class SkString;
18 18
19 class SkDump : public SkDisplayable { 19 class SkDump : public SkDisplayable {
20 DECLARE_MEMBER_INFO(Dump); 20 DECLARE_MEMBER_INFO(Dump);
21 #ifdef SK_DUMP_ENABLED 21 #ifdef SK_DUMP_ENABLED
22 SkDump(); 22 SkDump();
23 bool enable(SkAnimateMaker & ) SK_OVERRIDE; 23 bool enable(SkAnimateMaker & ) override;
24 bool evaluate(SkAnimateMaker &); 24 bool evaluate(SkAnimateMaker &);
25 bool hasEnable() const SK_OVERRIDE; 25 bool hasEnable() const override;
26 static void GetEnumString(SkDisplayTypes , int index, SkString* result); 26 static void GetEnumString(SkDisplayTypes , int index, SkString* result);
27 SkBool displayList; 27 SkBool displayList;
28 SkBool eventList; 28 SkBool eventList;
29 SkBool events; 29 SkBool events;
30 SkString name; 30 SkString name;
31 SkBool groups; 31 SkBool groups;
32 SkBool posts; 32 SkBool posts;
33 SkString script; 33 SkString script;
34 #else 34 #else
35 virtual bool enable(SkAnimateMaker & ); 35 virtual bool enable(SkAnimateMaker & );
36 virtual bool hasEnable() const; 36 virtual bool hasEnable() const;
37 virtual bool setProperty(int index, SkScriptValue& ); 37 virtual bool setProperty(int index, SkScriptValue& );
38 #endif 38 #endif
39 }; 39 };
40 40
41 41
42 #endif // SkDump_DEFINED 42 #endif // SkDump_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDrawTransparentShader.h ('k') | src/animator/SkHitClear.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698