Fix code generation for a null default value for nullable string arguments.

3 files changed, 3 insertions, 4 deletions

diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 7dea1ed3d6f..cffb2c07205 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -702,8 +702,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
 
             if isinstance(defaultValue, IDLNullValue):
                 assert(type.nullable())
-                return handleDefault(conversionCode,
-                                     "${declName}.SetNull();")
+                return handleDefault(conversionCode, "${declName} = None;")
 
             value = "str::from_utf8(data).unwrap().to_owned()"
             if type.nullable():
diff --git a/src/components/script/dom/testbinding.rs b/src/components/script/dom/testbinding.rs
index 4dd9f190b03..8d7b4ce5c51 100644
--- a/src/components/script/dom/testbinding.rs
+++ b/src/components/script/dom/testbinding.rs
@@ -125,7 +125,7 @@ impl TestBinding {
     pub fn PassOptionalNullableUnsignedLongLongWithDefault(&self, _: Option<u64>) {}
     pub fn PassOptionalNullableFloatWithDefault(&self, _: Option<f32>) {}
     pub fn PassOptionalNullableDoubleWithDefault(&self, _: Option<f64>) {}
-    // pub fn PassOptionalNullableStringWithDefault(&self, _: Option<DOMString>) {}
+    pub fn PassOptionalNullableStringWithDefault(&self, _: Option<DOMString>) {}
     pub fn PassOptionalNullableInterfaceWithDefault(&self, _: Option<JS<Blob>>) {}
     pub fn PassOptionalAnyWithDefault(&self, _: *JSContext, _: JSVal) {}
 
diff --git a/src/components/script/dom/webidls/TestBinding.webidl b/src/components/script/dom/webidls/TestBinding.webidl
index 1fd5f242456..4aefa14728f 100644
--- a/src/components/script/dom/webidls/TestBinding.webidl
+++ b/src/components/script/dom/webidls/TestBinding.webidl
@@ -81,7 +81,7 @@ interface TestBinding {
   void passOptionalNullableUnsignedLongWithDefault(optional unsigned long? arg = null);
   void passOptionalNullableLongLongWithDefault(optional long long? arg = null);
   void passOptionalNullableUnsignedLongLongWithDefault(optional unsigned long long? arg = null);
-  // void passOptionalNullableStringWithDefault(optional DOMString? arg = null);
+  void passOptionalNullableStringWithDefault(optional DOMString? arg = null);
   void passOptionalNullableInterfaceWithDefault(optional Blob? arg = null);
   void passOptionalAnyWithDefault(optional any arg = null);