Fixed bugs with combined-area continuing to include trimmed whitespace (wip for 12297); Added support for tracking trim for 16176)

layout/generic/nsLineLayout.cpp

@@ -1508,6 +1508,7 @@ nsLineLayout::VerticalAlignFrames(nsRect& aLineBoxResult,
   aLineBoxResult.y = mTopEdge;
   aLineBoxResult.width = psd->mX - psd->mLeftEdge;
   aLineBoxResult.height = lineHeight;
+  mFinalLineHeight = lineHeight;
   aMaxElementSizeResult.width = maxElementWidth;
   aMaxElementSizeResult.height = maxElementHeight;
 
@@ -1963,7 +1964,12 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
         nscoord minimumLineHeight = mMinLineHeight;
         nscoord fontAscent, fontHeight;
         fm->GetMaxAscent(fontAscent);
-        fm->GetHeight(fontHeight);
+        if (nsHTMLReflowState::UseComputedHeight()) {
+          fontHeight = parentFont->mFont.size;
+        }
+        else {
+          fm->GetHeight(fontHeight);
+        }
         nscoord leading = minimumLineHeight - fontHeight;
         nscoord yTop = -fontAscent - leading/2;
         nscoord yBottom = yTop + minimumLineHeight;
@@ -2087,6 +2093,7 @@ nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd,
 #endif
         if (deltaWidth) {
           pfd->mBounds.width -= deltaWidth;
+          pfd->mCombinedArea.width -= deltaWidth;
           if (0 == pfd->mBounds.width) {
             pfd->mMaxElementSize.width = 0;
             pfd->mMaxElementSize.height = 0;
@@ -2123,12 +2130,13 @@ nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd,
   return PR_FALSE;
 }
 
-void
+PRBool
 nsLineLayout::TrimTrailingWhiteSpace()
 {
   PerSpanData* psd = mRootSpan;
   nscoord deltaWidth;
   TrimTrailingWhiteSpaceIn(psd, &deltaWidth);
+  return 0 != deltaWidth;
 }
 
 void
@@ -2195,6 +2203,7 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
         pfd->mFrame->SetRect(pfd->mBounds);
         pfd = pfd->mNext;
       }
+//      aLineBounds.width += dx;
     }
 
     if ((NS_STYLE_DIRECTION_RTL == psd->mDirection) &&
@@ -2240,9 +2249,12 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
   else {
     // The minimum combined area for the frames that are direct
     // children of the block starts at the upper left corner of the
-    // line but has no width or height.
-    x1 = x0 = psd->mLeftEdge;
-    y1 = y0 = mTopEdge;
+    // line and is sized to match the size of the line's bounding box
+    // (the same size as the values returned from VerticalAlignFrames)
+    x0 = psd->mLeftEdge;
+    x1 = psd->mX;
+    y0 = mTopEdge;
+    y1 = mTopEdge + mFinalLineHeight;
   }
 
   pfd = psd->mFirstFrame;

layout/generic/nsLineLayout.h

@@ -103,7 +103,7 @@ public:
   void VerticalAlignFrames(nsRect& aLineBoxResult,
                            nsSize& aMaxElementSizeResult);
 
-  void TrimTrailingWhiteSpace();
+  PRBool TrimTrailingWhiteSpace();
 
   void HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify);
 
@@ -233,6 +233,10 @@ protected:
   nscoord mMaxBottomBoxHeight;
   nscoord mCarriedOutBottomMargin;
 
+  // Final computed line-height value after VerticalAlignFrames for
+  // the block has been called.
+  nscoord mFinalLineHeight;
+
   nsTextRun* mReflowTextRuns;
   nsTextRun* mTextRun;
 

layout/html/base/src/nsLineLayout.cpp

@@ -1508,6 +1508,7 @@ nsLineLayout::VerticalAlignFrames(nsRect& aLineBoxResult,
   aLineBoxResult.y = mTopEdge;
   aLineBoxResult.width = psd->mX - psd->mLeftEdge;
   aLineBoxResult.height = lineHeight;
+  mFinalLineHeight = lineHeight;
   aMaxElementSizeResult.width = maxElementWidth;
   aMaxElementSizeResult.height = maxElementHeight;
 
@@ -1963,7 +1964,12 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
         nscoord minimumLineHeight = mMinLineHeight;
         nscoord fontAscent, fontHeight;
         fm->GetMaxAscent(fontAscent);
-        fm->GetHeight(fontHeight);
+        if (nsHTMLReflowState::UseComputedHeight()) {
+          fontHeight = parentFont->mFont.size;
+        }
+        else {
+          fm->GetHeight(fontHeight);
+        }
         nscoord leading = minimumLineHeight - fontHeight;
         nscoord yTop = -fontAscent - leading/2;
         nscoord yBottom = yTop + minimumLineHeight;
@@ -2087,6 +2093,7 @@ nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd,
 #endif
         if (deltaWidth) {
           pfd->mBounds.width -= deltaWidth;
+          pfd->mCombinedArea.width -= deltaWidth;
           if (0 == pfd->mBounds.width) {
             pfd->mMaxElementSize.width = 0;
             pfd->mMaxElementSize.height = 0;
@@ -2123,12 +2130,13 @@ nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd,
   return PR_FALSE;
 }
 
-void
+PRBool
 nsLineLayout::TrimTrailingWhiteSpace()
 {
   PerSpanData* psd = mRootSpan;
   nscoord deltaWidth;
   TrimTrailingWhiteSpaceIn(psd, &deltaWidth);
+  return 0 != deltaWidth;
 }
 
 void
@@ -2195,6 +2203,7 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify)
         pfd->mFrame->SetRect(pfd->mBounds);
         pfd = pfd->mNext;
       }
+//      aLineBounds.width += dx;
     }
 
     if ((NS_STYLE_DIRECTION_RTL == psd->mDirection) &&
@@ -2240,9 +2249,12 @@ nsLineLayout::RelativePositionFrames(PerSpanData* psd, nsRect& aCombinedArea)
   else {
     // The minimum combined area for the frames that are direct
     // children of the block starts at the upper left corner of the
-    // line but has no width or height.
-    x1 = x0 = psd->mLeftEdge;
-    y1 = y0 = mTopEdge;
+    // line and is sized to match the size of the line's bounding box
+    // (the same size as the values returned from VerticalAlignFrames)
+    x0 = psd->mLeftEdge;
+    x1 = psd->mX;
+    y0 = mTopEdge;
+    y1 = mTopEdge + mFinalLineHeight;
   }
 
   pfd = psd->mFirstFrame;

layout/html/base/src/nsLineLayout.h

@@ -103,7 +103,7 @@ public:
   void VerticalAlignFrames(nsRect& aLineBoxResult,
                            nsSize& aMaxElementSizeResult);
 
-  void TrimTrailingWhiteSpace();
+  PRBool TrimTrailingWhiteSpace();
 
   void HorizontalAlignFrames(nsRect& aLineBounds, PRBool aAllowJustify);
 
@@ -233,6 +233,10 @@ protected:
   nscoord mMaxBottomBoxHeight;
   nscoord mCarriedOutBottomMargin;
 
+  // Final computed line-height value after VerticalAlignFrames for
+  // the block has been called.
+  nscoord mFinalLineHeight;
+
   nsTextRun* mReflowTextRuns;
   nsTextRun* mTextRun;