From 3cfa044456b6bb21c43c119a523b865caa95f922 Mon Sep 17 00:00:00 2001
From: Marian-Vasile Laza <mlaza@mozilla.com>
Date: Thu, 16 Mar 2023 01:55:48 +0200
Subject: [PATCH] Backed out changeset de233af59c21 (bug 1822433) for wpt
 failures on scroll-snap-type-on-root-element.html.

---
 layout/generic/ScrollSnap.cpp                    | 16 ++++------------
 .../scroll-snap-type-on-root-element.html.ini    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 testing/web-platform/meta/css/css-scroll-snap/scroll-snap-type-on-root-element.html.ini

diff --git a/layout/generic/ScrollSnap.cpp b/layout/generic/ScrollSnap.cpp
index a031b9b67388..4260bee3b3b5 100644
--- a/layout/generic/ScrollSnap.cpp
+++ b/layout/generic/ScrollSnap.cpp
@@ -124,18 +124,10 @@ CalcSnapPoints::CalcSnapPoints(ScrollUnit aUnit, ScrollSnapFlags aSnapFlags,
 
 SnapTarget CalcSnapPoints::GetBestEdge() const {
   return SnapTarget{
-      nsPoint(
-          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,
-          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),
+      nsPoint(mTrackerOnX.mEdgeFound ? mTrackerOnX.mBestEdge.mPosition
+                                     : mStartPos.x,
+              mTrackerOnY.mEdgeFound ? mTrackerOnY.mBestEdge.mPosition
+                                     : mStartPos.y),
       ScrollSnapTargetIds{mTrackerOnX.mTargetIds, mTrackerOnY.mTargetIds}};
 }
 
diff --git a/testing/web-platform/meta/css/css-scroll-snap/scroll-snap-type-on-root-element.html.ini b/testing/web-platform/meta/css/css-scroll-snap/scroll-snap-type-on-root-element.html.ini
new file mode 100644
index 000000000000..4c5b85c4e569
--- /dev/null
+++ b/testing/web-platform/meta/css/css-scroll-snap/scroll-snap-type-on-root-element.html.ini
@@ -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