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

using wrong BC damage area for BC calculations b=244135 p=malcolm.parsons r=bernd r=fantasai (credits for a good review go to Bernd Mielke, blame for a bad one to fantasai) sr=bz

This commit is contained in:
fantasai.cvs%inkedblade.net 2007-10-15 04:49:52 +00:00
Родитель 60463bff28
Коммит 90eeabba62
4 изменённых файлов: 74 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
layout/reftests/bugs/244135-1-ref.html Normal file
Просмотреть файл

@ -0,0 +1,34 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>http://bugzilla.mozilla.org/show_bug.cgi?id=244135</title>
<style type="text/css">
table { border-collapse: collapse; background-color:#c0c0c0; }
</style>
</head>
<body>
<table border="1">
<tbody>
<tr>
<td rowspan="4">td rowspan=4</td>
<td>text</td>
<td>text</td>
<td>text</td>
</tr>
<tr>
<td>text</td>
<td>text</td>
<td>text</td>
</tr>
<tr>
<td>text</td>
<td>text</td>
<td>text
</td>
</tr>
<tr>
<td>text</td>
<td>text</td>
<td>text</td>
</tr>
</tbody>

35
layout/reftests/bugs/244135-1.html Normal file
Просмотреть файл

@ -0,0 +1,35 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>http://bugzilla.mozilla.org/show_bug.cgi?id=244135</title>
<style type="text/css">
table { border-collapse: collapse; background-color:#c0c0c0; }
</style>
</head>
<body>
<table border="1">
<tbody>
<tr>
<td rowspan="4">td rowspan=4</td>
<td>text</td>
<td>text</td>
<td>text</td>
</tr>
<tr>
<td>text</td>
<td>text</td>
<td>text</td>
</tr>
<tr>
<td>text</td>
<td>text</td>
<td>text
<script type="text/javascript">var v = document.body.offsetHeight;</script>
</td>
</tr>
<tr>
<td>text</td>
<td>text</td>
<td>text</td>
</tr>
</tbody>

1
layout/reftests/bugs/reftest.list
Просмотреть файл

@ -100,6 +100,7 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == 28811-2a.html 28811-2-ref.html # bug 38
== 240470-1.html 240470-1-ref.html
== 243266-1.html 243266-1-ref.html
== 243302-1.html 243302-1-ref.html
== 244135-1.html 244135-1-ref.html
== 244932-1.html 244932-1-ref.html
== 249982-1.html 249982-1-ref.html
== 253701-1.html 253701-1-ref.html

13
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -5045,11 +5045,6 @@ LimitBorderWidth(PRUint16 aWidth)
the flipping is done.
*/
#define TOP_DAMAGED(aRowIndex) ((aRowIndex) >= propData->mDamageArea.y)
#define RIGHT_DAMAGED(aColIndex) ((aColIndex) < propData->mDamageArea.XMost())
#define BOTTOM_DAMAGED(aRowIndex) ((aRowIndex) < propData->mDamageArea.YMost())
#define LEFT_DAMAGED(aColIndex) ((aColIndex) >= propData->mDamageArea.x)
#define TABLE_EDGE PR_TRUE
#define ADJACENT PR_TRUE
#define HORIZONTAL PR_TRUE
@ -5346,7 +5341,7 @@ nsTableFrame::CalcBCBorders()
// update lastVerBorders and see if a new segment starts
startSeg = SetBorder(currentBorder, lastVerBorders[cellEndColIndex + 1]);
// store the border segment in the cell map and update cellBorders
if (RIGHT_DAMAGED(cellEndColIndex) && TOP_DAMAGED(rowX) && BOTTOM_DAMAGED(rowX)) {
if (cellEndColIndex < damageArea.XMost() && rowX >= damageArea.y && rowX < damageArea.YMost()) {
tableCellMap->SetBCBorderEdge(NS_SIDE_RIGHT, *info.cellMap, iter.mRowGroupStart, rowX,
cellEndColIndex, segLength, currentBorder.owner, currentBorder.width, startSeg);
// update the borders of the cells and cols affected
@ -5382,7 +5377,7 @@ nsTableFrame::CalcBCBorders()
trCorner->Update(NS_SIDE_RIGHT, currentBorder);
}
// store the top right corner in the cell map
if (RIGHT_DAMAGED(cellEndColIndex) && TOP_DAMAGED(rowX)) {
if (cellEndColIndex < damageArea.XMost() && rowX >= damageArea.y) {
if (0 != rowX) {
tableCellMap->SetBCBorderCorner(eTopRight, *info.cellMap, iter.mRowGroupStart, rowX, cellEndColIndex,
trCorner->ownerSide, trCorner->subWidth, trCorner->bevel);
@ -5504,7 +5499,7 @@ nsTableFrame::CalcBCBorders()
if (update) {
blCorner.Update(NS_SIDE_RIGHT, currentBorder);
}
if (BOTTOM_DAMAGED(cellEndRowIndex) && LEFT_DAMAGED(colX)) {
if (cellEndRowIndex < damageArea.YMost() && colX >= damageArea.x) {
if (hitsSpanBelow) {
tableCellMap->SetBCBorderCorner(eBottomLeft, *info.cellMap, iter.mRowGroupStart, cellEndRowIndex, colX,
blCorner.ownerSide, blCorner.subWidth, blCorner.bevel);
@ -5532,7 +5527,7 @@ nsTableFrame::CalcBCBorders()
}
// store the border segment the cell map and update cellBorders
if (BOTTOM_DAMAGED(cellEndRowIndex) && LEFT_DAMAGED(colX) && RIGHT_DAMAGED(colX)) {
if (cellEndRowIndex < damageArea.YMost() && colX >= damageArea.x && colX < damageArea.XMost()) {
tableCellMap->SetBCBorderEdge(NS_SIDE_BOTTOM, *info.cellMap, iter.mRowGroupStart, cellEndRowIndex,
colX, segLength, currentBorder.owner, currentBorder.width, startSeg);
// update the borders of the affected cells and rows