Support nullable typed arrays in codegen

servo · Mar 14, 2018 · 6beb32e · 6beb32e
1 parent e025bbb
commit 6beb32e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -882,7 +882,8 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
         else:
             unwrapFailureCode = failureCode
 
-        typeName = type.name
+        typeName = type.unroll().name  # unroll because it may be nullable
+
         if isMember == "Union":
             typeName = "Heap" + typeName
 
@@ -902,7 +903,7 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
         if isMember == "Union":
             templateBody = "RootedTraceableBox::new(%s)" % templateBody
 
-        declType = CGGeneric("typedarray::%s" % type.name)
+        declType = CGGeneric("typedarray::%s" % typeName)
         if type.nullable():
             templateBody = "Some(%s)" % templateBody
             declType = CGWrapper(declType, pre="Option<", post=">")

diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
@@ -492,6 +492,7 @@ impl TestBindingMethods for TestBinding {
     fn PassNullableInterface(&self, _: Option<&Blob>) {}
     #[allow(unsafe_code)]
     unsafe fn PassNullableObject(&self, _: *mut JSContext, _: *mut JSObject) {}
+    fn PassNullableTypedArray(&self, _: CustomAutoRooterGuard<Option<typedarray::Int8Array>>) { }
     fn PassNullableUnion(&self, _: Option<HTMLElementOrLong>) {}
     fn PassNullableUnion2(&self, _: Option<EventOrString>) {}
     fn PassNullableUnion3(&self, _: Option<StringOrLongSequence>) {}

diff --git a/components/script/dom/webidls/TestBinding.webidl b/components/script/dom/webidls/TestBinding.webidl
@@ -294,6 +294,7 @@ interface TestBinding {
   // void passNullableEnum(TestEnum? arg);
   void passNullableInterface(Blob? arg);
   void passNullableObject(object? arg);
+  void passNullableTypedArray(Int8Array? arg);
   void passNullableUnion((HTMLElement or long)? arg);
   void passNullableUnion2((Event or DOMString)? data);
   void passNullableUnion3((DOMString or sequence<long>)? data);