@@ -94,14 +94,19 @@ TEST(MutatorsStack, PushBackdropFilter) {
9494 const int num_of_mutators = 10 ;
9595 for (int i = 0 ; i < num_of_mutators; i++) {
9696 auto filter = std::make_shared<DlBlurImageFilter>(i, 5 , DlTileMode::kClamp );
97- stack.PushBackdropFilter (filter);
97+ stack.PushBackdropFilter (filter, SkRect::MakeXYWH (i, i, i, i) );
9898 }
9999
100100 auto iter = stack.Begin ();
101101 int i = 0 ;
102102 while (iter != stack.End ()) {
103103 ASSERT_EQ (iter->get ()->GetType (), MutatorType::kBackdropFilter );
104- ASSERT_EQ (iter->get ()->GetFilter ().asBlur ()->sigma_x (), i);
104+ ASSERT_EQ (iter->get ()->GetFilterMutation ().GetFilter ().asBlur ()->sigma_x (),
105+ i);
106+ ASSERT_EQ (iter->get ()->GetFilterMutation ().GetFilterRect ().x (), i);
107+ ASSERT_EQ (iter->get ()->GetFilterMutation ().GetFilterRect ().x (), i);
108+ ASSERT_EQ (iter->get ()->GetFilterMutation ().GetFilterRect ().width (), i);
109+ ASSERT_EQ (iter->get ()->GetFilterMutation ().GetFilterRect ().height (), i);
105110 ++iter;
106111 ++i;
107112 }
@@ -164,7 +169,7 @@ TEST(MutatorsStack, Equality) {
164169 int alpha = 240 ;
165170 stack.PushOpacity (alpha);
166171 auto filter = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
167- stack.PushBackdropFilter (filter);
172+ stack.PushBackdropFilter (filter, SkRect::MakeEmpty () );
168173
169174 MutatorsStack stack_other;
170175 SkMatrix matrix_other = SkMatrix::Scale (1 , 1 );
@@ -179,7 +184,7 @@ TEST(MutatorsStack, Equality) {
179184 stack_other.PushOpacity (other_alpha);
180185 auto other_filter =
181186 std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
182- stack_other.PushBackdropFilter (other_filter);
187+ stack_other.PushBackdropFilter (other_filter, SkRect::MakeEmpty () );
183188
184189 ASSERT_TRUE (stack == stack_other);
185190}
@@ -211,9 +216,9 @@ TEST(Mutator, Initialization) {
211216 ASSERT_TRUE (mutator5.GetType () == MutatorType::kOpacity );
212217
213218 auto filter = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
214- Mutator mutator6 = Mutator (filter);
219+ Mutator mutator6 = Mutator (filter, SkRect::MakeEmpty () );
215220 ASSERT_TRUE (mutator6.GetType () == MutatorType::kBackdropFilter );
216- ASSERT_TRUE (mutator6.GetFilter () == *filter);
221+ ASSERT_TRUE (mutator6.GetFilterMutation (). GetFilter () == *filter);
217222}
218223
219224TEST (Mutator, CopyConstructor) {
@@ -244,7 +249,7 @@ TEST(Mutator, CopyConstructor) {
244249 ASSERT_TRUE (mutator5 == copy5);
245250
246251 auto filter = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
247- Mutator mutator6 = Mutator (filter);
252+ Mutator mutator6 = Mutator (filter, SkRect::MakeEmpty () );
248253 Mutator copy6 = Mutator (mutator6);
249254 ASSERT_TRUE (mutator6 == copy6);
250255}
@@ -276,9 +281,10 @@ TEST(Mutator, Equality) {
276281 Mutator other_mutator5 = Mutator (alpha);
277282 ASSERT_TRUE (mutator5 == other_mutator5);
278283
279- auto filter = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
280- Mutator mutator6 = Mutator (filter);
281- Mutator other_mutator6 = Mutator (filter);
284+ auto filter1 = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
285+ auto filter2 = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
286+ Mutator mutator6 = Mutator (filter1, SkRect::MakeEmpty ());
287+ Mutator other_mutator6 = Mutator (filter2, SkRect::MakeEmpty ());
282288 ASSERT_TRUE (mutator6 == other_mutator6);
283289}
284290
@@ -299,8 +305,8 @@ TEST(Mutator, UnEquality) {
299305 auto filter = std::make_shared<DlBlurImageFilter>(5 , 5 , DlTileMode::kClamp );
300306 auto filter2 =
301307 std::make_shared<DlBlurImageFilter>(10 , 10 , DlTileMode::kClamp );
302- Mutator mutator3 = Mutator (filter);
303- Mutator other_mutator3 = Mutator (filter2);
308+ Mutator mutator3 = Mutator (filter, SkRect::MakeEmpty () );
309+ Mutator other_mutator3 = Mutator (filter2, SkRect::MakeEmpty () );
304310 ASSERT_TRUE (mutator3 != other_mutator3);
305311}
306312
0 commit comments