corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1947470 - Do MoveInsideAndClamp for the given position:fixed rectangle to avoid unexpected scrolling. r=dlrobertson

Browse Source 
For safety, both of helper_scrollIntoView_bug1950744.html and
helper_scrollIntoView_bug1950744-2.html run with
layout.scroll_fixed_content_into_view_visually=true and
layout.scroll_fixed_content_into_view_visually=false because these tests
should NOT cause any scrolling regardless of the pref value.

Differential Revision: https://phabricator.services.mozilla.com/D243735
This commit is contained in:
Hiroyuki Ikezoe
2025-04-08 00:17:48 +00:00
parent 39b3f6141e
commit 66f31cb50d
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744-2.html
View File

@@ -33,17 +33,16 @@
<input type="text" id="name" />
</div>
<script>
const isAndroid = getPlatform() == "android";
async function test() {
is(window.scrollY, 0, "The initial scroll offset should be 0");
is(visualViewport.scale, 1.0, "The document should not get scaled");
is(visualViewport.pageTop, 0, "The initial visual viewport pageTop should be 0");
visualViewport.addEventListener("scroll", () => {
ok(isAndroid, "Any VisualViewport scroll event should not be observed");
ok(false, "Any VisualViewport scroll event should not be observed");
});
window.addEventListener("scroll", () => {
ok(isAndroid, "Any scroll event should not be observed");
ok(false, "Any scroll event should not be observed");
});
// Scroll to the input element inside a position:fixed element.
@@ -55,14 +54,9 @@ async function test() {
await promiseFrame();
await promiseFrame();
if (isAndroid) {
todo_is(visualViewport.pageTop, 0, "The visual viewport pageTop should be zero");
todo_is(window.scrollY, 0, "The scroll offset should be zero");
} else {
is(visualViewport.pageTop, 0, "The visual viewport pageTop should be zero");
is(window.scrollY, 0, "The scroll offset should be zero");
}
}
waitUntilApzStable()
.then(test)

9
gfx/layers/apz/test/mochitest/helper_scrollIntoView_bug1950744.html
View File

@@ -30,7 +30,6 @@
<div id="target"></div>
</div>
<script>
const isAndroid = getPlatform() == "android";
async function test() {
is(window.scrollY, 0, "The initial scroll offset should be 0");
is(visualViewport.scale, 1.0, "The document should not get scaled");
@@ -43,10 +42,10 @@ async function test() {
await scrollendPromise;
visualViewport.addEventListener("scroll", () => {
ok(isAndroid, "Any VisualViewport scroll event should not be observed");
ok(false, "Any VisualViewport scroll event should not be observed");
});
window.addEventListener("scroll", () => {
ok(isAndroid, "Any scroll event should not be observed");
ok(false, "Any scroll event should not be observed");
});
document.querySelector("#target").scrollIntoView();
@@ -57,12 +56,8 @@ async function test() {
await promiseFrame();
await promiseFrame();
if (isAndroid) {
todo_is(window.scrollY, 2000, "The scroll offset should stay at 2000px");
} else {
is(window.scrollY, 2000, "The scroll offset should stay at 2000px");
}
}
waitUntilApzStable()
.then(test)

18
gfx/layers/apz/test/mochitest/test_group_scrollIntoView.html
View File

@@ -15,8 +15,22 @@ var subtests = [
"prefs": [...prefs,
["layout.scroll_fixed_content_into_view_visually", true]]
},
{"file": "helper_scrollIntoView_bug1950744.html", prefs},
{"file": "helper_scrollIntoView_bug1950744-2.html", prefs},
{"file": "helper_scrollIntoView_bug1950744.html",
"prefs": [...prefs,
["layout.scroll_fixed_content_into_view_visually", false]]
},
{"file": "helper_scrollIntoView_bug1950744.html",
"prefs": [...prefs,
["layout.scroll_fixed_content_into_view_visually", true]]
},
{"file": "helper_scrollIntoView_bug1950744-2.html",
"prefs": [...prefs,
["layout.scroll_fixed_content_into_view_visually", false]]
},
{"file": "helper_scrollIntoView_bug1950744-2.html",
"prefs": [...prefs,
["layout.scroll_fixed_content_into_view_visually", true]]
},
];
if (isApzEnabled()) {

23
layout/base/PresShell.cpp
View File

@@ -3856,18 +3856,31 @@ void PresShell::ScrollFrameIntoVisualViewport(Maybe<nsPoint>& aDestination,
const nsSize visualViewportSize =
rootScrollContainer->GetVisualViewportSize();
const nsSize layoutViewportSize = root->GetLayoutViewportSize();
const nsRect layoutViewport = nsRect(nsPoint(), layoutViewportSize);
// `positon:fixed` element are attached/fixed to the ViewportFrame, which is
// the parent of the root scroll container frame, thus what we need here is
// the visible area of the position:fixed element inside the root scroll
// container frame.
// For example, if the top left position of the fixed element is (-100,
// -100), it's outside of the scrollable range either in the layout viewport
// or the visual viewport. Likewise, if the right bottom position of the
// fixed element is (110vw, 110vh), it's also outside of the scrollable
// range.
const nsRect clampedPositionFixedRect =
aPositionFixedRect.MoveInsideAndClamp(layoutViewport);
// If the position:fixed element is already inside the visual viewport, we
// don't need to scroll visually.
if (aPositionFixedRect.y >= 0 &&
aPositionFixedRect.YMost() <= visualViewportSize.height &&
aPositionFixedRect.x >= 0 &&
aPositionFixedRect.XMost() <= visualViewportSize.width) {
if (clampedPositionFixedRect.y >= 0 &&
clampedPositionFixedRect.YMost() <= visualViewportSize.height &&
clampedPositionFixedRect.x >= 0 &&
clampedPositionFixedRect.XMost() <= visualViewportSize.width) {
return;
}
// If the position:fixed element is totally outside of the the layout
// viewport, it will never be in the viewport.
const nsSize layoutViewportSize = root->GetLayoutViewportSize();
if (!NeedToVisuallyScroll(layoutViewportSize, aPositionFixedRect)) {
return;
}