diff --git a/layout/html/table/src/nsTableCellFrame.cpp b/layout/html/table/src/nsTableCellFrame.cpp
index c9b9dff46b6c..7c1078442d1a 100644
--- a/layout/html/table/src/nsTableCellFrame.cpp
+++ b/layout/html/table/src/nsTableCellFrame.cpp
@@ -673,18 +673,18 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext,
if (border.right > 0)
smallestMinWidth += onePixel;
}
- PRInt32 colspan = GetColSpan();
- if (colspan > 1) {
- smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
- nscoord spacingX = tableFrame->GetCellSpacingX();
- nscoord spacingExtra = spacingX * (colspan - 1);
- smallestMinWidth += spacingExtra;
- if (padding.left > 0) {
- smallestMinWidth -= onePixel;
- }
+ }
+ PRInt32 colspan = GetColSpan();
+ if (colspan > 1) {
+ smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
+ nscoord spacingX = tableFrame->GetCellSpacingX();
+ nscoord spacingExtra = spacingX * (colspan - 1);
+ smallestMinWidth += spacingExtra;
+ if (padding.left > 0) {
+ smallestMinWidth -= onePixel;
}
}
-
+
if ((0 == kidSize.width) && (NS_UNCONSTRAINEDSIZE != kidReflowState.availableWidth)) {
// empty content has to be forced to the assigned width for resize or incremental reflow
kidSize.width = kidReflowState.availableWidth;
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index c9b9dff46b6c..7c1078442d1a 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -673,18 +673,18 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext,
if (border.right > 0)
smallestMinWidth += onePixel;
}
- PRInt32 colspan = GetColSpan();
- if (colspan > 1) {
- smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
- nscoord spacingX = tableFrame->GetCellSpacingX();
- nscoord spacingExtra = spacingX * (colspan - 1);
- smallestMinWidth += spacingExtra;
- if (padding.left > 0) {
- smallestMinWidth -= onePixel;
- }
+ }
+ PRInt32 colspan = GetColSpan();
+ if (colspan > 1) {
+ smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
+ nscoord spacingX = tableFrame->GetCellSpacingX();
+ nscoord spacingExtra = spacingX * (colspan - 1);
+ smallestMinWidth += spacingExtra;
+ if (padding.left > 0) {
+ smallestMinWidth -= onePixel;
}
}
-
+
if ((0 == kidSize.width) && (NS_UNCONSTRAINEDSIZE != kidReflowState.availableWidth)) {
// empty content has to be forced to the assigned width for resize or incremental reflow
kidSize.width = kidReflowState.availableWidth;