From 760e0a5b5792fb3c8967aee53cc41e1e25adf07d Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <Xanewok@gmail.com>
Date: Tue, 13 Mar 2018 14:57:09 +0100
Subject: [PATCH] Root JS object members in dictionaries

---
 components/script/dom/bindings/codegen/CodegenRust.py | 8 +++-----
 components/script/dom/testbinding.rs                  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 1207b050797b..916c8770d344 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1121,13 +1121,10 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
         templateBody = "${val}.get().to_object()"
         default = "ptr::null_mut()"
 
-        # TODO: Do we need to do the same for dictionaries?
-        if isMember == "Union":
+        if isMember in ("Dictionary", "Union"):
             templateBody = "RootedTraceableBox::from_box(Heap::boxed(%s))" % templateBody
             default = "RootedTraceableBox::new(Heap::default())"
             declType = CGGeneric("RootedTraceableBox<Heap<*mut JSObject>>")
-        elif isMember == "Dictionary":
-            declType = CGGeneric("Heap<*mut JSObject>")
         else:
             # TODO: Need to root somehow
             # https://github.com/servo/servo/issues/6382
@@ -6168,7 +6165,8 @@ def memberInit(memberInfo, isInitial):
             conversion = self.getMemberConversion(memberInfo, member.type)
             if isInitial:
                 return CGGeneric("%s: %s,\n" % (name, conversion.define()))
-            if member.type.isAny() or member.type.isObject():
+            # TODO: Root Heap<JSVal> using RootedTraceableBox
+            if member.type.isAny():
                 return CGGeneric("dictionary.%s.set(%s);\n" % (name, conversion.define()))
             return CGGeneric("dictionary.%s = %s;\n" % (name, conversion.define()))
 
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index 80159a300681..d450c2828854 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -369,7 +369,7 @@ impl TestBindingMethods for TestBinding {
                 nullableFloatValue: None,
                 nullableLongLongValue: None,
                 nullableLongValue: None,
-                nullableObjectValue: Heap::default(),
+                nullableObjectValue: RootedTraceableBox::new(Heap::default()),
                 nullableOctetValue: None,
                 nullableShortValue: None,
                 nullableStringValue: None,