Implement row height distribution as it was described in the comment. Consider to give space to empty unconstrained rows as one option bug 197391 r/sr=roc a=mtschrep

layout/tables/nsTableFrame.cpp

@@ -3278,7 +3278,8 @@ nsTableFrame::DistributeHeightToRows(const nsHTMLReflowState& aReflowState,
     return;
   }
 
-  // get the first row without a style height where its row group has an unconstrianed height
+  // get the first row without a style height where its row group has an
+  // unconstrained height
   nsTableRowGroupFrame* firstUnStyledRG  = nsnull;
   nsTableRowFrame*      firstUnStyledRow = nsnull;
   for (rgX = 0; rgX < rowGroups.Length() && !firstUnStyledRG; rgX++) {
@@ -3296,33 +3297,48 @@ nsTableFrame::DistributeHeightToRows(const nsHTMLReflowState& aReflowState,
     }
   }
 
-  nsTableRowFrame* lastElligibleRow = nsnull;
+  nsTableRowFrame* lastEligibleRow = nsnull;
-  // accumulate the correct divisor. This will be the total of all unstyled rows inside 
+  // Accumulate the correct divisor. This will be the total total height of all
-  // unstyled row groups, unless there are none, in which case, it will be all rows
+  // unstyled rows inside unstyled row groups, unless there are none, in which
+  // case, it will be number of all rows. If the unstyled rows don't have a
+  // height, divide the space equally among them.
   nscoord divisor = 0;
-  PRUint32 rowCount = 0;
+  PRInt32 eligibleRows = 0;
-  for (rgX = 0; rgX < rowGroups.Length(); rgX++) {
+  PRBool expandEmptyRows = PR_FALSE;
-    nsTableRowGroupFrame* rgFrame = rowGroups[rgX];
+
-    if (!firstUnStyledRG || !rgFrame->HasStyleHeight()) {
+  if (!firstUnStyledRow) {
-      nsTableRowFrame* rowFrame = rgFrame->GetFirstRow();
+    // there is no unstyled row
-      while (rowFrame) {
+    divisor = GetRowCount();
-        if (!firstUnStyledRG || !rowFrame->HasStyleHeight()) {
+  }
-          NS_ASSERTION(rowFrame->GetSize().height >= 0, "negative height");
+  else {
-          divisor += rowFrame->GetSize().height;
+    for (rgX = 0; rgX < rowGroups.Length(); rgX++) {
-          ++rowCount;
+      nsTableRowGroupFrame* rgFrame = rowGroups[rgX];
-          lastElligibleRow = rowFrame;
+      if (!firstUnStyledRG || !rgFrame->HasStyleHeight()) {
+        nsTableRowFrame* rowFrame = rgFrame->GetFirstRow();
+        while (rowFrame) {
+          if (!firstUnStyledRG || !rowFrame->HasStyleHeight()) {
+            NS_ASSERTION(rowFrame->GetSize().height >= 0,
+                         "negative row frame height");
+            divisor += rowFrame->GetSize().height;
+            eligibleRows++;
+            lastEligibleRow = rowFrame;
+          }
+          rowFrame = rowFrame->GetNextRow();
         }
-        rowFrame = rowFrame->GetNextRow();
+      }
+    }
+    if (divisor <= 0) {
+      if (eligibleRows > 0) {
+        expandEmptyRows = PR_TRUE;
+      }
+      else {
+        NS_ERROR("invalid divisor");
+        return;
       }
     }
   }
-  if (divisor < 0) {
-    NS_ERROR("invalid divisor");
-    return;
-  }
-
   // allocate the extra height to the unstyled row groups and rows
-  pctBasis = aAmount - amountUsed;
+  nscoord heightToDistribute = aAmount - amountUsed;
   yOriginRG = borderPadding.top + cellSpacingY;
   yEndRG = yOriginRG;
   for (rgX = 0; rgX < rowGroups.Length(); rgX++) {
@@ -3330,23 +3346,32 @@ nsTableFrame::DistributeHeightToRows(const nsHTMLReflowState& aReflowState,
     nscoord amountUsedByRG = 0;
     nscoord yOriginRow = 0;
     nsRect rgRect = rgFrame->GetRect();
-    // see if there is an eligible row group
+    // see if there is an eligible row group or we distribute to all rows
-    if (!firstUnStyledRG || !rgFrame->HasStyleHeight()) {
+    if (!firstUnStyledRG || !rgFrame->HasStyleHeight() || !eligibleRows) {
       nsTableRowFrame* rowFrame = rgFrame->GetFirstRow();
       while (rowFrame) {
         nsRect rowRect = rowFrame->GetRect();
-        // see if there is an eligible row
+        // see if there is an eligible row or we distribute to all rows
-        if (!firstUnStyledRow || !rowFrame->HasStyleHeight()) {
+        if (!firstUnStyledRow || !rowFrame->HasStyleHeight() || !eligibleRows) {          
-          // The amount of additional space each row gets is proportional to its height
+          float ratio;
-          float percent;
+          if (eligibleRows) {
-          if (divisor != 0) {
+            if (!expandEmptyRows) {
-            percent = float(rowRect.height) / float(divisor);
+              // The amount of additional space each row gets is proportional to
-          } else {
+              // its height
-            percent = 1.0f / float(rowCount);
+              ratio = float(rowRect.height) / float(divisor);
+            } else {
+              // empty rows get all the same additional space
+              ratio = 1.0f / float(eligibleRows);
+            }
           }
-          // give rows their percentage, except for the last row which gets the remainder
+          else {
-          nscoord amountForRow = (rowFrame == lastElligibleRow) 
+            // all rows get the same additional space
-                                 ? aAmount - amountUsed : NSToCoordRound(((float)(pctBasis)) * percent);
+            ratio = 1.0f / float(divisor);
+          }
+          // give rows their additional space, except for the last row which
+          // gets the remainder
+          nscoord amountForRow = (rowFrame == lastEligibleRow) 
+                                 ? aAmount - amountUsed : NSToCoordRound(((float)(heightToDistribute)) * ratio);
           amountForRow = PR_MIN(amountForRow, aAmount - amountUsed);
           // update the row height
           nsRect newRowRect(rowRect.x, yOriginRow, rowRect.width, rowRect.height + amountForRow);