auto merge of #908 : jdm/servo/gccrash, r=metajack

3 files changed, 19 insertions, 16 deletions

diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index 0ef1d9d502a..709509792e1 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -143,6 +143,7 @@ DOMInterfaces = {
 'Document': {
   'nativeType': 'AbstractDocument',
   'pointerType': '',
+  'customTrace': 'trace'
 },
 
 'DOMParser': {
@@ -228,6 +229,7 @@ DOMInterfaces = {
 'HTMLDocument': {
     'nativeType': 'AbstractDocument',
     'pointerType': '',
+    'customTrace': 'trace'
 },
 
 'HTMLFormElement': {
@@ -433,7 +435,8 @@ DOMInterfaces = {
 }],
 
 'Window': {
-    'createGlobal': True
+    'createGlobal': True,
+    'customTrace': 'trace'
 },
 
 'WindowProxy': {
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 0e01fcef059..44946cef991 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2221,13 +2221,13 @@ static Class_name: [u8, ..%i] = %s;
 static Class: DOMJSClass = DOMJSClass {
   base: JSClass { name: &Class_name as *u8 as *libc::c_char,
     flags: JSCLASS_IS_DOMJSCLASS | %s | (((%s) & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT), //JSCLASS_HAS_RESERVED_SLOTS(%s),
-    addProperty: %s, /* addProperty */
-    delProperty: crust::JS_PropertyStub,       /* delProperty */
-    getProperty: crust::JS_PropertyStub,       /* getProperty */
-    setProperty: crust::JS_StrictPropertyStub, /* setProperty */
-    enumerate: crust::JS_EnumerateStub,
-    resolve: crust::JS_ResolveStub,
-    convert: crust::JS_ConvertStub,
+    addProperty: Some(%s), /* addProperty */
+    delProperty: Some(crust::JS_PropertyStub),       /* delProperty */
+    getProperty: Some(crust::JS_PropertyStub),       /* getProperty */
+    setProperty: Some(crust::JS_StrictPropertyStub), /* setProperty */
+    enumerate: Some(crust::JS_EnumerateStub),
+    resolve: Some(crust::JS_ResolveStub),
+    convert: Some(crust::JS_ConvertStub),
     finalize: Some(%s), /* finalize */
     checkAccess: None,                  /* checkAccess */
     call: None,                  /* call */
@@ -2269,13 +2269,13 @@ static PrototypeClassName__: [u8, ..%s] = %s;
 static PrototypeClass: JSClass = JSClass {
   name: &PrototypeClassName__ as *u8 as *libc::c_char,
   flags: (1 & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT, //JSCLASS_HAS_RESERVED_SLOTS(1)
-  addProperty: crust::JS_PropertyStub,       /* addProperty */
-  delProperty: crust::JS_PropertyStub,       /* delProperty */
-  getProperty: crust::JS_PropertyStub,       /* getProperty */
-  setProperty: crust::JS_StrictPropertyStub, /* setProperty */
-  enumerate: crust::JS_EnumerateStub,
-  resolve: crust::JS_ResolveStub,
-  convert: crust::JS_ConvertStub,
+  addProperty: Some(crust::JS_PropertyStub),       /* addProperty */
+  delProperty: Some(crust::JS_PropertyStub),       /* delProperty */
+  getProperty: Some(crust::JS_PropertyStub),       /* getProperty */
+  setProperty: Some(crust::JS_StrictPropertyStub), /* setProperty */
+  enumerate: Some(crust::JS_EnumerateStub),
+  resolve: Some(crust::JS_ResolveStub),
+  convert: Some(crust::JS_ConvertStub),
   finalize: None,                  /* finalize */
   checkAccess: None,                  /* checkAccess */
   call: None,                  /* call */
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index 05aff3793ca..a453d5d66c8 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -130,7 +130,7 @@ impl Traceable for Node<ScriptView> {
                 }
             }
         }
-        error!("tracing %p?:", self.wrapper.get_wrapper());
+        debug!("tracing %p?:", self.wrapper.get_wrapper());
         trace_node(tracer, self.parent_node, "parent");
         trace_node(tracer, self.first_child, "first child");
         trace_node(tracer, self.last_child, "last child");