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

Side by Side Diff: src/animator/SkPathParts.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/SkPaintPart.h ('k') | src/animator/SkPostParts.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 SkPathParts_DEFINED 10 #ifndef SkPathParts_DEFINED
(...skipping 16 matching lines...) Expand all
27 #ifdef SK_DEBUG 27 #ifdef SK_DEBUG
28 virtual bool isPathPart() const { return true; } 28 virtual bool isPathPart() const { return true; }
29 #endif 29 #endif
30 protected: 30 protected:
31 SkDrawPath* fPath; 31 SkDrawPath* fPath;
32 }; 32 };
33 33
34 class SkMoveTo : public SkPathPart { 34 class SkMoveTo : public SkPathPart {
35 DECLARE_MEMBER_INFO(MoveTo); 35 DECLARE_MEMBER_INFO(MoveTo);
36 SkMoveTo(); 36 SkMoveTo();
37 bool add() SK_OVERRIDE; 37 bool add() override;
38 protected: 38 protected:
39 SkScalar x; 39 SkScalar x;
40 SkScalar y; 40 SkScalar y;
41 }; 41 };
42 42
43 class SkRMoveTo : public SkMoveTo { 43 class SkRMoveTo : public SkMoveTo {
44 DECLARE_MEMBER_INFO(RMoveTo); 44 DECLARE_MEMBER_INFO(RMoveTo);
45 bool add() SK_OVERRIDE; 45 bool add() override;
46 private: 46 private:
47 typedef SkMoveTo INHERITED; 47 typedef SkMoveTo INHERITED;
48 }; 48 };
49 49
50 class SkLineTo : public SkPathPart { 50 class SkLineTo : public SkPathPart {
51 DECLARE_MEMBER_INFO(LineTo); 51 DECLARE_MEMBER_INFO(LineTo);
52 SkLineTo(); 52 SkLineTo();
53 bool add() SK_OVERRIDE; 53 bool add() override;
54 protected: 54 protected:
55 SkScalar x; 55 SkScalar x;
56 SkScalar y; 56 SkScalar y;
57 }; 57 };
58 58
59 class SkRLineTo : public SkLineTo { 59 class SkRLineTo : public SkLineTo {
60 DECLARE_MEMBER_INFO(RLineTo); 60 DECLARE_MEMBER_INFO(RLineTo);
61 bool add() SK_OVERRIDE; 61 bool add() override;
62 private: 62 private:
63 typedef SkLineTo INHERITED; 63 typedef SkLineTo INHERITED;
64 }; 64 };
65 65
66 class SkQuadTo : public SkPathPart { 66 class SkQuadTo : public SkPathPart {
67 DECLARE_MEMBER_INFO(QuadTo); 67 DECLARE_MEMBER_INFO(QuadTo);
68 SkQuadTo(); 68 SkQuadTo();
69 bool add() SK_OVERRIDE; 69 bool add() override;
70 protected: 70 protected:
71 SkScalar x1; 71 SkScalar x1;
72 SkScalar y1; 72 SkScalar y1;
73 SkScalar x2; 73 SkScalar x2;
74 SkScalar y2; 74 SkScalar y2;
75 }; 75 };
76 76
77 class SkRQuadTo : public SkQuadTo { 77 class SkRQuadTo : public SkQuadTo {
78 DECLARE_MEMBER_INFO(RQuadTo); 78 DECLARE_MEMBER_INFO(RQuadTo);
79 bool add() SK_OVERRIDE; 79 bool add() override;
80 private: 80 private:
81 typedef SkQuadTo INHERITED; 81 typedef SkQuadTo INHERITED;
82 }; 82 };
83 83
84 class SkCubicTo : public SkPathPart { 84 class SkCubicTo : public SkPathPart {
85 DECLARE_MEMBER_INFO(CubicTo); 85 DECLARE_MEMBER_INFO(CubicTo);
86 SkCubicTo(); 86 SkCubicTo();
87 bool add() SK_OVERRIDE; 87 bool add() override;
88 protected: 88 protected:
89 SkScalar x1; 89 SkScalar x1;
90 SkScalar y1; 90 SkScalar y1;
91 SkScalar x2; 91 SkScalar x2;
92 SkScalar y2; 92 SkScalar y2;
93 SkScalar x3; 93 SkScalar x3;
94 SkScalar y3; 94 SkScalar y3;
95 }; 95 };
96 96
97 class SkRCubicTo : public SkCubicTo { 97 class SkRCubicTo : public SkCubicTo {
98 DECLARE_MEMBER_INFO(RCubicTo); 98 DECLARE_MEMBER_INFO(RCubicTo);
99 bool add() SK_OVERRIDE; 99 bool add() override;
100 private: 100 private:
101 typedef SkCubicTo INHERITED; 101 typedef SkCubicTo INHERITED;
102 }; 102 };
103 103
104 class SkClose : public SkPathPart { 104 class SkClose : public SkPathPart {
105 DECLARE_EMPTY_MEMBER_INFO(Close); 105 DECLARE_EMPTY_MEMBER_INFO(Close);
106 bool add() SK_OVERRIDE; 106 bool add() override;
107 }; 107 };
108 108
109 class SkAddGeom : public SkPathPart { 109 class SkAddGeom : public SkPathPart {
110 DECLARE_PRIVATE_MEMBER_INFO(AddGeom); 110 DECLARE_PRIVATE_MEMBER_INFO(AddGeom);
111 SkAddGeom(); 111 SkAddGeom();
112 protected: 112 protected:
113 int /*SkPath::Direction*/ direction; 113 int /*SkPath::Direction*/ direction;
114 }; 114 };
115 115
116 class SkAddRect : public SkAddGeom { 116 class SkAddRect : public SkAddGeom {
117 DECLARE_MEMBER_INFO(AddRect); 117 DECLARE_MEMBER_INFO(AddRect);
118 SkAddRect(); 118 SkAddRect();
119 bool add() SK_OVERRIDE; 119 bool add() override;
120 protected: 120 protected:
121 SkRect fRect; 121 SkRect fRect;
122 private: 122 private:
123 typedef SkAddGeom INHERITED; 123 typedef SkAddGeom INHERITED;
124 }; 124 };
125 125
126 class SkAddOval : public SkAddRect { 126 class SkAddOval : public SkAddRect {
127 DECLARE_MEMBER_INFO(AddOval); 127 DECLARE_MEMBER_INFO(AddOval);
128 bool add() SK_OVERRIDE; 128 bool add() override;
129 private: 129 private:
130 typedef SkAddRect INHERITED; 130 typedef SkAddRect INHERITED;
131 }; 131 };
132 132
133 class SkAddCircle : public SkAddGeom { 133 class SkAddCircle : public SkAddGeom {
134 DECLARE_MEMBER_INFO(AddCircle); 134 DECLARE_MEMBER_INFO(AddCircle);
135 SkAddCircle(); 135 SkAddCircle();
136 bool add() SK_OVERRIDE; 136 bool add() override;
137 private: 137 private:
138 SkScalar radius; 138 SkScalar radius;
139 SkScalar x; 139 SkScalar x;
140 SkScalar y; 140 SkScalar y;
141 typedef SkAddGeom INHERITED; 141 typedef SkAddGeom INHERITED;
142 }; 142 };
143 143
144 class SkAddRoundRect : public SkAddRect { 144 class SkAddRoundRect : public SkAddRect {
145 DECLARE_MEMBER_INFO(AddRoundRect); 145 DECLARE_MEMBER_INFO(AddRoundRect);
146 SkAddRoundRect(); 146 SkAddRoundRect();
147 bool add() SK_OVERRIDE; 147 bool add() override;
148 private: 148 private:
149 SkScalar rx; 149 SkScalar rx;
150 SkScalar ry; 150 SkScalar ry;
151 typedef SkAddRect INHERITED; 151 typedef SkAddRect INHERITED;
152 }; 152 };
153 153
154 class SkAddPath : public SkPathPart { 154 class SkAddPath : public SkPathPart {
155 DECLARE_MEMBER_INFO(AddPath); 155 DECLARE_MEMBER_INFO(AddPath);
156 SkAddPath(); 156 SkAddPath();
157 bool add() SK_OVERRIDE; 157 bool add() override;
158 private: 158 private:
159 typedef SkPathPart INHERITED; 159 typedef SkPathPart INHERITED;
160 SkDrawMatrix* matrix; 160 SkDrawMatrix* matrix;
161 SkDrawPath* path; 161 SkDrawPath* path;
162 }; 162 };
163 163
164 #endif // SkPathParts_DEFINED 164 #endif // SkPathParts_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkPaintPart.h ('k') | src/animator/SkPostParts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698