mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Make inline-block and table-caption elements not ignore text-decoration. b=371249 r+sr=roc a=dsicore

This commit is contained in:
dbaron@dbaron.org 2007-11-12 11:12:24 -08:00
Родитель 15faf6f6b8
Коммит 6cb00838ff
31 изменённых файлов: 248 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
layout/generic/nsHTMLContainerFrame.cpp
Просмотреть файл

@ -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
layout/reftests/reftest.list
Просмотреть файл

@ -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
layout/reftests/text-decoration/reftest.list Normal file
Просмотреть файл

@ -0,0 +1,18 @@
== 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
layout/reftests/text-decoration/underline-block-propagation-quirks-ref.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<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
layout/reftests/text-decoration/underline-block-propagation-quirks.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<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>.

13
layout/reftests/text-decoration/underline-block-propagation-standards-ref.html Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<!DOCTYPE HTML>
<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>

13
layout/reftests/text-decoration/underline-block-propagation-standards.html Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<!DOCTYPE HTML>
<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>.

2
layout/reftests/text-decoration/underline-block-quirks-notref.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<title>text-decoration: underline test</title>
<div>This text should be underlined.</div>

2
layout/reftests/text-decoration/underline-block-quirks-ref.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<title>text-decoration: underline test</title>
<div><span style="text-decoration:underline">This text should be underlined.</span></div>

2
layout/reftests/text-decoration/underline-block-quirks.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<title>text-decoration: underline test</title>
<div style="text-decoration:underline">This text should be underlined.</div>

3
layout/reftests/text-decoration/underline-block-standards-notref.html Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<div>This text should be underlined.</div>

3
layout/reftests/text-decoration/underline-block-standards-ref.html Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<div><span style="text-decoration:underline">This text should be underlined.</span></div>

3
layout/reftests/text-decoration/underline-block-standards.html Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<div style="text-decoration:underline">This text should be underlined.</div>

2
layout/reftests/text-decoration/underline-inline-block-quirks-notref.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<title>text-decoration: underline test</title>
<p>This has an <span style="display:inline-block">inline<br>block</span> in it.</p>

2
layout/reftests/text-decoration/underline-inline-block-quirks-ref.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<title>text-decoration: underline test</title>
<p>This has an <span style="display:inline-block"><span style="text-decoration:underline">inline</span><br><span style="text-decoration:underline">block</span></span> in it.</p>

2
layout/reftests/text-decoration/underline-inline-block-quirks.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<title>text-decoration: underline test</title>
<p>This has an <span style="display:inline-block;text-decoration:underline">inline<br>block</span> in it.</p>

3
layout/reftests/text-decoration/underline-inline-block-standards-notref.html Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<p>This has an <span style="display:inline-block">inline<br>block</span> in it.</p>

3
layout/reftests/text-decoration/underline-inline-block-standards-ref.html Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<p>This has an <span style="display:inline-block"><span style="text-decoration:underline">inline</span><br><span style="text-decoration:underline">block</span></span> in it.</p>

3
layout/reftests/text-decoration/underline-inline-block-standards.html Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<p>This has an <span style="display:inline-block;text-decoration:underline">inline<br>block</span> in it.</p>

12
layout/reftests/text-decoration/underline-table-caption-quirks-notref.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<title>text-decoration: underline test</title>
<table border>
<caption>This is the table caption</caption>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

12
layout/reftests/text-decoration/underline-table-caption-quirks-ref.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<title>text-decoration: underline test</title>
<table border>
<caption><span style="text-decoration: underline">This is the table caption</span></caption>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

12
layout/reftests/text-decoration/underline-table-caption-quirks.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<title>text-decoration: underline test</title>
<table border>
<caption style="text-decoration: underline">This is the table caption</caption>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

13
layout/reftests/text-decoration/underline-table-caption-standards-notref.html Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<table border>
<caption>This is the table caption</caption>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

13
layout/reftests/text-decoration/underline-table-caption-standards-ref.html Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<table border>
<caption><span style="text-decoration: underline">This is the table caption</span></caption>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

13
layout/reftests/text-decoration/underline-table-caption-standards.html Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<table border>
<caption style="text-decoration: underline">This is the table caption</caption>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

11
layout/reftests/text-decoration/underline-table-cell-quirks-notref.html Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<title>text-decoration: underline test</title>
<table border>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

11
layout/reftests/text-decoration/underline-table-cell-quirks-ref.html Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<title>text-decoration: underline test</title>
<table border>
<tr>
<td><span style="text-decoration: underline">Row 1, Cell 1</span></td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

11
layout/reftests/text-decoration/underline-table-cell-quirks.html Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<title>text-decoration: underline test</title>
<table border>
<tr>
<td style="text-decoration: underline">Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

12
layout/reftests/text-decoration/underline-table-cell-standards-notref.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<table border>
<tr>
<td>Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

12
layout/reftests/text-decoration/underline-table-cell-standards-ref.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<table border>
<tr>
<td><span style="text-decoration: underline">Row 1, Cell 1</span></td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>

12
layout/reftests/text-decoration/underline-table-cell-standards.html Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<!DOCTYPE HTML>
<title>text-decoration: underline test</title>
<table border>
<tr>
<td style="text-decoration: underline">Row 1, Cell 1</td>
<td>Row 1, Cell 2</td>
</tr>
<tr>
<td>Row 2, Cell 1</td>
<td>Row 2, Cell 2</td>
</tr>
</table>