nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset de233af59c21 (bug 1822433) for wpt failures on scroll-snap-type-on-root-element.html.

Browse source
This commit is contained in:
Marian-Vasile Laza 2023-03-16 01:55:48 +02:00
parent b1bb1b3c9b
commit 3cfa044456
2 changed files with 16 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
layout/generic/ScrollSnap.cpp
View file

@ -124,17 +124,9 @@ CalcSnapPoints::CalcSnapPoints(ScrollUnit aUnit, ScrollSnapFlags aSnapFlags,
SnapTarget CalcSnapPoints::GetBestEdge() const { SnapTarget CalcSnapPoints::GetBestEdge() const {
return SnapTarget{ return SnapTarget{
nsPoint( nsPoint(mTrackerOnX.mEdgeFound ? mTrackerOnX.mBestEdge.mPosition
mTrackerOnX.mEdgeFound ? mTrackerOnX.mBestEdge.mPosition
// In the case of IntendedEndPosition (i.e. the destination point is
// explicitely specied, e.g. scrollTo) use the destination point if we
// didn't find any candidates.
: !(mSnapFlags & ScrollSnapFlags::IntendedDirection) ? mDestination.x
: mStartPos.x, : mStartPos.x,
mTrackerOnY.mEdgeFound ? mTrackerOnY.mBestEdge.mPosition mTrackerOnY.mEdgeFound ? mTrackerOnY.mBestEdge.mPosition
// Same as above X axis case, use the destination point if we didn't
// find any candidates.
: !(mSnapFlags & ScrollSnapFlags::IntendedDirection) ? mDestination.y
: mStartPos.y), : mStartPos.y),
ScrollSnapTargetIds{mTrackerOnX.mTargetIds, mTrackerOnY.mTargetIds}}; ScrollSnapTargetIds{mTrackerOnX.mTargetIds, mTrackerOnY.mTargetIds}};
} }

12
testing/web-platform/meta/css/css-scroll-snap/scroll-snap-type-on-root-element.html.ini Normal file
View file

@ -0,0 +1,12 @@
[scroll-snap-type-on-root-element.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[The scroll-snap-type on the root element is applied]
expected:
if os == "android": FAIL
[The writing-mode (vertical-lr) on the body is used]
expected: FAIL
[The writing-mode (horizontal-tb) on the body is used ]
expected: FAIL