tor-browser

commit 8e441104183c1c26db3c8e1e20eed613e306846b
parent d92b01bce062eb01a32599393d62fc625652f725
Author: David Shin <dshin@mozilla.com>
Date:   Fri,  7 Nov 2025 17:57:08 +0000

Bug 1996832: Remove unused inset param for margin computation. r=layout-anchor-positioning-reviewers,layout-reviewers,emilio

Differential Revision: https://phabricator.services.mozilla.com/D271232

Diffstat:
M
layout/generic/AbsoluteContainingBlock.cpp
 | 
6
+++---
M
layout/generic/AbsoluteContainingBlock.h
 | 
2
+-
M
layout/generic/ReflowInput.cpp
 | 
10
++++------
M
layout/generic/ReflowInput.h
 | 
6
++----

4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/layout/generic/AbsoluteContainingBlock.cpp b/layout/generic/AbsoluteContainingBlock.cpp
@@ -816,7 +816,7 @@ void AbsoluteContainingBlock::ResolveSizeDependentOffsets(
 void AbsoluteContainingBlock::ResolveAutoMarginsAfterLayout(
     ReflowInput& aKidReflowInput, const LogicalSize& aCBSize,
     const LogicalSize& aKidSize, LogicalMargin& aMargin,
-    LogicalMargin& aOffsets) {
+    const LogicalMargin& aOffsets) {
   MOZ_ASSERT(aKidReflowInput.mFlags.mDeferAutoMarginComputation);
 
   WritingMode wm = aKidReflowInput.GetWritingMode();
@@ -849,7 +849,7 @@ void AbsoluteContainingBlock::ResolveAutoMarginsAfterLayout(
         styleMargin
             ->GetMargin(LogicalSide::IEnd, outerWM, anchorResolutionParams)
             ->IsAuto(),
-        aMargin, aOffsets);
+        aMargin);
   } else {
     ReflowInput::ComputeAbsPosBlockAutoMargin(
         availMarginSpace, outerWM,
@@ -859,7 +859,7 @@ void AbsoluteContainingBlock::ResolveAutoMarginsAfterLayout(
         styleMargin
             ->GetMargin(LogicalSide::BEnd, outerWM, anchorResolutionParams)
             ->IsAuto(),
-        aMargin, aOffsets);
+        aMargin);
   }
 
   aKidReflowInput.SetComputedLogicalMargin(outerWM, aMargin);
diff --git a/layout/generic/AbsoluteContainingBlock.h b/layout/generic/AbsoluteContainingBlock.h
@@ -145,7 +145,7 @@ class AbsoluteContainingBlock {
                                      const LogicalSize& aCBSize,
                                      const LogicalSize& aKidSize,
                                      LogicalMargin& aMargin,
-                                     LogicalMargin& aOffsets);
+                                     const LogicalMargin& aOffsets);
 
   void ReflowAbsoluteFrame(
       nsIFrame* aDelegatingFrame, nsPresContext* aPresContext,
diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp
@@ -1123,8 +1123,7 @@ void ReflowInput::ComputeAbsPosInlineAutoMargin(nscoord aAvailMarginSpace,
                                                 WritingMode aContainingBlockWM,
                                                 bool aIsMarginIStartAuto,
                                                 bool aIsMarginIEndAuto,
-                                                LogicalMargin& aMargin,
-                                                LogicalMargin& aOffsets) {
+                                                LogicalMargin& aMargin) {
   if (aIsMarginIStartAuto) {
     if (aIsMarginIEndAuto) {
       if (aAvailMarginSpace < 0) {
@@ -1158,8 +1157,7 @@ void ReflowInput::ComputeAbsPosBlockAutoMargin(nscoord aAvailMarginSpace,
                                                WritingMode aContainingBlockWM,
                                                bool aIsMarginBStartAuto,
                                                bool aIsMarginBEndAuto,
-                                               LogicalMargin& aMargin,
-                                               LogicalMargin& aOffsets) {
+                                               LogicalMargin& aMargin) {
   if (aIsMarginBStartAuto) {
     if (aIsMarginBEndAuto) {
       // Both 'margin-top' and 'margin-bottom' are 'auto', so they get
@@ -1925,7 +1923,7 @@ void ReflowInput::InitAbsoluteConstraints(const ReflowInput* aCBReflowInput,
                                        anchorResolutionParams.mBaseParams)
                            ->IsAuto();
     ComputeAbsPosInlineAutoMargin(availMarginSpace, cbwm, marginIStartIsAuto,
-                                  marginIEndIsAuto, margin, offsets);
+                                  marginIEndIsAuto, margin);
   }
 
   bool bSizeIsAuto =
@@ -1976,7 +1974,7 @@ void ReflowInput::InitAbsoluteConstraints(const ReflowInput* aCBReflowInput,
                            ->IsAuto();
 
     ComputeAbsPosBlockAutoMargin(availMarginSpace, cbwm, marginBStartIsAuto,
-                                 marginBEndIsAuto, margin, offsets);
+                                 marginBEndIsAuto, margin);
   }
 
   SetComputedLogicalOffsets(cbwm, offsets);
diff --git a/layout/generic/ReflowInput.h b/layout/generic/ReflowInput.h
@@ -827,8 +827,7 @@ struct ReflowInput : public SizeComputationInput {
                                            WritingMode aContainingBlockWM,
                                            bool aIsMarginBStartAuto,
                                            bool aIsMarginBEndAuto,
-                                           LogicalMargin& aMargin,
-                                           LogicalMargin& aOffsets);
+                                           LogicalMargin& aMargin);
 
   // Resolve any inline-axis 'auto' margins (if any) for an absolutely
   // positioned frame. aMargin and aOffsets are both outparams (though we only
@@ -837,8 +836,7 @@ struct ReflowInput : public SizeComputationInput {
                                             WritingMode aContainingBlockWM,
                                             bool aIsMarginIStartAuto,
                                             bool aIsMarginIEndAuto,
-                                            LogicalMargin& aMargin,
-                                            LogicalMargin& aOffsets);
+                                            LogicalMargin& aMargin);
 
  protected:
   void InitCBReflowInput();