Commit 0e28f954 authored by dbaron@dbaron.org's avatar dbaron@dbaron.org
Browse files

Make inline-block and table-caption elements not ignore text-decoration. ...

Make inline-block and table-caption elements not ignore text-decoration.  b=371249  r+sr=roc  a=dsicore
parent 02636c5f
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -261,8 +261,9 @@ nsHTMLContainerFrame::GetTextDecorations(nsPresContext* aPresContext,

      nsStyleContext* styleContext = frame->GetStyleContext();
      const nsStyleDisplay* styleDisplay = styleContext->GetStyleDisplay();
      if (!styleDisplay->IsBlockOutside() &&
          styleDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
      if (!styleDisplay->IsBlockInside() &&
          styleDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL &&
          styleDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CAPTION) {
        // If an inline frame is discovered while walking up the tree,
        // we should stop according to CSS3 draft. CSS2 is rather vague
        // about this.
+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ include first-line/reftest.list
# svg/
include svg/reftest.list

# text-decoration/
include text-decoration/reftest.list

# text-indent/
include text-indent/reftest.list

+18 −0
Original line number Diff line number Diff line
== underline-block-quirks.html underline-block-quirks-ref.html
!= underline-block-quirks.html underline-block-quirks-notref.html
== underline-inline-block-quirks.html underline-inline-block-quirks-ref.html
!= underline-inline-block-quirks.html underline-inline-block-quirks-notref.html
== underline-table-caption-quirks.html underline-table-caption-quirks-ref.html
!= underline-table-caption-quirks.html underline-table-caption-quirks-notref.html
== underline-table-cell-quirks.html underline-table-cell-quirks-ref.html
!= underline-table-cell-quirks.html underline-table-cell-quirks-notref.html
fails == underline-block-propagation-quirks.html underline-block-propagation-quirks-ref.html # currently too quirky
== underline-block-standards.html underline-block-standards-ref.html
!= underline-block-standards.html underline-block-standards-notref.html
== underline-inline-block-standards.html underline-inline-block-standards-ref.html
!= underline-inline-block-standards.html underline-inline-block-standards-notref.html
== underline-table-caption-standards.html underline-table-caption-standards-ref.html
!= underline-table-caption-standards.html underline-table-caption-standards-notref.html
== underline-table-cell-standards.html underline-table-cell-standards-ref.html
!= underline-table-cell-standards.html underline-table-cell-standards-notref.html
fails == underline-block-propagation-standards.html underline-block-propagation-standards-ref.html # bug that we propagate to floats
+12 −0
Original line number Diff line number Diff line
<title>text-decoration: underline test</title>
<div>
<span style="text-decoration:underline">This text should be underlined.</span>

<div style="float:left;width:10em">This text should not be underlined.</div>

<div style="clear:both; margin: 1px 2px 3px 4px; border: medium solid; padding: 6px 8px 10px 12px"><span style="text-decoration:underline">This text should be underlined.</span></div>

<div style="position:absolute; top: 400px;left:400px">This should not be underlined.</div>

<span style="text-decoration:underline">This should be underlined but <span style="display:inline:block">this should<br>not have a <br>separate underline</span>.</span>
+12 −0
Original line number Diff line number Diff line
<title>text-decoration: underline test</title>
<div style="text-decoration:underline">
This text should be underlined.

<div style="float:left;width:10em">This text should not be underlined.</div>

<div style="clear:both; margin: 1px 2px 3px 4px; border: medium solid; padding: 6px 8px 10px 12px">This text should be underlined.</div>

<div style="position:absolute; top: 400px;left:400px">This should not be underlined.</div>

This should be underlined but <span style="display:inline:block">this should<br>not have a <br>separate underline</span>.
Loading