Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 6 deletions

diff --git a/layout/generic/ScrollPositionUpdate.h b/layout/generic/ScrollPositionUpdate.h
index 0e8dc020c1..ca22da8af0 100644
--- a/layout/generic/ScrollPositionUpdate.h
+++ b/layout/generic/ScrollPositionUpdate.h
@@ -34,9 +34,6 @@ enum class ScrollUpdateType {
   // The delta should be applied to whatever the current scroll position is
   // on the receiver side.
   PureRelative,
-  // Similar to |Absolute|, but even if there's an active async scroll animation
-  // the position update will NOT cancel the async scroll animation.
-  MergeableAbsolute,
 };
 
 enum class ScrollTriggeredByScript : bool { No, Yes };
@@ -86,9 +83,6 @@ class ScrollPositionUpdate {
                                                     ScrollMode aMode,
                                                     const nsPoint& aDelta);
 
-  static ScrollPositionUpdate NewMergeableScroll(ScrollOrigin aOrigin,
-                                                 nsPoint aDestination);
-
   bool operator==(const ScrollPositionUpdate& aOther) const;
 
   MainThreadScrollGeneration GetGeneration() const;