Backed out changeset 97216ae0fc04 due to accidentally landing to m-c rather than try.
authorJustin Wood <Callek@gmail.com>
Sat, 03 Sep 2011 03:15:21 -0400
changeset 76464 a61a0b7927ed700981288872b49be1eb09458389
parent 76463 97216ae0fc04151961ac9e6154a0e744b1d44d5c
child 76485 e1d7cac1fa83d6d3e008171dcdf019ad3dd21d42
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
milestone9.0a1
backs out97216ae0fc04151961ac9e6154a0e744b1d44d5c
Backed out changeset 97216ae0fc04 due to accidentally landing to m-c rather than try.
content/html/content/src/nsHTMLTableColElement.cpp
content/html/content/test/Makefile.in
content/html/content/test/test_bug668819.html
dom/interfaces/html/nsIDOMHTMLTableColElement.idl
--- a/content/html/content/src/nsHTMLTableColElement.cpp
+++ b/content/html/content/src/nsHTMLTableColElement.cpp
@@ -109,17 +109,17 @@ NS_INTERFACE_TABLE_HEAD(nsHTMLTableColEl
 NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLTableColElement)
 
 NS_IMPL_ELEMENT_CLONE(nsHTMLTableColElement)
 
 
 NS_IMPL_STRING_ATTR(nsHTMLTableColElement, Align, align)
 NS_IMPL_STRING_ATTR(nsHTMLTableColElement, Ch, _char)
 NS_IMPL_STRING_ATTR(nsHTMLTableColElement, ChOff, charoff)
-NS_IMPL_UINT_ATTR_NON_ZERO_DEFAULT_VALUE(nsHTMLTableColElement, Span, span, 1)
+NS_IMPL_INT_ATTR_DEFAULT_VALUE(nsHTMLTableColElement, Span, span, 1)
 NS_IMPL_STRING_ATTR(nsHTMLTableColElement, VAlign, valign)
 NS_IMPL_STRING_ATTR(nsHTMLTableColElement, Width, width)
 
 
 PRBool
 nsHTMLTableColElement::ParseAttribute(PRInt32 aNamespaceID,
                                       nsIAtom* aAttribute,
                                       const nsAString& aValue,
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -272,13 +272,12 @@ include $(topsrcdir)/config/rules.mk
 		test_bug666666.html \
 		test_bug674558.html \
 		test_bug583533.html \
 		test_restore_from_parser_fragment.html \
 		test_bug617528.html \
 		test_checked.html \
 		test_bug677658.html \
 		test_bug677463.html \
-		test_bug668819.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
deleted file mode 100644
--- a/content/html/content/test/test_bug668819.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=668819
--->
-<head>
-  <title>Test for Bug 668819</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="reflect.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=668819">Mozilla Bug 668819</a>
-<p id="display"></p>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 668819 **/
-
-var textarea = document.createElement('colgroup');
-reflectUnsignedInt(textarea, "span", true, 1);
-
-</script>
-</pre>
-</body>
-</html>
-
--- a/dom/interfaces/html/nsIDOMHTMLTableColElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLTableColElement.idl
@@ -45,18 +45,18 @@
  *
  * This interface is trying to follow the DOM Level 2 HTML specification:
  * http://www.w3.org/TR/DOM-Level-2-HTML/
  *
  * with changes from the work-in-progress WHATWG HTML specification:
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(d61a4bf0-2ed9-41e9-b308-2ac575e24036)]
+[scriptable, uuid(b0c8daa0-6b74-4436-b1ca-2de5d6d3fe33)]
 interface nsIDOMHTMLTableColElement : nsIDOMHTMLElement
 {
            attribute DOMString        align;
            attribute DOMString        ch;
            attribute DOMString        chOff;
-           attribute unsigned long    span;
+           attribute long             span;
            attribute DOMString        vAlign;
            attribute DOMString        width;
 };