Attachment 807761 Details for Bug 114365

[patch] Part 4: Remoe legacy stuff

cruft.diff (text/plain), 17.19 KB, created by James Kitchener (:jkitch)

(hide)

Description:

Filename:

MIME Type:

Creator: James Kitchener (:jkitch)

Size: 17.19 KB

patch

obsolete

># HG changeset patch
># Parent c6bca876887487b425081dd358a12589e17eaf88
># User FrÃ©dÃ©ric Wang <fred.wang@free.fr>
>Bug 415413 - Incorrect widths and heights of MathML with italics in table cells. r=karlt
>
>diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
>--- a/layout/generic/nsTextFrame.h
>+++ b/layout/generic/nsTextFrame.h
>@@ -17,19 +17,18 @@
> 
> class nsTextPaintStyle;
> class PropertyProvider;
> 
> // This state bit is set on frames that have some non-collapsed characters after
> // reflow
> #define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31)
> 
>-// This state bit is set on frames which are forced to trim their leading and
>-// trailing whitespaces
>-#define TEXT_FORCE_TRIM_WHITESPACE       NS_FRAME_STATE_BIT(32)
>+// This state bit is set on children of token MathML elements
>+#define TEXT_IS_IN_TOKEN_MATHML          NS_FRAME_STATE_BIT(32)
> 
> #define TEXT_HAS_FONT_INFLATION          NS_FRAME_STATE_BIT(61)
> 
> typedef nsFrame nsTextFrameBase;
> 
> class nsDisplayTextGeometry;
> class nsDisplayText;
> 
>diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
>--- a/layout/generic/nsTextFrame.cpp
>+++ b/layout/generic/nsTextFrames.cpp
>@@ -199,17 +199,17 @@ NS_DECLARE_FRAME_PROPERTY(FontSizeInflat
> 
> // Set when this text frame is mentioned in the userdata for mTextRun
> #define TEXT_IN_TEXTRUN_USER_DATA  NS_FRAME_STATE_BIT(29)
> 
> // nsTextFrame.h has
> // #define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(30)
> 
> // nsTextFrame.h has
>-// #define TEXT_FORCE_TRIM_WHITESPACE       NS_FRAME_STATE_BIT(31)
>+// #define TEXT_IS_IN_TOKEN_MATHML          NS_FRAME_STATE_BIT(32)
> 
> // Set when this text frame is mentioned in the userdata for the
> // uninflated textrun property
> #define TEXT_IN_UNINFLATED_TEXTRUN_USER_DATA NS_FRAME_STATE_BIT(60)
> 
> // nsTextFrame.h has
> // #define TEXT_HAS_FONT_INFLATION          NS_FRAME_STATE_BIT(61)
> 
>@@ -6876,17 +6876,18 @@ nsTextFrame::AddInlineMinWidthForFlow(ns
>   if (hyphenating) {
>     gfxSkipCharsIterator tmp(iter);
>     len = std::min<int32_t>(GetContentOffset() + GetInFlowContentLength(),
>                  tmp.ConvertSkippedToOriginal(flowEndInTextRun)) - iter.GetOriginalOffset();
>   }
>   PropertyProvider provider(textRun, textStyle, frag, this,
>                             iter, len, nullptr, 0, aTextRunType);
> 
>-  bool collapseWhitespace = !textStyle->WhiteSpaceIsSignificant();
>+  bool collapseWhitespace = (!textStyle->WhiteSpaceIsSignificant() ||
>+                             (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML));
>   bool preformatNewlines = textStyle->NewlineIsSignificant();
>   bool preformatTabs = textStyle->WhiteSpaceIsSignificant();
>   gfxFloat tabWidth = -1;
>   uint32_t start =
>     FindStartAfterSkippingWhitespace(&provider, aData, textStyle, &iter, flowEndInTextRun);
> 
>   AutoFallibleTArray<bool,BIG_TEXT_NODE_SIZE> hyphBuffer;
>   bool *hyphBreakBefore = nullptr;
>@@ -6913,18 +6914,28 @@ nsTextFrame::AddInlineMinWidthForFlow(ns
>           (!hyphBreakBefore || !hyphBreakBefore[i - start]))
>       {
>         // we can't break here (and it's not the end of the flow)
>         continue;
>       }
>     }
> 
>     if (i > wordStart) {
>-      nscoord width =
>-        NSToCoordCeilClamped(textRun->GetAdvanceWidth(wordStart, i - wordStart, &provider));
>+      nscoord width;
>+      if (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML) {
>+        gfxTextRun::Metrics metrics =
>+          textRun->MeasureText(wordStart,
>+                               i - wordStart,
>+                               gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
>+                               ctx, &provider);
>+        width = NSToCoordCeilClamped(metrics.mAdvanceWidth);
>+        width = std::max(NSToCoordCeil(metrics.mBoundingBox.XMost()), width);
>+      } else {
>+        width = NSToCoordCeilClamped(textRun->GetAdvanceWidth(wordStart, i - wordStart, &provider));
>+      }
>       aData->currentLine = NSCoordSaturatingAdd(aData->currentLine, width);
>       aData->atStartOfLine = false;
> 
>       if (collapseWhitespace) {
>         uint32_t trimStart = GetEndOfTrimmedText(frag, textStyle, wordStart, i, &iter);
>         if (trimStart == start) {
>           // This is *all* trimmable whitespace, so whatever trailingWhitespace
>           // we saw previously is still trailing...
>@@ -7037,17 +7048,18 @@ nsTextFrame::AddInlinePrefWidthForFlow(n
>   // Pass null for the line container. This will disable tab spacing, but that's
>   // OK since we can't really handle tabs for intrinsic sizing anyway.
>   
>   const nsStyleText* textStyle = StyleText();
>   const nsTextFragment* frag = mContent->GetText();
>   PropertyProvider provider(textRun, textStyle, frag, this,
>                             iter, INT32_MAX, nullptr, 0, aTextRunType);
> 
>-  bool collapseWhitespace = !textStyle->WhiteSpaceIsSignificant();
>+  bool collapseWhitespace = (!textStyle->WhiteSpaceIsSignificant() ||
>+                             (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML));
>   bool preformatNewlines = textStyle->NewlineIsSignificant();
>   bool preformatTabs = textStyle->WhiteSpaceIsSignificant();
>   gfxFloat tabWidth = -1;
>   uint32_t start =
>     FindStartAfterSkippingWhitespace(&provider, aData, textStyle, &iter, flowEndInTextRun);
> 
>   // XXX Should we consider hyphenation here?
>   // If newlines and tabs aren't preformatted, nothing to do inside
>@@ -7066,18 +7078,28 @@ nsTextFrame::AddInlinePrefWidthForFlow(n
>       preformattedTab = preformatTabs && textRun->CharIsTab(i);
>       if (!preformattedNewline && !preformattedTab) {
>         // we needn't break here (and it's not the end of the flow)
>         continue;
>       }
>     }
> 
>     if (i > lineStart) {
>-      nscoord width =
>-        NSToCoordCeilClamped(textRun->GetAdvanceWidth(lineStart, i - lineStart, &provider));
>+      nscoord width;
>+      if (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML) {
>+        gfxTextRun::Metrics metrics =
>+          textRun->MeasureText(lineStart,
>+                               i - lineStart,
>+                               gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
>+                               ctx, &provider);
>+        width = NSToCoordCeilClamped(metrics.mAdvanceWidth);
>+        width = std::max(NSToCoordCeil(metrics.mBoundingBox.XMost()), width);
>+      } else {
>+        width = NSToCoordCeilClamped(textRun->GetAdvanceWidth(lineStart, i - lineStart, &provider));
>+      }
>       aData->currentLine = NSCoordSaturatingAdd(aData->currentLine, width);
> 
>       if (collapseWhitespace) {
>         uint32_t trimStart = GetEndOfTrimmedText(frag, textStyle, lineStart, i, &iter);
>         if (trimStart == start) {
>           // This is *all* trimmable whitespace, so whatever trailingWhitespace
>           // we saw previously is still trailing...
>           aData->trailingWhitespace += width;
>@@ -7571,17 +7593,17 @@ nsTextFrame::ReflowText(nsLineLayout& aL
>       */
>       newLineOffset = contentNewLineOffset;
>     }
>     if (newLineOffset >= 0) {
>       length = newLineOffset + 1 - offset;
>     }
>   }
>   if ((atStartOfLine && !textStyle->WhiteSpaceIsSignificant()) ||
>-      (GetStateBits() & TEXT_FORCE_TRIM_WHITESPACE)) {
>+      (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML)) {
>     // Skip leading whitespace. Make sure we don't skip a 'pre-line'
>     // newline if there is one.
>     int32_t skipLength = newLineOffset >= 0 ? length - 1 : length;
>     int32_t whitespaceCount =
>       GetTrimmableWhitespaceCount(frag, offset, skipLength, 1);
>     if (whitespaceCount) {
>       offset += whitespaceCount;
>       length -= whitespaceCount;
>@@ -7698,19 +7720,19 @@ nsTextFrame::ReflowText(nsLineLayout& aL
>     : -1;
>   PropertyProvider provider(mTextRun, textStyle, frag, this, iter, length,
>       lineContainer, xOffsetForTabs, nsTextFrame::eInflated);
> 
>   uint32_t transformedOffset = provider.GetStart().GetSkippedOffset();
> 
>   // The metrics for the text go in here
>   gfxTextRun::Metrics textMetrics;
>-  gfxFont::BoundingBoxType boundingBoxType = IsFloatingFirstLetterChild() ?
>-                                               gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS :
>-                                               gfxFont::LOOSE_INK_EXTENTS;
>+  gfxFont::BoundingBoxType boundingBoxType =
>+    (IsFloatingFirstLetterChild() ?
>+     gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS : gfxFont::LOOSE_INK_EXTENTS);
>   NS_ASSERTION(!(NS_REFLOW_CALC_BOUNDING_METRICS & aMetrics.mFlags),
>                "We shouldn't be passed NS_REFLOW_CALC_BOUNDING_METRICS anymore");
> 
>   int32_t limitLength = length;
>   int32_t forceBreak = aLineLayout.GetForcedBreakPosition(mContent);
>   bool forceBreakAfter = false;
>   if (forceBreak >= offset + length) {
>     forceBreakAfter = forceBreak == offset + length;
>@@ -7737,17 +7759,17 @@ nsTextFrame::ReflowText(nsLineLayout& aL
>     iter.SetOriginalOffset(offset + limitLength);
>     transformedLength = iter.GetSkippedOffset() - transformedOffset;
>   }
>   uint32_t transformedLastBreak = 0;
>   bool usedHyphenation;
>   gfxFloat trimmedWidth = 0;
>   gfxFloat availWidth = aAvailableWidth;
>   bool canTrimTrailingWhitespace = !textStyle->WhiteSpaceIsSignificant() ||
>-                                   (GetStateBits() & TEXT_FORCE_TRIM_WHITESPACE);
>+                                   (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML);
>   int32_t unusedOffset;  
>   gfxBreakPriority breakPriority;
>   aLineLayout.GetLastOptionalBreakPosition(&unusedOffset, &breakPriority);
>   uint32_t transformedCharsFit =
>     mTextRun->BreakAndMeasureText(transformedOffset, transformedLength,
>                                   (GetStateBits() & TEXT_START_OF_LINE) != 0,
>                                   availWidth,
>                                   &provider, !aLineLayout.LineIsBreakable(),
>@@ -7807,21 +7829,21 @@ nsTextFrame::ReflowText(nsLineLayout& aL
>   if (canTrimTrailingWhitespace) {
>     // Optimization: if we trimmed trailing whitespace, and we can be sure
>     // this frame will be at the end of the line, then leave it trimmed off.
>     // Otherwise we have to undo the trimming, in case we're not at the end of
>     // the line. (If we actually do end up at the end of the line, we'll have
>     // to trim it off again in TrimTrailingWhiteSpace, and we'd like to avoid
>     // having to re-do it.)
>     if (brokeText ||
>-        (GetStateBits() & TEXT_FORCE_TRIM_WHITESPACE)) {
>+        (GetStateBits() & TEXT_IS_IN_TOKEN_MATHML)) {
>       // We're definitely going to break so our trailing whitespace should
>       // definitely be trimmed. Record that we've already done it.
>       AddStateBits(TEXT_TRIMMED_TRAILING_WHITESPACE);
>-    } else if (!(GetStateBits() & TEXT_FORCE_TRIM_WHITESPACE)) {
>+    } else if (!(GetStateBits() & TEXT_IS_IN_TOKEN_MATHML)) {
>       // We might not be at the end of the line. (Note that even if this frame
>       // ends in breakable whitespace, it might not be at the end of the line
>       // because it might be followed by breakable, but preformatted, whitespace.)
>       // Undo the trimming.
>       textMetrics.mAdvanceWidth += trimmedWidth;
>       trimmableWidth = trimmedWidth;
>       if (mTextRun->IsRightToLeft()) {
>         // Space comes before text, so the bounding box is moved to the
>diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp
>--- a/layout/mathml/nsMathMLTokenFrame.cpp
>+++ b/layout/mathml/nsMathMLTokenFrame.cpp
>@@ -79,67 +79,71 @@ nsMathMLTokenFrame::GetMathMLFrameType()
>     default:
>       ; // fall through to upright
>     }
>   }
>   return eMathMLFrameType_UprightIdentifier;
> }
> 
> void
>-nsMathMLTokenFrame::ForceTrimChildTextFrames()
>+nsMathMLTokenFrame::MarkTextFramesAsTokenMathML()
> {
>-  // Set flags on child text frames to force them to trim their leading and
>-  // trailing whitespaces.
>+  // Set flags on child text frames to:
>+  // - force them to trim their leading and trailing whitespaces
>+  // - include tight ink overflow in width computation
>   for (nsIFrame* childFrame = GetFirstPrincipalChild(); childFrame;
>        childFrame = childFrame->GetNextSibling()) {
>-    if (childFrame->GetType() == nsGkAtoms::textFrame) {
>-      childFrame->AddStateBits(TEXT_FORCE_TRIM_WHITESPACE);
>+    for (nsIFrame* childFrame2 = childFrame->GetFirstPrincipalChild();
>+         childFrame2; childFrame2 = childFrame2->GetNextSibling()) {
>+      if (childFrame2->GetType() == nsGkAtoms::textFrame) {
>+        childFrame2->AddStateBits(TEXT_IS_IN_TOKEN_MATHML);
>+      }
>     }
>   }
> }
> 
> NS_IMETHODIMP
> nsMathMLTokenFrame::SetInitialChildList(ChildListID     aListID,
>                                         nsFrameList&    aChildList)
> {
>   // First, let the base class do its work
>   nsresult rv = nsMathMLContainerFrame::SetInitialChildList(aListID, aChildList);
>   if (NS_FAILED(rv))
>     return rv;
> 
>-  ForceTrimChildTextFrames();
>+  MarkTextFramesAsTokenMathML();
> 
>   ProcessTextData();
>   return rv;
> }
> 
> NS_IMETHODIMP
> nsMathMLTokenFrame::AppendFrames(ChildListID aListID,
>                                  nsFrameList& aChildList)
> {
>   nsresult rv = nsMathMLContainerFrame::AppendFrames(aListID, aChildList);
>   if (NS_FAILED(rv))
>     return rv;
> 
>-  ForceTrimChildTextFrames();
>+  MarkTextFramesAsTokenMathML();
> 
>   return rv;
> }
> 
> NS_IMETHODIMP
> nsMathMLTokenFrame::InsertFrames(ChildListID aListID,
>                                  nsIFrame* aPrevFrame,
>                                  nsFrameList& aChildList)
> {
>   nsresult rv = nsMathMLContainerFrame::InsertFrames(aListID, aPrevFrame,
>                                                      aChildList);
>   if (NS_FAILED(rv))
>     return rv;
> 
>-  ForceTrimChildTextFrames();
>+  MarkTextFramesAsTokenMathML();
> 
>   return rv;
> }
> 
> nsresult
> nsMathMLTokenFrame::Reflow(nsPresContext*          aPresContext,
>                            nsHTMLReflowMetrics&     aDesiredSize,
>                            const nsHTMLReflowState& aReflowState,
>@@ -164,16 +168,23 @@ nsMathMLTokenFrame::Reflow(nsPresContext
>                      childReflowState, aStatus);
>     //NS_ASSERTION(NS_FRAME_IS_COMPLETE(aStatus), "bad status");
>     if (NS_FAILED(rv)) {
>       // Call DidReflow() for the child frames we successfully did reflow.
>       DidReflowChildren(GetFirstPrincipalChild(), childFrame);
>       return rv;
>     }
> 
>+    childDesiredSize.mBoundingMetrics.width = childDesiredSize.width;
>+    childDesiredSize.mBoundingMetrics.leftBearing = 0;
>+    childDesiredSize.mBoundingMetrics.rightBearing = childDesiredSize.width;
>+    childDesiredSize.mBoundingMetrics.ascent = childDesiredSize.ascent;
>+    childDesiredSize.mBoundingMetrics.descent =
>+      childDesiredSize.height - childDesiredSize.ascent;
>+
>     SaveReflowAndBoundingMetricsFor(childFrame, childDesiredSize,
>                                     childDesiredSize.mBoundingMetrics);
> 
>     childFrame = childFrame->GetNextSibling();
>   }
> 
> 
>   // place and size children
>diff --git a/layout/mathml/nsMathMLTokenFrame.h b/layout/mathml/nsMathMLTokenFrame.h
>--- a/layout/mathml/nsMathMLTokenFrame.h
>+++ b/layout/mathml/nsMathMLTokenFrame.h
>@@ -74,12 +74,12 @@ protected:
> 
>   // hook to perform MathML-specific actions depending on the tag
>   virtual void ProcessTextData();
> 
>   // helper to set the style of <mi> which has to be italic or normal
>   // depending on its textual content
>   bool SetTextStyle();
> 
>-  void ForceTrimChildTextFrames();
>+  void MarkTextFramesAsTokenMathML();
> };
> 
> #endif /* nsMathMLTokentFrame_h___ */
>diff --git a/layout/reftests/mathml/table-width-1-ref.xhtml b/layout/reftests/mathml/table-width-1-ref.xhtml
>--- a/layout/reftests/mathml/table-width-1-ref.xhtml
>+++ b/layout/reftests/mathml/table-width-1-ref.xhtml
>@@ -91,10 +91,34 @@
>           <mfrac bevelled="true" linethickness="30px">
>             <mn>1473903823894702</mn>
>             <mn>2808472638402743</mn>
>           </mfrac>
>         </mphantom>
>       </math>
>     </td>
>   </table>
>+  <table>
>+    <tr>
>+      <td>
>+        <math xmlns="http://www.w3.org/1998/Math/MathML">
>+          <mphantom>
>+            <mtext style="font-size: 3em; font-style: italic;">XXX</mtext>
>+          </mphantom>
>+        </math>
>+      </td>
>+    </tr>
>+  </table>
>+  <table>
>+    <tr>
>+      <td>
>+        <math xmlns="http://www.w3.org/1998/Math/MathML">
>+          <mphantom>
>+            <mtext style="font-size: 3em; font-style: italic;">X</mtext>
>+            <mtext style="font-size: 3em; font-style: italic;">X</mtext>
>+            <mtext style="font-size: 3em; font-style: italic;">X</mtext>
>+          </mphantom>
>+        </math>
>+      </td>
>+    </tr>
>+  </table>
> </body>
> </html>
>diff --git a/layout/reftests/mathml/table-width-1.xhtml b/layout/reftests/mathml/table-width-1.xhtml
>--- a/layout/reftests/mathml/table-width-1.xhtml
>+++ b/layout/reftests/mathml/table-width-1.xhtml
>@@ -84,10 +84,30 @@
>       <math xmlns="http://www.w3.org/1998/Math/MathML">
>         <mfrac bevelled="true" linethickness="30px">
>             <mn>1473903823894702</mn>
>             <mn>2808472638402743</mn>
>         </mfrac>
>       </math>
>     </td>
>   </table>
>+  <table>
>+    <tr>
>+      <td>
>+        <math xmlns="http://www.w3.org/1998/Math/MathML">
>+          <mtext style="font-size: 3em; font-style: italic;">XXX</mtext>
>+        </math>
>+      </td>
>+    </tr>
>+  </table>
>+  <table>
>+    <tr>
>+      <td>
>+        <math xmlns="http://www.w3.org/1998/Math/MathML">
>+          <mtext style="font-size: 3em; font-style: italic;">X</mtext>
>+          <mtext style="font-size: 3em; font-style: italic;">X</mtext>
>+          <mtext style="font-size: 3em; font-style: italic;">X</mtext>
>+        </math>
>+      </td>
>+    </tr>
>+  </table>
> </body>
> </html>

Actions: View | Diff | Review

Attachments on bug 114365: 194890 | 807752 | 807758 | 807759 | 807760 | 807761 | 807763 | 816923 | 817164 | 820245 | 820249 | 820250 | 820251 | 820253 | 820255 | 822284 | 822301 | 822302 | 822303 | 822304 | 822305 | 8338329 | 8338333 | 8338340 | 8338347 | 8338348 | 8338352 | 8338470 | 8338471 | 8340261 | 8340264 | 8340708 | 8340762 | 8340962