Merging upstream version 125.0.1.

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

1 files changed, 35 insertions, 37 deletions

diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp
index 5d8119522f..1190561ee8 100644
--- a/layout/tables/nsTableRowFrame.cpp
+++ b/layout/tables/nsTableRowFrame.cpp
@@ -13,7 +13,6 @@
 #include "mozilla/ComputedStyle.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "nsStyleConsts.h"
-#include "nsGkAtoms.h"
 #include "nsIContent.h"
 #include "nsIFrame.h"
 #include "nsIFrameInlines.h"
@@ -23,9 +22,7 @@
 #include "nsHTMLParts.h"
 #include "nsTableColGroupFrame.h"
 #include "nsTableColFrame.h"
-#include "nsCOMPtr.h"
 #include "nsDisplayList.h"
-#include "nsIFrameInlines.h"
 #include <algorithm>
 
 #ifdef ACCESSIBILITY
@@ -443,35 +440,36 @@ void nsTableRowFrame::UpdateBSize(nscoord aBSize, nscoord aAscent,
     return;
   }
 
-  if (aBSize != NS_UNCONSTRAINEDSIZE) {
-    if (!(aCellFrame->HasVerticalAlignBaseline())) {  // only the cell's height
-                                                      // matters
-      if (GetInitialBSize() < aBSize) {
-        int32_t rowSpan = aTableFrame->GetEffectiveRowSpan(*aCellFrame);
-        if (rowSpan == 1) {
-          SetContentBSize(aBSize);
-        }
-      }
-    } else {  // the alignment on the baseline can change the bsize
-      NS_ASSERTION((aAscent != NS_UNCONSTRAINEDSIZE) &&
-                       (aDescent != NS_UNCONSTRAINEDSIZE),
-                   "invalid call");
-      // see if this is a long ascender
-      if (mMaxCellAscent < aAscent) {
-        mMaxCellAscent = aAscent;
-      }
-      // see if this is a long descender and without rowspan
-      if (mMaxCellDescent < aDescent) {
-        int32_t rowSpan = aTableFrame->GetEffectiveRowSpan(*aCellFrame);
-        if (rowSpan == 1) {
-          mMaxCellDescent = aDescent;
-        }
+  if (aBSize == NS_UNCONSTRAINEDSIZE) {
+    return;
+  }
+  if (!aCellFrame->HasVerticalAlignBaseline()) {
+    // only the cell's height matters
+    if (GetInitialBSize() < aBSize) {
+      int32_t rowSpan = aTableFrame->GetEffectiveRowSpan(*aCellFrame);
+      if (rowSpan == 1) {
+        SetContentBSize(aBSize);
       }
-      // keep the tallest bsize in sync
-      if (GetInitialBSize() < mMaxCellAscent + mMaxCellDescent) {
-        SetContentBSize(mMaxCellAscent + mMaxCellDescent);
+    }
+  } else {  // the alignment on the baseline can change the bsize
+    NS_ASSERTION(
+        aAscent != NS_UNCONSTRAINEDSIZE && aDescent != NS_UNCONSTRAINEDSIZE,
+        "invalid call");
+    // see if this is a long ascender
+    if (mMaxCellAscent < aAscent) {
+      mMaxCellAscent = aAscent;
+    }
+    // see if this is a long descender and without rowspan
+    if (mMaxCellDescent < aDescent) {
+      int32_t rowSpan = aTableFrame->GetEffectiveRowSpan(*aCellFrame);
+      if (rowSpan == 1) {
+        mMaxCellDescent = aDescent;
       }
     }
+    // keep the tallest bsize in sync
+    if (GetInitialBSize() < mMaxCellAscent + mMaxCellDescent) {
+      SetContentBSize(mMaxCellAscent + mMaxCellDescent);
+    }
   }
 }
 
@@ -497,7 +495,7 @@ nscoord nsTableRowFrame::CalcBSize(const ReflowInput& aReflowInput) {
        kidFrame = kidFrame->GetNextCell()) {
     MOZ_ASSERT(kidFrame->GetWritingMode() == wm);
     LogicalSize desSize = kidFrame->GetDesiredSize();
-    if ((NS_UNCONSTRAINEDSIZE == aReflowInput.AvailableBSize()) &&
+    if (NS_UNCONSTRAINEDSIZE == aReflowInput.AvailableBSize() &&
         !GetPrevInFlow()) {
       desSize.BSize(wm) = CalcCellActualBSize(kidFrame, desSize.BSize(wm), wm);
     }
@@ -706,19 +704,19 @@ void nsTableRowFrame::ReflowChildren(nsPresContext* aPresContext,
     bool doReflowChild = true;
     if (!aReflowInput.ShouldReflowAllKids() && !aTableFrame.IsGeometryDirty() &&
         !kidFrame->IsSubtreeDirty()) {
-      if (!aReflowInput.mFlags.mSpecialBSizeReflow) doReflowChild = false;
-    } else if ((NS_UNCONSTRAINEDSIZE != aReflowInput.AvailableBSize())) {
+      if (!aReflowInput.mFlags.mSpecialBSizeReflow) {
+        doReflowChild = false;
+      }
+    } else if (NS_UNCONSTRAINEDSIZE != aReflowInput.AvailableBSize()) {
       // We don't reflow a rowspan >1 cell here with a constrained bsize.
       // That happens in nsTableRowGroupFrame::SplitSpanningCells.
       if (aTableFrame.GetEffectiveRowSpan(*kidFrame) > 1) {
         doReflowChild = false;
       }
     }
-    if (aReflowInput.mFlags.mSpecialBSizeReflow) {
-      if (!isPaginated &&
-          !kidFrame->HasAnyStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE)) {
-        continue;
-      }
+    if (aReflowInput.mFlags.mSpecialBSizeReflow && !isPaginated &&
+        !kidFrame->HasAnyStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE)) {
+      continue;
     }
 
     uint32_t cellColIndex = kidFrame->ColIndex();