Bug 1674931 Part 5 - Remove zero-argument ReflowInput::ComputedSizeWithBorderPadding(). r=jfkthame

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

layout/forms/nsCheckboxRadioFrame.cpp

@@ -120,8 +120,8 @@ void nsCheckboxRadioFrame::Reflow(nsPresContext* aPresContext,
     RegUnRegAccessKey(static_cast<nsIFrame*>(this), true);
   }
 
-  aDesiredSize.SetSize(aReflowInput.GetWritingMode(),
-                       aReflowInput.ComputedSizeWithBorderPadding());
+  const auto wm = aReflowInput.GetWritingMode();
+  aDesiredSize.SetSize(wm, aReflowInput.ComputedSizeWithBorderPadding(wm));
 
   if (nsLayoutUtils::FontSizeInflationEnabled(aPresContext)) {
     float inflation = nsLayoutUtils::FontSizeInflationFor(this);

layout/forms/nsMeterFrame.cpp

@@ -99,8 +99,8 @@ void nsMeterFrame::Reflow(nsPresContext* aPresContext,
 
   ReflowBarFrame(barFrame, aPresContext, aReflowInput, aStatus);
 
-  aDesiredSize.SetSize(aReflowInput.GetWritingMode(),
-                       aReflowInput.ComputedSizeWithBorderPadding());
+  const auto wm = aReflowInput.GetWritingMode();
+  aDesiredSize.SetSize(wm, aReflowInput.ComputedSizeWithBorderPadding(wm));
 
   aDesiredSize.SetOverflowAreasToDesiredBounds();
   ConsiderChildOverflow(aDesiredSize.mOverflowAreas, barFrame);

layout/forms/nsProgressFrame.cpp

@@ -102,8 +102,8 @@ void nsProgressFrame::Reflow(nsPresContext* aPresContext,
     nsCheckboxRadioFrame::RegUnRegAccessKey(this, true);
   }
 
-  aDesiredSize.SetSize(aReflowInput.GetWritingMode(),
-                       aReflowInput.ComputedSizeWithBorderPadding());
+  const auto wm = aReflowInput.GetWritingMode();
+  aDesiredSize.SetSize(wm, aReflowInput.ComputedSizeWithBorderPadding(wm));
   aDesiredSize.SetOverflowAreasToDesiredBounds();
 
   for (auto childFrame : PrincipalChildList()) {

layout/generic/ReflowInput.h

@@ -404,16 +404,9 @@ struct ReflowInput : public SizeComputationInput {
     return ComputedSize(aWM) + ComputedLogicalPadding(aWM).Size(aWM);
   }
 
-  mozilla::LogicalSize ComputedSizeWithBorderPadding() const {
-    mozilla::WritingMode wm = GetWritingMode();
-    return mozilla::LogicalSize(
-        wm, ComputedISize() + ComputedLogicalBorderPadding(wm).IStartEnd(wm),
-        ComputedBSize() + ComputedLogicalBorderPadding(wm).BStartEnd(wm));
-  }
-
   mozilla::LogicalSize ComputedSizeWithBorderPadding(
       mozilla::WritingMode aWM) const {
-    return ComputedSizeWithBorderPadding().ConvertTo(aWM, GetWritingMode());
+    return ComputedSize(aWM) + ComputedLogicalBorderPadding(aWM).Size(aWM);
   }
 
   mozilla::LogicalSize ComputedSizeWithMarginBorderPadding() const {

layout/generic/nsBlockFrame.cpp

@@ -7638,7 +7638,7 @@ nsBlockFrame::ReplacedElementISizeToClear nsBlockFrame::ISizeToClearPastFloats(
   ReflowInput reflowInput(aState.mPresContext, aState.mReflowInput, aFrame,
                           availSpace);
   result.borderBoxISize =
-      reflowInput.ComputedSizeWithBorderPadding().ConvertTo(wm, frWM).ISize(wm);
+      reflowInput.ComputedSizeWithBorderPadding(wm).ISize(wm);
   // Use the margins from offsetState rather than reflowInput so that
   // they aren't reduced by ignoring margins in overconstrained cases.
   LogicalMargin computedMargin = offsetState.ComputedLogicalMargin(wm);

layout/generic/nsSubDocumentFrame.cpp

@@ -704,8 +704,8 @@ void nsSubDocumentFrame::Reflow(nsPresContext* aPresContext,
   NS_ASSERTION(mContent->GetPrimaryFrame() == this, "Shouldn't happen");
 
   // XUL <iframe> or <browser>, or HTML <iframe>, <object> or <embed>
-  aDesiredSize.SetSize(aReflowInput.GetWritingMode(),
-                       aReflowInput.ComputedSizeWithBorderPadding());
+  const auto wm = aReflowInput.GetWritingMode();
+  aDesiredSize.SetSize(wm, aReflowInput.ComputedSizeWithBorderPadding(wm));
 
   // "offset" is the offset of our content area from our frame's
   // top-left corner.