3 files changed, 42 insertions, 22 deletions
diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs
index 798d0731b2c..95134556bc0 100644
--- a/components/script/dom/htmlcollection.rs
+++ b/components/script/dom/htmlcollection.rs
@@ -248,7 +248,7 @@ impl<'a> Iterator for HTMLCollectionElementsIter<'a> {
                       .filter_map(Root::downcast)
                       .filter(|element| filter.filter(&element, root))
                       .next()
-   }
+    }
 }
 
 impl HTMLCollectionMethods for HTMLCollection {
diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs
index 4cff33b78a1..1d189f4a21f 100644
--- a/components/script/dom/htmltableelement.rs
+++ b/components/script/dom/htmltableelement.rs
@@ -34,6 +34,20 @@ pub struct HTMLTableElement {
     tbodies: MutNullableHeap<JS<HTMLCollection>>,
 }
 
+#[allow(unrooted_must_root)]
+#[derive(JSTraceable, HeapSizeOf)]
+struct TableRowFilter {
+    sections: Vec<JS<Node>>,
+}
+
+impl CollectionFilter for TableRowFilter {
+    fn filter(&self, elem: &Element, root: &Node) -> bool {
+        elem.is::<HTMLTableRowElement>() &&
+            (root.is_parent_of(elem.upcast())
+                || self.sections.iter().any(|ref section| section.is_parent_of(elem.upcast())))
+    }
+}
+
 impl HTMLTableElement {
     fn new_inherited(localName: Atom, prefix: Option<DOMString>, document: &Document)
                      -> HTMLTableElement {
@@ -120,32 +134,22 @@ impl HTMLTableElement {
             thead.upcast::<Node>().remove_self();
         }
     }
-}
-
-impl HTMLTableElementMethods for HTMLTableElement {
-    // https://html.spec.whatwg.org/multipage/#dom-table-rows
-    fn Rows(&self) -> Root<HTMLCollection> {
-        #[allow(unrooted_must_root)]
-        #[derive(JSTraceable, HeapSizeOf)]
-        struct TableRowFilter {
-            sections: Vec<JS<Node>>
-        }
-
-        impl CollectionFilter for TableRowFilter {
-            fn filter(&self, elem: &Element, root: &Node) -> bool {
-                elem.is::<HTMLTableRowElement>() &&
-                    (root.is_parent_of(elem.upcast())
-                        || self.sections.iter().any(|ref section| section.is_parent_of(elem.upcast())))
-            }
-        }
 
-        let filter = TableRowFilter {
+    fn get_rows(&self) -> TableRowFilter {
+        TableRowFilter {
             sections: self.upcast::<Node>()
                           .children()
                           .filter_map(|ref node|
                                 node.downcast::<HTMLTableSectionElement>().map(|_| JS::from_ref(&**node)))
                           .collect()
-        };
+        }
+    }
+}
+
+impl HTMLTableElementMethods for HTMLTableElement {
+    // https://html.spec.whatwg.org/multipage/#dom-table-rows
+    fn Rows(&self) -> Root<HTMLCollection> {
+        let filter = self.get_rows();
         HTMLCollection::new(window_from_node(self).r(), self.upcast(), box filter)
     }
 
@@ -338,6 +342,22 @@ impl HTMLTableElementMethods for HTMLTableElement {
         Ok(new_row)
     }
 
+    // https://html.spec.whatwg.org/multipage/#dom-table-deleterow
+    fn DeleteRow(&self, mut index: i32) -> Fallible<()> {
+        let rows = self.Rows();
+        // Step 1.
+        if index == -1 {
+            index = rows.Length() as i32 - 1;
+        }
+        // Step 2.
+        if index < 0 || index as u32 >= rows.Length() {
+            return Err(Error::IndexSize);
+        }
+        // Step 3.
+        Root::upcast::<Node>(rows.Item(index as u32).unwrap()).remove_self();
+        Ok(())
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-table-bgcolor
     make_getter!(BgColor, "bgcolor");
 
diff --git a/components/script/dom/webidls/HTMLTableElement.webidl b/components/script/dom/webidls/HTMLTableElement.webidl
index 596f5abd188..f0d8e19d0eb 100644
--- a/components/script/dom/webidls/HTMLTableElement.webidl
+++ b/components/script/dom/webidls/HTMLTableElement.webidl
@@ -19,7 +19,7 @@ interface HTMLTableElement : HTMLElement {
   HTMLTableSectionElement createTBody();
   readonly attribute HTMLCollection rows;
   [Throws] HTMLTableRowElement insertRow(optional long index = -1);
-  //void deleteRow(long index);
+  [Throws] void deleteRow(long index);
 
   // also has obsolete members
 };