Turn on GC all the time. Fix rooting errors during parsing and storing timers. Fix borrow errors during tracing.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs
index 3fdf2a4ba7f..0e7159c61b9 100644
--- a/src/components/script/dom/htmlformelement.rs
+++ b/src/components/script/dom/htmlformelement.rs
@@ -4,7 +4,7 @@
 
 use dom::bindings::codegen::BindingDeclarations::HTMLFormElementBinding;
 use dom::bindings::codegen::InheritTypes::HTMLFormElementDerived;
-use dom::bindings::js::JS;
+use dom::bindings::js::{JS, JSRef, RootCollection};
 use dom::bindings::error::ErrorResult;
 use dom::document::Document;
 use dom::element::{Element, HTMLFormElementTypeId};
@@ -35,8 +35,8 @@ impl HTMLFormElement {
         }
     }
 
-    pub fn new(localName: DOMString, document: &JS<Document>) -> JS<HTMLFormElement> {
-        let element = HTMLFormElement::new_inherited(localName, document.clone());
+    pub fn new(localName: DOMString, document: &JSRef<Document>) -> JS<HTMLFormElement> {
+        let element = HTMLFormElement::new_inherited(localName, document.unrooted());
         Node::reflect_node(~element, document, HTMLFormElementBinding::Wrap)
     }
 }
@@ -116,9 +116,11 @@ impl HTMLFormElement {
 
     pub fn Elements(&self) -> JS<HTMLCollection> {
         // FIXME: https://github.com/mozilla/servo/issues/1844
+        let roots = RootCollection::new();
         let doc = self.htmlelement.element.node.owner_doc();
         let doc = doc.get();
-        HTMLCollection::new(&doc.window, Static(vec!()))
+        let window = doc.window.root(&roots);
+        HTMLCollection::new(&window.root_ref(), Static(vec!()))
     }
 
     pub fn Length(&self) -> i32 {