diff --git a/content/html/content/reftests/reftest.list b/content/html/content/reftests/reftest.list index 40a6b0cea46..0e4761a724d 100644 --- a/content/html/content/reftests/reftest.list +++ b/content/html/content/reftests/reftest.list @@ -34,3 +34,6 @@ skip-if(Android||B2G) == 649134-2.html 649134-2-ref.html == hidden-2.svg hidden-2-ref.svg == href-attr-change-restyles.html href-attr-change-restyles-ref.html == figure.html figure-ref.html +== table-border-1.html table-border-1-ref.html +== table-border-2.html table-border-2-ref.html +!= table-border-2.html table-border-2-notref.html diff --git a/content/html/content/reftests/table-border-1-ref.html b/content/html/content/reftests/table-border-1-ref.html new file mode 100644 index 00000000000..ceac88e9a3c --- /dev/null +++ b/content/html/content/reftests/table-border-1-ref.html @@ -0,0 +1,46 @@ + + +Table borders + + +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
diff --git a/content/html/content/reftests/table-border-1.html b/content/html/content/reftests/table-border-1.html new file mode 100644 index 00000000000..12bfb2af46e --- /dev/null +++ b/content/html/content/reftests/table-border-1.html @@ -0,0 +1,36 @@ + + +Table borders + +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
diff --git a/content/html/content/reftests/table-border-2-notref.html b/content/html/content/reftests/table-border-2-notref.html new file mode 100644 index 00000000000..7558e5271a3 --- /dev/null +++ b/content/html/content/reftests/table-border-2-notref.html @@ -0,0 +1,40 @@ + + +Table borders + + +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
diff --git a/content/html/content/reftests/table-border-2-ref.html b/content/html/content/reftests/table-border-2-ref.html new file mode 100644 index 00000000000..36d1e451062 --- /dev/null +++ b/content/html/content/reftests/table-border-2-ref.html @@ -0,0 +1,30 @@ + + +Table borders + +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
diff --git a/content/html/content/reftests/table-border-2.html b/content/html/content/reftests/table-border-2.html new file mode 100644 index 00000000000..4f209545c2f --- /dev/null +++ b/content/html/content/reftests/table-border-2.html @@ -0,0 +1,30 @@ + + +Table borders + +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
+ +
Test +
diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp index 982d8123575..72351fef510 100644 --- a/content/html/content/src/HTMLTableElement.cpp +++ b/content/html/content/src/HTMLTableElement.cpp @@ -917,12 +917,10 @@ HTMLTableElement::ParseAttribute(int32_t aNamespaceID, /* ignore summary, just a string */ if (aNamespaceID == kNameSpaceID_None) { if (aAttribute == nsGkAtoms::cellspacing || - aAttribute == nsGkAtoms::cellpadding) { + aAttribute == nsGkAtoms::cellpadding || + aAttribute == nsGkAtoms::border) { return aResult.ParseNonNegativeIntValue(aValue); } - if (aAttribute == nsGkAtoms::border) { - return aResult.ParseIntWithBounds(aValue, 0); - } if (aAttribute == nsGkAtoms::height) { return aResult.ParseSpecialIntValue(aValue); }