|
10 | 10 | #include "flutter/display_list/effects/dl_color_source.h" |
11 | 11 | #include "flutter/display_list/skia/dl_sk_conversions.h" |
12 | 12 | #include "gtest/gtest.h" |
| 13 | +#include "third_party/skia/include/core/SkColorSpace.h" |
13 | 14 | #include "third_party/skia/include/core/SkSamplingOptions.h" |
14 | 15 | #include "third_party/skia/include/core/SkTileMode.h" |
15 | 16 |
|
@@ -155,17 +156,24 @@ TEST(DisplayListSkConversions, BlendColorFilterModifiesTransparency) { |
155 | 156 | << "]"; |
156 | 157 | std::string desc = desc_str.str(); |
157 | 158 | DlBlendColorFilter filter(color, mode); |
| 159 | + auto srgb = SkColorSpace::MakeSRGB(); |
158 | 160 | if (filter.modifies_transparent_black()) { |
159 | 161 | auto dl_filter = DlBlendColorFilter::Make(color, mode); |
160 | 162 | auto sk_filter = ToSk(filter); |
161 | 163 | ASSERT_NE(dl_filter, nullptr) << desc; |
162 | 164 | ASSERT_NE(sk_filter, nullptr) << desc; |
163 | | - ASSERT_TRUE(sk_filter->filterColor(0) != 0) << desc; |
| 165 | + ASSERT_TRUE(sk_filter->filterColor4f(SkColors::kTransparent, srgb.get(), |
| 166 | + srgb.get()) != |
| 167 | + SkColors::kTransparent) |
| 168 | + << desc; |
164 | 169 | } else { |
165 | 170 | auto dl_filter = DlBlendColorFilter::Make(color, mode); |
166 | 171 | auto sk_filter = ToSk(filter); |
167 | 172 | EXPECT_EQ(dl_filter == nullptr, sk_filter == nullptr) << desc; |
168 | | - ASSERT_TRUE(sk_filter == nullptr || sk_filter->filterColor(0) == 0) |
| 173 | + ASSERT_TRUE(sk_filter == nullptr || |
| 174 | + sk_filter->filterColor4f(SkColors::kTransparent, srgb.get(), |
| 175 | + srgb.get()) == |
| 176 | + SkColors::kTransparent) |
169 | 177 | << desc; |
170 | 178 | } |
171 | 179 | }; |
@@ -266,9 +274,12 @@ TEST(DisplayListSkConversions, MatrixColorFilterModifiesTransparency) { |
266 | 274 | DlMatrixColorFilter filter(matrix); |
267 | 275 | auto dl_filter = DlMatrixColorFilter::Make(matrix); |
268 | 276 | auto sk_filter = ToSk(filter); |
| 277 | + auto srgb = SkColorSpace::MakeSRGB(); |
269 | 278 | EXPECT_EQ(dl_filter == nullptr, sk_filter == nullptr); |
270 | 279 | EXPECT_EQ(filter.modifies_transparent_black(), |
271 | | - sk_filter && sk_filter->filterColor(0) != 0); |
| 280 | + sk_filter && sk_filter->filterColor4f(SkColors::kTransparent, |
| 281 | + srgb.get(), srgb.get()) != |
| 282 | + SkColors::kTransparent); |
272 | 283 | }; |
273 | 284 |
|
274 | 285 | // Tests identity (matrix[0] already == 1 in an identity filter) |
|
0 commit comments