From 2424cadb0db4827d43c37317ab524618728970ac Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Sat, 16 Dec 2023 00:48:40 +0000 Subject: [PATCH] Bug 1868255 [wpt PR 43506] - Mark two test cases from changing-scroll-snap-align.html as tentative., a=testonly Automatic update from web-platform-tests Mark two test cases from changing-scroll-snap-align.html as tentative. These were added for nested snap work on crbug.com/1467300, but the behavior is subject to an open spec issue as discussed at: https://github.com/web-platform-tests/interop/issues/602 Bug: 1505893 Change-Id: Iaf9783f7220acc5eeb19387e57f6ec3f88bc19e2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5085089 Reviewed-by: David Awogbemila Commit-Queue: Steve Kobes Cr-Commit-Position: refs/heads/main{#1233355} -- wpt-commits: 7db499bf01c922eacee27edeb21db75356ee8178 wpt-pr: 43506 UltraBlame original commit: 186934d842a247a5e2e6af07e06e4c36373d6842 --- ...ng-scroll-snap-align-nested.tentative.html | 119 ++++++++++++++++++ .../changing-scroll-snap-align.html | 53 -------- 2 files changed, 119 insertions(+), 53 deletions(-) create mode 100644 testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align-nested.tentative.html diff --git a/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align-nested.tentative.html b/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align-nested.tentative.html new file mode 100644 index 000000000000..ddea57055174 --- /dev/null +++ b/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align-nested.tentative.html @@ -0,0 +1,119 @@ + + + Updating the snap alignment of a snap container's content should make the snap + container resnap accordingly. + + + + + + +
+
+
+
+
+ + diff --git a/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html b/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html index c4bb2e9ff426..a625621c270f 100644 --- a/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html +++ b/testing/web-platform/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html @@ -64,59 +64,6 @@ initial_target.removeAttribute("class"); } -test(t => { - t.add_cleanup(cleanup); - scroller.scrollTo(0,0); - assert_equals(scroller.scrollTop, 100); - assert_equals(scroller.scrollLeft, 100); - - initial_target.style.setProperty("scroll-snap-align", "end"); - // scroller maintains scroll position which is still valid as the target's - // snap area covers the snap port. - assert_equals(scroller.scrollTop, 100); - assert_equals(scroller.scrollLeft, 100); -}, "Changing a large target's snap alignment shouldn't make the scroller" + - " resnap if the scroller is already in a valid snap position."); - -// Similar to above test case except targets are too small to cover snap port, -// so scroller must snap in response to change in scroll-snap-align. -test(t => { - t.add_cleanup(cleanup); - const initial_target_height = initial_target.offsetHeight; - const initial_target_width = initial_target.offsetWidth; - const other_target_height = initial_target.offsetHeight; - const other_target_width = initial_target.offsetWidth; - t.add_cleanup(() => { - initial_target.style.setProperty("height", `${initial_target_height}px`); - initial_target.style.setProperty("width", `${initial_target_width}px`); - other_target.style.setProperty("height", `${other_target_height}px`); - other_target.style.setProperty("width", `${other_target_width}px`); - }) - scroller.scrollTo(0,0); - assert_equals(scroller.scrollTop, 100); - assert_equals(scroller.scrollLeft, 100); - - initial_target.style.setProperty("height", `${scroller.clientHeight * 2/3 }px`); - initial_target.style.setProperty("width", `${scroller.clientWidth * 2/3 }px`); - other_target.style.setProperty("height", `${scroller.clientHeight * 2/3 }px`); - other_target.style.setProperty("width", `${scroller.clientWidth * 2/3 }px`); - - // scroll (and snap) to top left of other target. - scroller.scrollTo(other_target.offsetTop, - other_target.offsetLeft); - assert_equals(scroller.scrollTop, other_target.offsetTop,); - assert_equals(scroller.scrollLeft, other_target.offsetLeft); - - other_target.style.setProperty("scroll-snap-align", "end"); - // should be scrolled so as to align scroller's bottom-right with - // other_target's bottom-right. - assert_equals(scroller.scrollTop, - other_target.offsetTop + other_target.offsetHeight - scroller.clientHeight); - assert_equals(scroller.scrollLeft, - other_target.offsetLeft + other_target.offsetWidth - scroller.clientWidth); -}, "Changing the current (non-covering) target's snap alignment should make " + - "the scroller snap according to the new alignment."); - test(t => { t.add_cleanup(cleanup); scroller.scrollTo(0,0);