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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: src/animator/SkMatrixParts.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/SkHitTest.h ('k') | src/animator/SkMemberInfo.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 SkMatrixParts_DEFINED 10 #ifndef SkMatrixParts_DEFINED
(...skipping 21 matching lines...) Expand all
32 virtual bool isMatrixPart() const { return true; } 32 virtual bool isMatrixPart() const { return true; }
33 #endif 33 #endif
34 protected: 34 protected:
35 SkDrawMatrix* fMatrix; 35 SkDrawMatrix* fMatrix;
36 }; 36 };
37 37
38 class SkRotate : public SkMatrixPart { 38 class SkRotate : public SkMatrixPart {
39 DECLARE_MEMBER_INFO(Rotate); 39 DECLARE_MEMBER_INFO(Rotate);
40 SkRotate(); 40 SkRotate();
41 protected: 41 protected:
42 virtual bool add() SK_OVERRIDE; 42 bool add() SK_OVERRIDE;
43 SkScalar degrees; 43 SkScalar degrees;
44 SkPoint center; 44 SkPoint center;
45 }; 45 };
46 46
47 class SkScale : public SkMatrixPart { 47 class SkScale : public SkMatrixPart {
48 DECLARE_MEMBER_INFO(Scale); 48 DECLARE_MEMBER_INFO(Scale);
49 SkScale(); 49 SkScale();
50 protected: 50 protected:
51 virtual bool add() SK_OVERRIDE; 51 bool add() SK_OVERRIDE;
52 SkScalar x; 52 SkScalar x;
53 SkScalar y; 53 SkScalar y;
54 SkPoint center; 54 SkPoint center;
55 }; 55 };
56 56
57 class SkSkew : public SkMatrixPart { 57 class SkSkew : public SkMatrixPart {
58 DECLARE_MEMBER_INFO(Skew); 58 DECLARE_MEMBER_INFO(Skew);
59 SkSkew(); 59 SkSkew();
60 protected: 60 protected:
61 virtual bool add() SK_OVERRIDE; 61 bool add() SK_OVERRIDE;
62 SkScalar x; 62 SkScalar x;
63 SkScalar y; 63 SkScalar y;
64 SkPoint center; 64 SkPoint center;
65 }; 65 };
66 66
67 class SkTranslate : public SkMatrixPart { 67 class SkTranslate : public SkMatrixPart {
68 DECLARE_MEMBER_INFO(Translate); 68 DECLARE_MEMBER_INFO(Translate);
69 SkTranslate(); 69 SkTranslate();
70 protected: 70 protected:
71 virtual bool add() SK_OVERRIDE; 71 bool add() SK_OVERRIDE;
72 SkScalar x; 72 SkScalar x;
73 SkScalar y; 73 SkScalar y;
74 }; 74 };
75 75
76 class SkFromPath : public SkMatrixPart { 76 class SkFromPath : public SkMatrixPart {
77 DECLARE_MEMBER_INFO(FromPath); 77 DECLARE_MEMBER_INFO(FromPath);
78 SkFromPath(); 78 SkFromPath();
79 virtual ~SkFromPath(); 79 virtual ~SkFromPath();
80 protected: 80 protected:
81 virtual bool add() SK_OVERRIDE; 81 bool add() SK_OVERRIDE;
82 int32_t mode; 82 int32_t mode;
83 SkScalar offset; 83 SkScalar offset;
84 SkDrawPath* path; 84 SkDrawPath* path;
85 SkPathMeasure fPathMeasure; 85 SkPathMeasure fPathMeasure;
86 }; 86 };
87 87
88 class SkRectToRect : public SkMatrixPart { 88 class SkRectToRect : public SkMatrixPart {
89 DECLARE_MEMBER_INFO(RectToRect); 89 DECLARE_MEMBER_INFO(RectToRect);
90 SkRectToRect(); 90 SkRectToRect();
91 virtual ~SkRectToRect(); 91 virtual ~SkRectToRect();
92 #ifdef SK_DUMP_ENABLED 92 #ifdef SK_DUMP_ENABLED
93 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; 93 void dump(SkAnimateMaker* ) SK_OVERRIDE;
94 #endif 94 #endif
95 virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; 95 const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
96 protected: 96 protected:
97 virtual bool add() SK_OVERRIDE; 97 bool add() SK_OVERRIDE;
98 SkDrawRect* source; 98 SkDrawRect* source;
99 SkDrawRect* destination; 99 SkDrawRect* destination;
100 }; 100 };
101 101
102 class SkPolyToPoly : public SkMatrixPart { 102 class SkPolyToPoly : public SkMatrixPart {
103 DECLARE_MEMBER_INFO(PolyToPoly); 103 DECLARE_MEMBER_INFO(PolyToPoly);
104 SkPolyToPoly(); 104 SkPolyToPoly();
105 virtual ~SkPolyToPoly(); 105 virtual ~SkPolyToPoly();
106 #ifdef SK_DUMP_ENABLED 106 #ifdef SK_DUMP_ENABLED
107 virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; 107 void dump(SkAnimateMaker* ) SK_OVERRIDE;
108 #endif 108 #endif
109 virtual void onEndElement(SkAnimateMaker& ) SK_OVERRIDE; 109 void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
110 virtual const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE; 110 const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
111 protected: 111 protected:
112 virtual bool add() SK_OVERRIDE; 112 bool add() SK_OVERRIDE;
113 SkPolygon* source; 113 SkPolygon* source;
114 SkPolygon* destination; 114 SkPolygon* destination;
115 }; 115 };
116 116
117 // !!! add concat matrix ? 117 // !!! add concat matrix ?
118 118
119 #endif // SkMatrixParts_DEFINED 119 #endif // SkMatrixParts_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkHitTest.h ('k') | src/animator/SkMemberInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698