From acffed2dcd93f26fc3dc5c81b03129ba40d27433 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 20 Mar 2014 22:51:31 +0100 Subject: Fix code generation for a null default value for nullable string arguments. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 3 +-- src/components/script/dom/testbinding.rs | 2 +- src/components/script/dom/webidls/TestBinding.webidl | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') 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) {} pub fn PassOptionalNullableFloatWithDefault(&self, _: Option) {} pub fn PassOptionalNullableDoubleWithDefault(&self, _: Option) {} - // pub fn PassOptionalNullableStringWithDefault(&self, _: Option) {} + pub fn PassOptionalNullableStringWithDefault(&self, _: Option) {} pub fn PassOptionalNullableInterfaceWithDefault(&self, _: Option>) {} 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); -- cgit v1.2.3