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

Side by Side Diff: src/animator/SkDisplayAdd.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, 8 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/SkAnimateSet.h ('k') | src/animator/SkDisplayApply.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 SkDisplayAdd_DEFINED 10 #ifndef SkDisplayAdd_DEFINED
11 #define SkDisplayAdd_DEFINED 11 #define SkDisplayAdd_DEFINED
12 12
13 #include "SkADrawable.h" 13 #include "SkADrawable.h"
14 #include "SkMemberInfo.h" 14 #include "SkMemberInfo.h"
15 15
16 class SkAdd : public SkADrawable { 16 class SkAdd : public SkADrawable {
17 DECLARE_MEMBER_INFO(Add); 17 DECLARE_MEMBER_INFO(Add);
18 SkAdd(); 18 SkAdd();
19 19
20 enum Mode { 20 enum Mode {
21 kMode_indirect, 21 kMode_indirect,
22 kMode_immediate 22 kMode_immediate
23 }; 23 };
24 24
25 SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; 25 SkDisplayable* deepCopy(SkAnimateMaker* ) override;
26 bool draw(SkAnimateMaker& ) SK_OVERRIDE; 26 bool draw(SkAnimateMaker& ) override;
27 #ifdef SK_DUMP_ENABLED 27 #ifdef SK_DUMP_ENABLED
28 void dump(SkAnimateMaker* ) SK_OVERRIDE; 28 void dump(SkAnimateMaker* ) override;
29 #endif 29 #endif
30 bool enable(SkAnimateMaker& ) SK_OVERRIDE; 30 bool enable(SkAnimateMaker& ) override;
31 bool hasEnable() const SK_OVERRIDE; 31 bool hasEnable() const override;
32 void initialize() SK_OVERRIDE; 32 void initialize() override;
33 bool isDrawable() const SK_OVERRIDE; 33 bool isDrawable() const override;
34 protected: 34 protected:
35 // struct _A { 35 // struct _A {
36 Mode mode; 36 Mode mode;
37 int32_t offset; 37 int32_t offset;
38 SkADrawable* use; 38 SkADrawable* use;
39 SkADrawable* where; // if NULL, offset becomes index 39 SkADrawable* where; // if NULL, offset becomes index
40 // } A; 40 // } A;
41 private: 41 private:
42 typedef SkADrawable INHERITED; 42 typedef SkADrawable INHERITED;
43 }; 43 };
(...skipping 18 matching lines...) Expand all
62 typedef SkAdd INHERITED; 62 typedef SkAdd INHERITED;
63 }; 63 };
64 64
65 class SkReplace : public SkAdd { 65 class SkReplace : public SkAdd {
66 DECLARE_MEMBER_INFO(Replace); 66 DECLARE_MEMBER_INFO(Replace);
67 private: 67 private:
68 typedef SkAdd INHERITED; 68 typedef SkAdd INHERITED;
69 }; 69 };
70 70
71 #endif // SkDisplayAdd_DEFINED 71 #endif // SkDisplayAdd_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkAnimateSet.h ('k') | src/animator/SkDisplayApply.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698