Skip to content
Permalink
Browse files

Use RootedTraceableBox for unions.

  • Loading branch information
Ms2ger committed Feb 16, 2017
1 parent 0cc6d3e commit d5f8b35a5f65549615c2c574e479aa4596bd06f8
Showing with 7 additions and 1 deletion.
  1. +6 −0 components/script/dom/bindings/codegen/CodegenRust.py
  2. +1 −1 components/script/dom/testbinding.rs
@@ -722,6 +722,9 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
if type.nullable():
declType = CGWrapper(declType, pre="Option<", post=" >")

if isMember != "Dictionary" and type_needs_tracing(type):
declType = CGTemplatedType("RootedTraceableBox", declType)

templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
" Ok(ConversionResult::Success(value)) => value,\n"
" Ok(ConversionResult::Failure(error)) => {\n"
@@ -6190,6 +6193,9 @@ def type_needs_tracing(t):
if t.isSequence():
return type_needs_tracing(t.inner)

if t.isUnion():
return any(type_needs_tracing(member) for member in t.flatMemberTypes)

return False

if t.isDictionary():
@@ -435,7 +435,7 @@ impl TestBindingMethods for TestBinding {
fn PassUnion6(&self, _: UnsignedLongOrBoolean) {}
fn PassUnion7(&self, _: StringSequenceOrUnsignedLong) {}
fn PassUnion8(&self, _: ByteStringSequenceOrLong) {}
fn PassUnion9(&self, _: UnionTypes::TestDictionaryOrLong) {}
fn PassUnion9(&self, _: RootedTraceableBox<UnionTypes::TestDictionaryOrLong>) {}
fn PassUnionWithTypedef(&self, _: DocumentOrTestTypedef) {}
fn PassUnionWithTypedef2(&self, _: LongSequenceOrTestTypedef) {}
#[allow(unsafe_code)]

0 comments on commit d5f8b35

Please sign in to comment.
You can’t perform that action at this time.