From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 servo/ports/geckolib/cbindgen.toml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'servo/ports/geckolib/cbindgen.toml')

diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
index b703dc6c92..8e6818e421 100644
--- a/servo/ports/geckolib/cbindgen.toml
+++ b/servo/ports/geckolib/cbindgen.toml
@@ -140,6 +140,7 @@ include = [
   "ScrollSnapStrictness",
   "ScrollSnapType",
   "ScrollTimelineName",
+  "TransitionBehavior",
   "ViewTimelineInset",
   "OverflowAnchor",
   "OverflowClipBox",
@@ -365,9 +366,7 @@ renaming_overrides_prefixing = true
 
 "CalcLengthPercentage" = """
   inline CSSCoord ResolveToCSSPixels(CSSCoord aBasis) const;
-
-  using CoordRounder = nscoord(*)(float);
-  nscoord Resolve(nscoord aBasis, CoordRounder) const;
+  inline nscoord Resolve(nscoord aBasis) const;
 """
 
 "GenericCalcNode" = """
@@ -428,10 +427,10 @@ renaming_overrides_prefixing = true
   inline bool IsDefinitelyZero() const;
   inline CSSCoord ResolveToCSSPixels(CSSCoord aPercentageBasisInCSSPixels) const;
   template<typename T> inline CSSCoord ResolveToCSSPixelsWith(T aPercentageGetter) const;
-  template<typename T, typename U>
-  inline nscoord Resolve(T aPercentageGetter, U aRoundingFunction) const;
-  template<typename T>
-  inline nscoord Resolve(nscoord aPercentageBasis, T aRoundingFunction) const;
+  template<typename T, typename PercentRounder>
+  inline nscoord Resolve(T aPercentageGetter, PercentRounder) const;
+  template<typename PercentRounder>
+  inline nscoord Resolve(nscoord aPercentageBasis, PercentRounder) const;
   template<typename T> inline nscoord Resolve(T aPercentageGetter) const;
   inline nscoord Resolve(nscoord aPercentageBasis) const;
 """
-- 
cgit v1.2.3