bug 55202 - honor height of cell, sr=attinasi, r=bernd.mielke@snafu.de

layout/html/table/src/nsTableFrame.cpp

@@ -3912,6 +3912,38 @@ nsTableFrame::IsAutoWidth(PRBool* aIsPctWidth)
   return nsTableOuterFrame::IsAutoWidth(*this, aIsPctWidth);
 }
 
+PRBool 
+nsTableFrame::IsAutoHeight()
+{
+  PRBool isAuto = PR_TRUE;  // the default
+  nsCOMPtr<nsIStyleContext> styleContext;
+  GetStyleContext(getter_AddRefs(styleContext)); 
+
+  nsStylePosition* position = (nsStylePosition*)styleContext->GetStyleData(eStyleStruct_Position);
+
+  switch (position->mHeight.GetUnit()) {
+    case eStyleUnit_Auto:         // specified auto width
+    case eStyleUnit_Proportional: // illegal for table, so ignored
+      break;
+    case eStyleUnit_Inherit:
+      // get width of parent and see if it is a specified value or not
+      // XXX for now, just return true
+      break;
+    case eStyleUnit_Coord:
+      isAuto = PR_FALSE;
+      break;
+    case eStyleUnit_Percent:
+      if (position->mWidth.GetPercentValue() > 0.0f) {
+        isAuto = PR_FALSE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return isAuto; 
+}
+
 nscoord 
 nsTableFrame::CalcBorderBoxWidth(const nsHTMLReflowState& aState)
 {

layout/html/table/src/nsTableFrame.h

@@ -240,6 +240,7 @@ public:
                                       nsIFrame*       aPriorChildFrame,
                                       nsIAtom*        aChildType);
   PRBool IsAutoWidth(PRBool* aIsPctWidth = nsnull);
+  PRBool IsAutoHeight();
   
   /** @return PR_TRUE if aDisplayType represents a rowgroup of any sort
     * (header, footer, or body)

layout/html/table/src/nsTableRowGroupFrame.cpp

@@ -559,8 +559,7 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext*          aPresContext,
     GetNextFrame(rowFrame, &rowFrame); // Get the next row
   }
 
-  // Step 2:  Now account for cells that span rows. We only do this if there are cells
+  // Step 2:  Now account for cells that span rows. A spanning cell's height is the sum of the heights of the 
-  //          that span rows. A spanning cell's height is the sum of the heights of the 
   //          rows it spans, or it's own desired height, whichever is greater.
   //          If the cell's desired height is the larger value, resize the rows and contained
   //          cells by an equal percentage of the additional space.
@@ -569,15 +568,16 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext*          aPresContext,
   //          row-spanning cells didn't change prior calculations. Since we are guaranteed 
   //          to have found the max height spanners the first time through, we know we only 
   //          need two passes, not an arbitrary number.
-  if (hasRowSpanningCell) {
+  nscoord deltaY = 0;
-    nscoord deltaY = 0;
+  nscoord lastCount = (hasRowSpanningCell) ? 2 : 1;
-    for (PRInt32 counter = 0; counter < 2; counter++) {
+  for (PRInt32 counter = 0; counter <= lastCount; counter++) {
-      rowFrame = GetFirstFrame();
+    rowFrame = GetFirstFrame();
-      rowIndex = 0;
+    rowIndex = 0;
-      while (rowFrame) {
+    while (rowFrame) {
-        nsCOMPtr<nsIAtom> rowType;
+      nsCOMPtr<nsIAtom> rowType;
-        rowFrame->GetFrameType(getter_AddRefs(rowType));
+      rowFrame->GetFrameType(getter_AddRefs(rowType));
-        if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
+      if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
+        if (hasRowSpanningCell) {
           // check this row for a cell with rowspans
           nsIFrame* cellFrame;
           rowFrame->FirstChild(aPresContext, nsnull, &cellFrame);
@@ -695,34 +695,34 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext*          aPresContext,
             }
             cellFrame->GetNextSibling(&cellFrame); // Get the next row child (cell frame)
           }
-  
-          // If this is pass 2 then resize the row to its final size and move the
-          // row's position if the previous rows have caused a shift
-          if (1 == counter) {
-            PRBool movedFrame = (deltaY != 0);
-            nsRect rowBounds;
-  
-            // Move the row to the correct position
-            rowFrame->GetRect(rowBounds); // added
-            rowBounds.y += deltaY;
-  
-            // Adjust our running delta
-            nscoord rowHeight = (rowHeights[rowIndex] > 0) ? rowHeights[rowIndex] : 0;
-            deltaY += rowHeight - rowBounds.height;
-  
-            // Resize the row to its final size and position
-            rowBounds.height = rowHeight;
-            rowFrame->SetRect(aPresContext, rowBounds);
-
-            if (movedFrame) {
-              nsTableFrame::RePositionViews(aPresContext, rowFrame);
-            }
-          }
-          
-          rowIndex++;
         }
-        GetNextFrame(rowFrame, &rowFrame); // Get the next rowgroup child (row frame)
+  
+        // If this is the last pass then resize the row to its final size and move the
+        // row's position if the previous rows have caused a shift
+        if (lastCount == counter) {
+          PRBool movedFrame = (deltaY != 0);
+          nsRect rowBounds;
+  
+          // Move the row to the correct position
+          rowFrame->GetRect(rowBounds); // added
+          rowBounds.y += deltaY;
+  
+          // Adjust our running delta
+          nscoord rowHeight = (rowHeights[rowIndex] > 0) ? rowHeights[rowIndex] : 0;
+          deltaY += rowHeight - rowBounds.height;
+  
+          // Resize the row to its final size and position
+          rowBounds.height = rowHeight;
+          rowFrame->SetRect(aPresContext, rowBounds);
+
+          if (movedFrame) {
+            nsTableFrame::RePositionViews(aPresContext, rowFrame);
+          }
+        }
+          
+        rowIndex++;
       }
+      GetNextFrame(rowFrame, &rowFrame); // Get the next rowgroup child (row frame)
     }
   }
 
@@ -1401,8 +1401,8 @@ nsTableRowGroupFrame::IR_TargetIsChild(nsIPresContext*        aPresContext,
   // changed). If so, just return and don't bother adjusting the rows
   // that follow
   if (!aReflowState.tableFrame->NeedsReflow(aReflowState.reflowState)) {
-    // If the row has no cells that span into or across the row, then we
+    // Only call CalculateRowHeights() if necessary since it can be expensive
-    // don't have to call CalculateRowHeights() which is quite expensive
+    PRBool needToCalcRowHeights = PR_FALSE; 
     if (IsSimpleRowFrame(aReflowState.tableFrame, aNextFrame)) {
       // See if the row changed height
       if (oldKidRect.height == desiredSize.height) {
@@ -1413,46 +1413,51 @@ nsTableRowGroupFrame::IR_TargetIsChild(nsIPresContext*        aPresContext,
       } else {
         // Inform the row of its new height.
         ((nsTableRowFrame*)aNextFrame)->DidResize(aPresContext, aReflowState.reflowState);
+        if (aReflowState.tableFrame->IsAutoHeight()) {
+          // Because other cells in the row may need to be be aligned differently,
+          // repaint the entire row
+          // XXX Improve this so the row knows it should bitblt (or repaint) those
+          // cells that change position...
+          Invalidate(aPresContext, kidRect);
 
-        // Because other cells in the row may need to be be aligned differently,
+          // Invalidate the area we're offseting. Note that we only repaint within
-        // repaint the entire row
+          // our existing frame bounds.
-        // XXX Improve this so the row knows it should bitblt (or repaint) those
+          // XXX It would be better to bitblt the row frames and not repaint,
-        // cells that change position...
+          // but we don't have such a view manager function yet...
-        Invalidate(aPresContext, kidRect);
+          if (kidRect.YMost() < mRect.height) {
+            nsRect  dirtyRect(0, kidRect.YMost(),
+                              mRect.width, mRect.height - kidRect.YMost());
+            Invalidate(aPresContext, dirtyRect);
+          }
 
-        // Invalidate the area we're offseting. Note that we only repaint within
+          // Adjust the frames that follow
-        // our existing frame bounds.
+          AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
-        // XXX It would be better to bitblt the row frames and not repaint,
+                                    desiredSize.height - oldKidRect.height);
-        // but we don't have such a view manager function yet...
+          aDesiredSize.height = aReflowState.y;
-        if (kidRect.YMost() < mRect.height) {
-          nsRect  dirtyRect(0, kidRect.YMost(),
-                            mRect.width, mRect.height - kidRect.YMost());
-          Invalidate(aPresContext, dirtyRect);
         }
-
+        else needToCalcRowHeights = PR_TRUE;
-        // Adjust the frames that follow
-        AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
-                                  desiredSize.height - oldKidRect.height);
-        aDesiredSize.height = aReflowState.y;
       }
     } else {
       if (desiredSize.mNothingChanged) { // mNothingChanges currently only works when a cell is the target
         // the cell frame did not change size. Just calculate our desired height
         aDesiredSize.height = GetFrameYMost(GetLastRowSibling(mFrames.FirstChild()));
-      } else {
+      } 
-        // Adjust the frames that follow...
+      else needToCalcRowHeights = PR_TRUE;
-        AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
+    }
-                                  desiredSize.height - oldKidRect.height);
+    if (needToCalcRowHeights) {
+      // Adjust the frames that follow... 
+      // XXX is this needed since CalculateRowHeights will be called?
+      //AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
+      //                          desiredSize.height - oldKidRect.height);
     
-        // Now recalculate the row heights
+      // Now recalculate the row heights
-        CalculateRowHeights(aPresContext, aDesiredSize, aReflowState.reflowState);
+      CalculateRowHeights(aPresContext, aDesiredSize, aReflowState.reflowState);
       
-        // Because we don't know what changed repaint everything.
+      // Because we don't know what changed repaint everything.
-        // XXX We should change CalculateRowHeights() to return the bounding
+      // XXX We should change CalculateRowHeights() to return the bounding
-        // rect of what changed. Or whether anything moved or changed size...
+      // rect of what changed. Or whether anything moved or changed size...
-        nsRect  dirtyRect(0, 0, mRect.width, mRect.height);
+      nsRect  dirtyRect(0, 0, mRect.width, mRect.height);
-        Invalidate(aPresContext, dirtyRect);
+      Invalidate(aPresContext, dirtyRect);
-      }
     }
   }
   

layout/tables/nsTableFrame.cpp

@@ -3912,6 +3912,38 @@ nsTableFrame::IsAutoWidth(PRBool* aIsPctWidth)
   return nsTableOuterFrame::IsAutoWidth(*this, aIsPctWidth);
 }
 
+PRBool 
+nsTableFrame::IsAutoHeight()
+{
+  PRBool isAuto = PR_TRUE;  // the default
+  nsCOMPtr<nsIStyleContext> styleContext;
+  GetStyleContext(getter_AddRefs(styleContext)); 
+
+  nsStylePosition* position = (nsStylePosition*)styleContext->GetStyleData(eStyleStruct_Position);
+
+  switch (position->mHeight.GetUnit()) {
+    case eStyleUnit_Auto:         // specified auto width
+    case eStyleUnit_Proportional: // illegal for table, so ignored
+      break;
+    case eStyleUnit_Inherit:
+      // get width of parent and see if it is a specified value or not
+      // XXX for now, just return true
+      break;
+    case eStyleUnit_Coord:
+      isAuto = PR_FALSE;
+      break;
+    case eStyleUnit_Percent:
+      if (position->mWidth.GetPercentValue() > 0.0f) {
+        isAuto = PR_FALSE;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return isAuto; 
+}
+
 nscoord 
 nsTableFrame::CalcBorderBoxWidth(const nsHTMLReflowState& aState)
 {

layout/tables/nsTableFrame.h

@@ -240,6 +240,7 @@ public:
                                       nsIFrame*       aPriorChildFrame,
                                       nsIAtom*        aChildType);
   PRBool IsAutoWidth(PRBool* aIsPctWidth = nsnull);
+  PRBool IsAutoHeight();
   
   /** @return PR_TRUE if aDisplayType represents a rowgroup of any sort
     * (header, footer, or body)

layout/tables/nsTableRowGroupFrame.cpp

@@ -559,8 +559,7 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext*          aPresContext,
     GetNextFrame(rowFrame, &rowFrame); // Get the next row
   }
 
-  // Step 2:  Now account for cells that span rows. We only do this if there are cells
+  // Step 2:  Now account for cells that span rows. A spanning cell's height is the sum of the heights of the 
-  //          that span rows. A spanning cell's height is the sum of the heights of the 
   //          rows it spans, or it's own desired height, whichever is greater.
   //          If the cell's desired height is the larger value, resize the rows and contained
   //          cells by an equal percentage of the additional space.
@@ -569,15 +568,16 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext*          aPresContext,
   //          row-spanning cells didn't change prior calculations. Since we are guaranteed 
   //          to have found the max height spanners the first time through, we know we only 
   //          need two passes, not an arbitrary number.
-  if (hasRowSpanningCell) {
+  nscoord deltaY = 0;
-    nscoord deltaY = 0;
+  nscoord lastCount = (hasRowSpanningCell) ? 2 : 1;
-    for (PRInt32 counter = 0; counter < 2; counter++) {
+  for (PRInt32 counter = 0; counter <= lastCount; counter++) {
-      rowFrame = GetFirstFrame();
+    rowFrame = GetFirstFrame();
-      rowIndex = 0;
+    rowIndex = 0;
-      while (rowFrame) {
+    while (rowFrame) {
-        nsCOMPtr<nsIAtom> rowType;
+      nsCOMPtr<nsIAtom> rowType;
-        rowFrame->GetFrameType(getter_AddRefs(rowType));
+      rowFrame->GetFrameType(getter_AddRefs(rowType));
-        if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
+      if (nsLayoutAtoms::tableRowFrame == rowType.get()) {
+        if (hasRowSpanningCell) {
           // check this row for a cell with rowspans
           nsIFrame* cellFrame;
           rowFrame->FirstChild(aPresContext, nsnull, &cellFrame);
@@ -695,34 +695,34 @@ nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext*          aPresContext,
             }
             cellFrame->GetNextSibling(&cellFrame); // Get the next row child (cell frame)
           }
-  
-          // If this is pass 2 then resize the row to its final size and move the
-          // row's position if the previous rows have caused a shift
-          if (1 == counter) {
-            PRBool movedFrame = (deltaY != 0);
-            nsRect rowBounds;
-  
-            // Move the row to the correct position
-            rowFrame->GetRect(rowBounds); // added
-            rowBounds.y += deltaY;
-  
-            // Adjust our running delta
-            nscoord rowHeight = (rowHeights[rowIndex] > 0) ? rowHeights[rowIndex] : 0;
-            deltaY += rowHeight - rowBounds.height;
-  
-            // Resize the row to its final size and position
-            rowBounds.height = rowHeight;
-            rowFrame->SetRect(aPresContext, rowBounds);
-
-            if (movedFrame) {
-              nsTableFrame::RePositionViews(aPresContext, rowFrame);
-            }
-          }
-          
-          rowIndex++;
         }
-        GetNextFrame(rowFrame, &rowFrame); // Get the next rowgroup child (row frame)
+  
+        // If this is the last pass then resize the row to its final size and move the
+        // row's position if the previous rows have caused a shift
+        if (lastCount == counter) {
+          PRBool movedFrame = (deltaY != 0);
+          nsRect rowBounds;
+  
+          // Move the row to the correct position
+          rowFrame->GetRect(rowBounds); // added
+          rowBounds.y += deltaY;
+  
+          // Adjust our running delta
+          nscoord rowHeight = (rowHeights[rowIndex] > 0) ? rowHeights[rowIndex] : 0;
+          deltaY += rowHeight - rowBounds.height;
+  
+          // Resize the row to its final size and position
+          rowBounds.height = rowHeight;
+          rowFrame->SetRect(aPresContext, rowBounds);
+
+          if (movedFrame) {
+            nsTableFrame::RePositionViews(aPresContext, rowFrame);
+          }
+        }
+          
+        rowIndex++;
       }
+      GetNextFrame(rowFrame, &rowFrame); // Get the next rowgroup child (row frame)
     }
   }
 
@@ -1401,8 +1401,8 @@ nsTableRowGroupFrame::IR_TargetIsChild(nsIPresContext*        aPresContext,
   // changed). If so, just return and don't bother adjusting the rows
   // that follow
   if (!aReflowState.tableFrame->NeedsReflow(aReflowState.reflowState)) {
-    // If the row has no cells that span into or across the row, then we
+    // Only call CalculateRowHeights() if necessary since it can be expensive
-    // don't have to call CalculateRowHeights() which is quite expensive
+    PRBool needToCalcRowHeights = PR_FALSE; 
     if (IsSimpleRowFrame(aReflowState.tableFrame, aNextFrame)) {
       // See if the row changed height
       if (oldKidRect.height == desiredSize.height) {
@@ -1413,46 +1413,51 @@ nsTableRowGroupFrame::IR_TargetIsChild(nsIPresContext*        aPresContext,
       } else {
         // Inform the row of its new height.
         ((nsTableRowFrame*)aNextFrame)->DidResize(aPresContext, aReflowState.reflowState);
+        if (aReflowState.tableFrame->IsAutoHeight()) {
+          // Because other cells in the row may need to be be aligned differently,
+          // repaint the entire row
+          // XXX Improve this so the row knows it should bitblt (or repaint) those
+          // cells that change position...
+          Invalidate(aPresContext, kidRect);
 
-        // Because other cells in the row may need to be be aligned differently,
+          // Invalidate the area we're offseting. Note that we only repaint within
-        // repaint the entire row
+          // our existing frame bounds.
-        // XXX Improve this so the row knows it should bitblt (or repaint) those
+          // XXX It would be better to bitblt the row frames and not repaint,
-        // cells that change position...
+          // but we don't have such a view manager function yet...
-        Invalidate(aPresContext, kidRect);
+          if (kidRect.YMost() < mRect.height) {
+            nsRect  dirtyRect(0, kidRect.YMost(),
+                              mRect.width, mRect.height - kidRect.YMost());
+            Invalidate(aPresContext, dirtyRect);
+          }
 
-        // Invalidate the area we're offseting. Note that we only repaint within
+          // Adjust the frames that follow
-        // our existing frame bounds.
+          AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
-        // XXX It would be better to bitblt the row frames and not repaint,
+                                    desiredSize.height - oldKidRect.height);
-        // but we don't have such a view manager function yet...
+          aDesiredSize.height = aReflowState.y;
-        if (kidRect.YMost() < mRect.height) {
-          nsRect  dirtyRect(0, kidRect.YMost(),
-                            mRect.width, mRect.height - kidRect.YMost());
-          Invalidate(aPresContext, dirtyRect);
         }
-
+        else needToCalcRowHeights = PR_TRUE;
-        // Adjust the frames that follow
-        AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
-                                  desiredSize.height - oldKidRect.height);
-        aDesiredSize.height = aReflowState.y;
       }
     } else {
       if (desiredSize.mNothingChanged) { // mNothingChanges currently only works when a cell is the target
         // the cell frame did not change size. Just calculate our desired height
         aDesiredSize.height = GetFrameYMost(GetLastRowSibling(mFrames.FirstChild()));
-      } else {
+      } 
-        // Adjust the frames that follow...
+      else needToCalcRowHeights = PR_TRUE;
-        AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
+    }
-                                  desiredSize.height - oldKidRect.height);
+    if (needToCalcRowHeights) {
+      // Adjust the frames that follow... 
+      // XXX is this needed since CalculateRowHeights will be called?
+      //AdjustSiblingsAfterReflow(aPresContext, aReflowState, aNextFrame,
+      //                          desiredSize.height - oldKidRect.height);
     
-        // Now recalculate the row heights
+      // Now recalculate the row heights
-        CalculateRowHeights(aPresContext, aDesiredSize, aReflowState.reflowState);
+      CalculateRowHeights(aPresContext, aDesiredSize, aReflowState.reflowState);
       
-        // Because we don't know what changed repaint everything.
+      // Because we don't know what changed repaint everything.
-        // XXX We should change CalculateRowHeights() to return the bounding
+      // XXX We should change CalculateRowHeights() to return the bounding
-        // rect of what changed. Or whether anything moved or changed size...
+      // rect of what changed. Or whether anything moved or changed size...
-        nsRect  dirtyRect(0, 0, mRect.width, mRect.height);
+      nsRect  dirtyRect(0, 0, mRect.width, mRect.height);
-        Invalidate(aPresContext, dirtyRect);
+      Invalidate(aPresContext, dirtyRect);
-      }
     }
   }