Skip to content

GitLab

T
tangled
Commit e8dfac2e authored by Fredrik Söderqvist's avatar Fredrik Söderqvist Committed by Commit Bot
Browse files
Options

Reenable/update tests after Skia roll (https://crbug.com/skia/10744) 

SkPictureImageFilter (as wrapped by RecordPaintFilter) now returns the
specified target/crop rect when mapping forward.

Adjust DiscardableImageMapTest.CapturesImagesInPaintFilters to reflect
this, changing the size of the RecordPaintFilter target rect to better
show that it is being applied.

Bug: skia:10744
Change-Id: I62378591dcf30694d6fe5b2d68eb31d22f2d71f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431489Reviewed-by: default avatarvmpstr <vmpstr@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#811245}
parent 3a4677f6
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 42 deletions
cc/paint/discardable_image_map_unittest.cc
View file @ e8dfac2e
...@@ -875,8 +875,7 @@ TEST_F(DiscardableImageMapTest, CapturesImagesInPaintRecordShaders) { ...@@ -875,8 +875,7 @@ TEST_F(DiscardableImageMapTest, CapturesImagesInPaintRecordShaders) {
EXPECT_EQ(SkSize::Make(4.f, 4.f), draw_images[0].scale); EXPECT_EQ(SkSize::Make(4.f, 4.f), draw_images[0].scale);
} }
// Temporarily disabled for a Skia roll (https://crbug.com/skia/10744). TEST_F(DiscardableImageMapTest, CapturesImagesInPaintFilters) {
TEST_F(DiscardableImageMapTest, DISABLED_CapturesImagesInPaintFilters) {
// Create the record to use in the filter. // Create the record to use in the filter.
auto filter_record = sk_make_sp<PaintOpBuffer>(); auto filter_record = sk_make_sp<PaintOpBuffer>();
...@@ -894,7 +893,7 @@ TEST_F(DiscardableImageMapTest, DISABLED_CapturesImagesInPaintFilters) { ...@@ -894,7 +893,7 @@ TEST_F(DiscardableImageMapTest, DISABLED_CapturesImagesInPaintFilters) {
display_list->StartPaint(); display_list->StartPaint();
PaintFlags flags; PaintFlags flags;
flags.setImageFilter(sk_make_sp<RecordPaintFilter>( flags.setImageFilter(sk_make_sp<RecordPaintFilter>(
filter_record, SkRect::MakeWH(100.f, 100.f))); filter_record, SkRect::MakeWH(150.f, 150.f)));
display_list->push<DrawRectOp>(SkRect::MakeWH(200, 200), flags); display_list->push<DrawRectOp>(SkRect::MakeWH(200, 200), flags);
display_list->EndPaintOfUnpaired(visible_rect); display_list->EndPaintOfUnpaired(visible_rect);
display_list->Finalize(); display_list->Finalize();
...@@ -914,8 +913,9 @@ TEST_F(DiscardableImageMapTest, DISABLED_CapturesImagesInPaintFilters) { ...@@ -914,8 +913,9 @@ TEST_F(DiscardableImageMapTest, DISABLED_CapturesImagesInPaintFilters) {
ASSERT_EQ(draw_images.size(), 1u); ASSERT_EQ(draw_images.size(), 1u);
EXPECT_EQ(draw_images[0].image, animated_image); EXPECT_EQ(draw_images[0].image, animated_image);
// The position of the image is the position of the DrawRectOp that uses the // The position of the image is the position of the DrawRectOp that uses the
// filter. // filter. Since the bounds of the filter does not depend on the source/input,
EXPECT_EQ(gfx::Rect(200, 200), inset_rects[0]); // the resulting bounds is that of the RecordPaintFilter.
EXPECT_EQ(gfx::Rect(150, 150), inset_rects[0]);
// Images in a filter are decoded at the original size. // Images in a filter are decoded at the original size.
EXPECT_EQ(SkSize::Make(1.f, 1.f), draw_images[0].scale); EXPECT_EQ(SkSize::Make(1.f, 1.f), draw_images[0].scale);
} }
......
third_party/blink/web_tests/TestExpectations
View file @ e8dfac2e
...@@ -430,19 +430,6 @@ crbug.com/1050993 [ Linux ] virtual/gpu-rasterization/images/drag-image-descenda ...@@ -430,19 +430,6 @@ crbug.com/1050993 [ Linux ] virtual/gpu-rasterization/images/drag-image-descenda
# Flaky test. # Flaky test.
crbug.com/1054894 [ Mac ] http/tests/images/image-decode-in-frame.html [ Pass Failure ] crbug.com/1054894 [ Mac ] http/tests/images/image-decode-in-frame.html [ Pass Failure ]
# Disabled for Skia roll (https://crbug.com/skia/10744).
paint/invalidation/svg/feImage-multiple-targets-id-change.svg [ Skip ]
paint/invalidation/svg/feImage-reference-invalidation.svg [ Skip ]
paint/invalidation/svg/feImage-target-add-to-document.svg [ Skip ]
paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2.svg [ Skip ]
paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection.svg [ Skip ]
paint/invalidation/svg/feImage-target-attribute-change.svg [ Skip ]
paint/invalidation/svg/feImage-target-inline-style-change.svg [ Skip ]
paint/invalidation/svg/feImage-target-property-change.svg [ Skip ]
paint/invalidation/svg/feImage-target-reappend-to-document.svg [ Skip ]
paint/invalidation/svg/feImage-target-remove-from-document.svg [ Skip ]
paint/invalidation/svg/feImage-target-style-change.svg [ Skip ]
# ====== Paint team owned tests to here ====== # ====== Paint team owned tests to here ======
crbug.com/922249 virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html [ Failure Pass ] crbug.com/922249 virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html [ Failure Pass ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
View file @ e8dfac2e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[45, 0, 60, 110], [45, 0, 60, 90],
[0, 0, 55, 110] [0, 0, 55, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-property-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/flag-specific/composite-after-paint/paint/invalidation/svg/feImage-target-style-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-multiple-targets-id-change-expected.txt
View file @ e8dfac2e
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[45, 0, 60, 110], [45, 0, 60, 90],
[0, 0, 55, 110] [0, 0, 55, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-reference-invalidation-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-add-to-document-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-inline-style-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-property-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-reappend-to-document-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-remove-from-document-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
third_party/blink/web_tests/paint/invalidation/svg/feImage-target-style-change-expected.txt
View file @ e8dfac2e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF",
"invalidations": [ "invalidations": [
[0, 0, 110, 110] [0, 0, 90, 90]
] ]
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment