Merging upstream version 125.0.1.

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

1 files changed, 0 insertions, 15 deletions

diff --git a/layout/generic/ScrollPositionUpdate.cpp b/layout/generic/ScrollPositionUpdate.cpp
index 9607d2d18a..a680768525 100644
--- a/layout/generic/ScrollPositionUpdate.cpp
+++ b/layout/generic/ScrollPositionUpdate.cpp
@@ -93,20 +93,6 @@ ScrollPositionUpdate ScrollPositionUpdate::NewPureRelativeScroll(
   return ret;
 }
 
-/*static*/
-ScrollPositionUpdate ScrollPositionUpdate::NewMergeableScroll(
-    ScrollOrigin aOrigin, nsPoint aDestination) {
-  MOZ_ASSERT(aOrigin == ScrollOrigin::AnchorAdjustment);
-
-  ScrollPositionUpdate ret;
-  ret.mScrollGeneration = sGenerationCounter.NewMainThreadGeneration();
-  ret.mType = ScrollUpdateType::MergeableAbsolute;
-  ret.mScrollMode = ScrollMode::Instant;
-  ret.mScrollOrigin = aOrigin;
-  ret.mDestination = CSSPoint::FromAppUnits(aDestination);
-  return ret;
-}
-
 bool ScrollPositionUpdate::operator==(
     const ScrollPositionUpdate& aOther) const {
   // instances are immutable, and all the fields are set when the generation
@@ -126,7 +112,6 @@ ScrollOrigin ScrollPositionUpdate::GetOrigin() const { return mScrollOrigin; }
 
 CSSPoint ScrollPositionUpdate::GetDestination() const {
   MOZ_ASSERT(mType == ScrollUpdateType::Absolute ||
-             mType == ScrollUpdateType::MergeableAbsolute ||
              mType == ScrollUpdateType::Relative);
   return mDestination;
 }