auto merge of #824 : Constellation/servo/small, r=jdm

I've renew HTMLSmallElement implementation.

5 files changed, 3 insertions, 10 deletions

diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index 6a7fee87288..ffd072493d9 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -129,7 +129,6 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
         ElementNodeTypeId(HTMLTitleElementTypeId) => generate_element!(HTMLTitleElement),
         ElementNodeTypeId(HTMLUListElementTypeId) => generate_element!(HTMLUListElement),
         ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement),
-        ElementNodeTypeId(_) => element::create(cx, node).ptr,
         CommentNodeTypeId => generate_element!(Comment),
         DoctypeNodeTypeId => generate_element!(DocumentType<ScriptView>),
         TextNodeTypeId => generate_element!(Text)
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index 5ebfe1503cb..a2abbf47774 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -91,7 +91,6 @@ pub enum ElementTypeId {
     HTMLQuoteElementTypeId,
     HTMLScriptElementTypeId,
     HTMLSelectElementTypeId,
-    HTMLSmallElementTypeId,
     HTMLSourceElementTypeId,
     HTMLSpanElementTypeId,
     HTMLStyleElementTypeId,
@@ -109,12 +108,6 @@ pub enum ElementTypeId {
 }
 
 //
-// Regular old elements
-//
-
-pub struct HTMLSmallElement     { parent: HTMLElement }
-
-//
 // Element methods
 //
 
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 75882950351..081c6a1ba25 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -225,7 +225,6 @@ fn build_element_from_tag(cx: *JSContext, tag: &str) -> AbstractNode<ScriptView>
     handle_element!(cx, tag, "q",       HTMLQuoteElementTypeId, HTMLQuoteElement, []);
     handle_element!(cx, tag, "script",  HTMLScriptElementTypeId, HTMLScriptElement, []);
     handle_element!(cx, tag, "select",  HTMLSelectElementTypeId, HTMLSelectElement, []);
-    handle_element!(cx, tag, "small",   HTMLSmallElementTypeId, HTMLSmallElement, []);
     handle_element!(cx, tag, "source",  HTMLSourceElementTypeId, HTMLSourceElement, []);
     handle_element!(cx, tag, "span",    HTMLSpanElementTypeId, HTMLSpanElement, []);
     handle_element!(cx, tag, "style",   HTMLStyleElementTypeId, HTMLStyleElement, []);
@@ -256,6 +255,7 @@ fn build_element_from_tag(cx: *JSContext, tag: &str) -> AbstractNode<ScriptView>
     handle_htmlelement!(cx, tag, "b",       HTMLElementTypeId, HTMLElement);
     handle_htmlelement!(cx, tag, "i",       HTMLElementTypeId, HTMLElement);
     handle_htmlelement!(cx, tag, "section", HTMLElementTypeId, HTMLElement);
+    handle_htmlelement!(cx, tag, "small",   HTMLElementTypeId, HTMLElement);
 
     unsafe {
         let element = @HTMLUnknownElement {
diff --git a/src/test/html/test_bindings.html b/src/test/html/test_bindings.html
index 5408f6f5d33..e61904cd005 100644
--- a/src/test/html/test_bindings.html
+++ b/src/test/html/test_bindings.html
@@ -41,6 +41,7 @@
     <aside>aside</aside>
     <b>b</b>
     <i>i</i>
+    <small>small</small>
     <textarea>textarea</textarea>
     <time datetime="2014-02-14">Valentines day</time>
     <audio>
diff --git a/src/test/html/test_bindings.js b/src/test/html/test_bindings.js
index 007101bf66d..25a0611c516 100644
--- a/src/test/html/test_bindings.js
+++ b/src/test/html/test_bindings.js
@@ -145,7 +145,7 @@ window.alert(tags[0]);
 window.alert(tags[0].tagName);
 
 window.alert("HTMLElement:");
-let tagList = ["section", "aside", "b", "i"];
+let tagList = ["section", "aside", "b", "i", "small"];
 for (let i = 0, l = tagList.length; i < l; ++i) {
   let tags = document.getElementsByTagName(tagList[i]);
   window.alert(tags);