@@ -17,83 +17,83 @@ TEST(MutatorsStack, CopyConstructor) {
1717 MutatorsStack stack;
1818 auto rrect = SkRRect::MakeEmpty ();
1919 auto rect = SkRect::MakeEmpty ();
20- stack.pushClipRect (rect);
21- stack.pushClipRRect (rrect);
20+ stack.PushClipRect (rect);
21+ stack.PushClipRRect (rrect);
2222 MutatorsStack copy = MutatorsStack (stack);
2323 ASSERT_TRUE (copy == stack);
2424}
2525
2626TEST (MutatorsStack, PushClipRect) {
2727 MutatorsStack stack;
2828 auto rect = SkRect::MakeEmpty ();
29- stack.pushClipRect (rect);
30- auto iter = stack.bottom ();
31- ASSERT_TRUE (iter->get ()->type () == MutatorType::clip_rect);
32- ASSERT_TRUE (iter->get ()->rect () == rect);
29+ stack.PushClipRect (rect);
30+ auto iter = stack.Bottom ();
31+ ASSERT_TRUE (iter->get ()->GetType () == MutatorType::clip_rect);
32+ ASSERT_TRUE (iter->get ()->GetRect () == rect);
3333}
3434
3535TEST (MutatorsStack, PushClipRRect) {
3636 MutatorsStack stack;
3737 auto rrect = SkRRect::MakeEmpty ();
38- stack.pushClipRRect (rrect);
39- auto iter = stack.bottom ();
40- ASSERT_TRUE (iter->get ()->type () == MutatorType::clip_rrect);
41- ASSERT_TRUE (iter->get ()->rrect () == rrect);
38+ stack.PushClipRRect (rrect);
39+ auto iter = stack.Bottom ();
40+ ASSERT_TRUE (iter->get ()->GetType () == MutatorType::clip_rrect);
41+ ASSERT_TRUE (iter->get ()->GetRRect () == rrect);
4242}
4343
4444TEST (MutatorsStack, PushClipPath) {
4545 flutter::MutatorsStack stack;
4646 SkPath path;
47- stack.pushClipPath (path);
48- auto iter = stack.bottom ();
49- ASSERT_TRUE (iter->get ()->type () == flutter::MutatorType::clip_path);
50- ASSERT_TRUE (iter->get ()->path () == path);
47+ stack.PushClipPath (path);
48+ auto iter = stack.Bottom ();
49+ ASSERT_TRUE (iter->get ()->GetType () == flutter::MutatorType::clip_path);
50+ ASSERT_TRUE (iter->get ()->GetPath () == path);
5151}
5252
5353TEST (MutatorsStack, PushTransform) {
5454 MutatorsStack stack;
5555 SkMatrix matrix;
5656 matrix.setIdentity ();
57- stack.pushTransform (matrix);
58- auto iter = stack.bottom ();
59- ASSERT_TRUE (iter->get ()->type () == MutatorType::transform);
60- ASSERT_TRUE (iter->get ()->matrix () == matrix);
57+ stack.PushTransform (matrix);
58+ auto iter = stack.Bottom ();
59+ ASSERT_TRUE (iter->get ()->GetType () == MutatorType::transform);
60+ ASSERT_TRUE (iter->get ()->GetMatrix () == matrix);
6161}
6262
6363TEST (MutatorsStack, Pop) {
6464 MutatorsStack stack;
6565 SkMatrix matrix;
6666 matrix.setIdentity ();
67- stack.pushTransform (matrix);
68- stack.pop ();
69- auto iter = stack.bottom ();
70- ASSERT_TRUE (iter == stack.top ());
67+ stack.PushTransform (matrix);
68+ stack.Pop ();
69+ auto iter = stack.Bottom ();
70+ ASSERT_TRUE (iter == stack.Top ());
7171}
7272
7373TEST (MutatorsStack, Traversal) {
7474 MutatorsStack stack;
7575 SkMatrix matrix;
7676 matrix.setIdentity ();
77- stack.pushTransform (matrix);
77+ stack.PushTransform (matrix);
7878 auto rect = SkRect::MakeEmpty ();
79- stack.pushClipRect (rect);
79+ stack.PushClipRect (rect);
8080 auto rrect = SkRRect::MakeEmpty ();
81- stack.pushClipRRect (rrect);
82- auto iter = stack.bottom ();
81+ stack.PushClipRRect (rrect);
82+ auto iter = stack.Bottom ();
8383 int index = 0 ;
84- while (iter != stack.top ()) {
84+ while (iter != stack.Top ()) {
8585 switch (index) {
8686 case 0 :
87- ASSERT_TRUE (iter->get ()->type () == MutatorType::clip_rrect);
88- ASSERT_TRUE (iter->get ()->rrect () == rrect);
87+ ASSERT_TRUE (iter->get ()->GetType () == MutatorType::clip_rrect);
88+ ASSERT_TRUE (iter->get ()->GetRRect () == rrect);
8989 break ;
9090 case 1 :
91- ASSERT_TRUE (iter->get ()->type () == MutatorType::clip_rect);
92- ASSERT_TRUE (iter->get ()->rect () == rect);
91+ ASSERT_TRUE (iter->get ()->GetType () == MutatorType::clip_rect);
92+ ASSERT_TRUE (iter->get ()->GetRect () == rect);
9393 break ;
9494 case 2 :
95- ASSERT_TRUE (iter->get ()->type () == MutatorType::transform);
96- ASSERT_TRUE (iter->get ()->matrix () == matrix);
95+ ASSERT_TRUE (iter->get ()->GetType () == MutatorType::transform);
96+ ASSERT_TRUE (iter->get ()->GetMatrix () == matrix);
9797 break ;
9898 default :
9999 break ;
@@ -106,48 +106,48 @@ TEST(MutatorsStack, Traversal) {
106106TEST (MutatorsStack, Equality) {
107107 MutatorsStack stack;
108108 SkMatrix matrix = SkMatrix::MakeScale (1 , 1 );
109- stack.pushTransform (matrix);
109+ stack.PushTransform (matrix);
110110 SkRect rect = SkRect::MakeEmpty ();
111- stack.pushClipRect (rect);
111+ stack.PushClipRect (rect);
112112 SkRRect rrect = SkRRect::MakeEmpty ();
113- stack.pushClipRRect (rrect);
113+ stack.PushClipRRect (rrect);
114114 SkPath path;
115- stack.pushClipPath (path);
115+ stack.PushClipPath (path);
116116
117117 MutatorsStack stackOther;
118118 SkMatrix matrixOther = SkMatrix::MakeScale (1 , 1 );
119- stackOther.pushTransform (matrixOther);
119+ stackOther.PushTransform (matrixOther);
120120 SkRect rectOther = SkRect::MakeEmpty ();
121- stackOther.pushClipRect (rectOther);
121+ stackOther.PushClipRect (rectOther);
122122 SkRRect rrectOther = SkRRect::MakeEmpty ();
123- stackOther.pushClipRRect (rrectOther);
123+ stackOther.PushClipRRect (rrectOther);
124124 SkPath otherPath;
125- stackOther.pushClipPath (otherPath);
125+ stackOther.PushClipPath (otherPath);
126126
127127 ASSERT_TRUE (stack == stackOther);
128128}
129129
130130TEST (Mutator, Initialization) {
131131 SkRect rect = SkRect::MakeEmpty ();
132132 Mutator mutator = Mutator (rect);
133- ASSERT_TRUE (mutator.type () == MutatorType::clip_rect);
134- ASSERT_TRUE (mutator.rect () == rect);
133+ ASSERT_TRUE (mutator.GetType () == MutatorType::clip_rect);
134+ ASSERT_TRUE (mutator.GetRect () == rect);
135135
136136 SkRRect rrect = SkRRect::MakeEmpty ();
137137 Mutator mutator2 = Mutator (rrect);
138- ASSERT_TRUE (mutator2.type () == MutatorType::clip_rrect);
139- ASSERT_TRUE (mutator2.rrect () == rrect);
138+ ASSERT_TRUE (mutator2.GetType () == MutatorType::clip_rrect);
139+ ASSERT_TRUE (mutator2.GetRRect () == rrect);
140140
141141 SkPath path;
142142 Mutator mutator3 = Mutator (path);
143- ASSERT_TRUE (mutator3.type () == MutatorType::clip_path);
144- ASSERT_TRUE (mutator3.path () == path);
143+ ASSERT_TRUE (mutator3.GetType () == MutatorType::clip_path);
144+ ASSERT_TRUE (mutator3.GetPath () == path);
145145
146146 SkMatrix matrix;
147147 matrix.setIdentity ();
148148 Mutator mutator4 = Mutator (matrix);
149- ASSERT_TRUE (mutator4.type () == MutatorType::transform);
150- ASSERT_TRUE (mutator4.matrix () == matrix);
149+ ASSERT_TRUE (mutator4.GetType () == MutatorType::transform);
150+ ASSERT_TRUE (mutator4.GetMatrix () == matrix);
151151}
152152
153153TEST (Mutator, CopyConstructor) {
0 commit comments