@@ -60,14 +60,11 @@ TEST_F(ImageFilterLayerTest, EmptyFilter) {
60
60
layer->Paint (paint_context ());
61
61
EXPECT_EQ (mock_canvas ().draw_calls (),
62
62
std::vector ({
63
- MockCanvas::DrawCall{0 , MockCanvas::SaveData{1 }},
64
- MockCanvas::DrawCall{1 , MockCanvas::SetMatrixData{SkMatrix ()}},
65
63
MockCanvas::DrawCall{
66
- 1 , MockCanvas::SaveLayerData{child_bounds, filter_paint,
67
- nullptr , 2 }},
64
+ 0 , MockCanvas::SaveLayerData{child_bounds, filter_paint,
65
+ nullptr , 1 }},
68
66
MockCanvas::DrawCall{
69
- 2 , MockCanvas::DrawPathData{child_path, child_paint}},
70
- MockCanvas::DrawCall{2 , MockCanvas::RestoreData{1 }},
67
+ 1 , MockCanvas::DrawPathData{child_path, child_paint}},
71
68
MockCanvas::DrawCall{1 , MockCanvas::RestoreData{0 }},
72
69
}));
73
70
}
@@ -96,14 +93,11 @@ TEST_F(ImageFilterLayerTest, SimpleFilter) {
96
93
layer->Paint (paint_context ());
97
94
EXPECT_EQ (mock_canvas ().draw_calls (),
98
95
std::vector ({
99
- MockCanvas::DrawCall{0 , MockCanvas::SaveData{1 }},
100
- MockCanvas::DrawCall{1 , MockCanvas::SetMatrixData{SkMatrix ()}},
101
96
MockCanvas::DrawCall{
102
- 1 , MockCanvas::SaveLayerData{child_bounds, filter_paint,
103
- nullptr , 2 }},
97
+ 0 , MockCanvas::SaveLayerData{child_bounds, filter_paint,
98
+ nullptr , 1 }},
104
99
MockCanvas::DrawCall{
105
- 2 , MockCanvas::DrawPathData{child_path, child_paint}},
106
- MockCanvas::DrawCall{2 , MockCanvas::RestoreData{1 }},
100
+ 1 , MockCanvas::DrawPathData{child_path, child_paint}},
107
101
MockCanvas::DrawCall{1 , MockCanvas::RestoreData{0 }},
108
102
}));
109
103
}
@@ -132,14 +126,11 @@ TEST_F(ImageFilterLayerTest, SimpleFilterBounds) {
132
126
layer->Paint (paint_context ());
133
127
EXPECT_EQ (mock_canvas ().draw_calls (),
134
128
std::vector ({
135
- MockCanvas::DrawCall{0 , MockCanvas::SaveData{1 }},
136
- MockCanvas::DrawCall{1 , MockCanvas::SetMatrixData{SkMatrix ()}},
137
129
MockCanvas::DrawCall{
138
- 1 , MockCanvas::SaveLayerData{child_bounds, filter_paint,
139
- nullptr , 2 }},
130
+ 0 , MockCanvas::SaveLayerData{child_bounds, filter_paint,
131
+ nullptr , 1 }},
140
132
MockCanvas::DrawCall{
141
- 2 , MockCanvas::DrawPathData{child_path, child_paint}},
142
- MockCanvas::DrawCall{2 , MockCanvas::RestoreData{1 }},
133
+ 1 , MockCanvas::DrawPathData{child_path, child_paint}},
143
134
MockCanvas::DrawCall{1 , MockCanvas::RestoreData{0 }},
144
135
}));
145
136
}
@@ -177,19 +168,16 @@ TEST_F(ImageFilterLayerTest, MultipleChildren) {
177
168
SkPaint filter_paint;
178
169
filter_paint.setImageFilter (layer_filter);
179
170
layer->Paint (paint_context ());
180
- EXPECT_EQ (mock_canvas ().draw_calls (),
181
- std::vector (
182
- {MockCanvas::DrawCall{0 , MockCanvas::SaveData{1 }},
183
- MockCanvas::DrawCall{1 , MockCanvas::SetMatrixData{SkMatrix ()}},
184
- MockCanvas::DrawCall{
185
- 1 , MockCanvas::SaveLayerData{children_bounds, filter_paint,
186
- nullptr , 2 }},
187
- MockCanvas::DrawCall{
188
- 2 , MockCanvas::DrawPathData{child_path1, child_paint1}},
189
- MockCanvas::DrawCall{
190
- 2 , MockCanvas::DrawPathData{child_path2, child_paint2}},
191
- MockCanvas::DrawCall{2 , MockCanvas::RestoreData{1 }},
192
- MockCanvas::DrawCall{1 , MockCanvas::RestoreData{0 }}}));
171
+ EXPECT_EQ (
172
+ mock_canvas ().draw_calls (),
173
+ std::vector ({MockCanvas::DrawCall{
174
+ 0 , MockCanvas::SaveLayerData{children_bounds,
175
+ filter_paint, nullptr , 1 }},
176
+ MockCanvas::DrawCall{
177
+ 1 , MockCanvas::DrawPathData{child_path1, child_paint1}},
178
+ MockCanvas::DrawCall{
179
+ 1 , MockCanvas::DrawPathData{child_path2, child_paint2}},
180
+ MockCanvas::DrawCall{1 , MockCanvas::RestoreData{0 }}}));
193
181
}
194
182
195
183
TEST_F (ImageFilterLayerTest, Nested) {
@@ -237,22 +225,16 @@ TEST_F(ImageFilterLayerTest, Nested) {
237
225
layer1->Paint (paint_context ());
238
226
EXPECT_EQ (mock_canvas ().draw_calls (),
239
227
std::vector ({
240
- MockCanvas::DrawCall{0 , MockCanvas::SaveData{1 }},
241
- MockCanvas::DrawCall{1 , MockCanvas::SetMatrixData{SkMatrix ()}},
242
228
MockCanvas::DrawCall{
243
- 1 , MockCanvas::SaveLayerData{children_bounds, filter_paint1,
244
- nullptr , 2 }},
229
+ 0 , MockCanvas::SaveLayerData{children_bounds, filter_paint1,
230
+ nullptr , 1 }},
245
231
MockCanvas::DrawCall{
246
- 2 , MockCanvas::DrawPathData{child_path1, child_paint1}},
247
- MockCanvas::DrawCall{2 , MockCanvas::SaveData{3 }},
248
- MockCanvas::DrawCall{3 , MockCanvas::SetMatrixData{SkMatrix ()}},
232
+ 1 , MockCanvas::DrawPathData{child_path1, child_paint1}},
249
233
MockCanvas::DrawCall{
250
- 3 , MockCanvas::SaveLayerData{child_path2.getBounds (),
251
- filter_paint2, nullptr , 4 }},
234
+ 1 , MockCanvas::SaveLayerData{child_path2.getBounds (),
235
+ filter_paint2, nullptr , 2 }},
252
236
MockCanvas::DrawCall{
253
- 4 , MockCanvas::DrawPathData{child_path2, child_paint2}},
254
- MockCanvas::DrawCall{4 , MockCanvas::RestoreData{3 }},
255
- MockCanvas::DrawCall{3 , MockCanvas::RestoreData{2 }},
237
+ 2 , MockCanvas::DrawPathData{child_path2, child_paint2}},
256
238
MockCanvas::DrawCall{2 , MockCanvas::RestoreData{1 }},
257
239
MockCanvas::DrawCall{1 , MockCanvas::RestoreData{0 }},
258
240
}));
0 commit comments