From d5f8b35a5f65549615c2c574e479aa4596bd06f8 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 16 Feb 2017 15:27:16 +0100 Subject: Use RootedTraceableBox for unions. --- components/script/dom/bindings/codegen/CodegenRust.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index e4448ff834c..4a9e7a8cc32 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -722,6 +722,9 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, 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(): -- cgit v1.2.3