corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1241840 - Set table cell colspan=0 to 1 instead per the HTML spec. r=bz

Browse Source
This commit is contained in:
Mats Palmgren
2016-01-27 17:02:12 +01:00
parent a18803a6b1
commit e69230933d
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/tests/mochitest/table/test_indexes_table.html
View File

@@ -110,7 +110,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=410052
[ 0, 1, 2, -1, -1], [ 0, 1, 2, -1, -1],
[-1, -1, -1, -1, -1], [-1, -1, -1, -1, -1],
[ 3, 4, 5, -1, -1], [ 3, 4, 5, -1, -1],
[ 6, 7, 7, 7, 7], [ 6, 7, -1, -1, -1],
[ 6, 8, 9, -1, -1], [ 6, 8, 9, -1, -1],
[ 6, 10, 9, 11, 12] [ 6, 10, 9, 11, 12]
]; ];

4
dom/html/HTMLTableCellElement.cpp
View File

@@ -388,9 +388,7 @@ HTMLTableCellElement::ParseAttribute(int32_t aNamespaceID,
if (res) { if (res) {
int32_t val = aResult.GetIntegerValue(); int32_t val = aResult.GetIntegerValue();
// reset large colspan values as IE and opera do // reset large colspan values as IE and opera do
// quirks mode does not honor the special html 4 value of 0 if (val > MAX_COLSPAN || val <= 0) {
if (val > MAX_COLSPAN || val < 0 ||
(0 == val && InNavQuirksMode(OwnerDoc()))) {
aResult.SetTo(1, &aValue); aResult.SetTo(1, &aValue);
} }
} }

2
layout/mathml/nsMathMLmtableFrame.cpp
View File

@@ -1193,7 +1193,7 @@ nsMathMLmtdFrame::GetColSpan()
if (!value.IsEmpty()) { if (!value.IsEmpty()) {
nsresult error; nsresult error;
colspan = value.ToInteger(&error); colspan = value.ToInteger(&error);
if (NS_FAILED(error) || colspan < 0 || colspan > MAX_COLSPAN) if (NS_FAILED(error) || colspan <= 0 || colspan > MAX_COLSPAN)
colspan = 1; colspan = 1;
} }
} }

29
testing/web-platform/meta/html/dom/reflection-tabular.html.ini
View File

@@ -615,3 +615,32 @@
[th.rowSpan: IDL set to 4294967295 followed by getAttribute()] [th.rowSpan: IDL set to 4294967295 followed by getAttribute()]
expected: FAIL expected: FAIL
[td.colSpan: setAttribute() to 0 followed by IDL get]
expected: FAIL
[td.colSpan: setAttribute() to "-0" followed by IDL get]
expected: FAIL
[td.colSpan: setAttribute() to "0" followed by IDL get]
expected: FAIL
[td.colSpan: IDL set to 0 followed by IDL get]
expected: FAIL
[td.colSpan: IDL set to "-0" followed by IDL get]
expected: FAIL
[th.colSpan: setAttribute() to 0 followed by IDL get]
expected: FAIL
[th.colSpan: setAttribute() to "-0" followed by IDL get]
expected: FAIL
[th.colSpan: setAttribute() to "0" followed by IDL get]
expected: FAIL
[th.colSpan: IDL set to 0 followed by IDL get]
expected: FAIL
[th.colSpan: IDL set to "-0" followed by IDL get]
expected: FAIL