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

Bug 1950560 - Do not clobber restoring the scroll position on re-snap. r=botond

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D239677
This commit is contained in:
Hiroyuki Ikezoe
2025-02-27 02:34:52 +00:00
parent b2b048a314
commit 602f35e441
3 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/ScrollContainerFrame.cpp
View File

@@ -5178,7 +5178,7 @@ nsSize ScrollContainerFrame::GetPageScrollAmount() const {
* when we reach our new position.
*/
void ScrollContainerFrame::ScrollToRestoredPosition() {
if (mRestorePos.y == -1 || mLastPos.x == -1 || mLastPos.y == -1) {
if (!NeedRestorePosition()) {
return;
}
// make sure our scroll position did not change for where we last put
@@ -7638,8 +7638,13 @@ Maybe<SnapDestination> ScrollContainerFrame::GetSnapPointForDestination(
Maybe<SnapDestination> ScrollContainerFrame::GetSnapPointForResnap() {
nsIContent* focusedContent =
GetContent()->GetComposedDoc()->GetUnretargetedFocusedContent();
// While we are reconstructing this scroll container, we might be in the
// process of restoring the scroll position, we need to respect it.
nsPoint currentOrRestorePos =
NeedRestorePosition() ? mRestorePos : GetScrollPosition();
return ScrollSnapUtils::GetSnapPointForResnap(
ComputeScrollSnapInfo(), GetLayoutScrollRange(), GetScrollPosition(),
ComputeScrollSnapInfo(), GetLayoutScrollRange(), currentOrRestorePos,
mLastSnapTargetIds, focusedContent);
}