diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-21 06:49:34 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-21 06:49:34 -0400 |
| commit | 54da52fa774ce2ee59fcf811af595bf292169ad8 (patch) | |
| tree | e0ee965e9d7acd375dc59e2d46b37329c04b98aa | |
| parent | 5dbde0c5c5e60f41263246e79369748fb2493d65 (diff) | |
| parent | acffed2dcd93f26fc3dc5c81b03129ba40d27433 (diff) | |
| download | servo-54da52fa774ce2ee59fcf811af595bf292169ad8.tar.gz servo-54da52fa774ce2ee59fcf811af595bf292169ad8.zip | |
auto merge of #1950 : Ms2ger/servo/nullable-string-with-null-default, r=jdm
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 3 | ||||
| -rw-r--r-- | src/components/script/dom/testbinding.rs | 2 | ||||
| -rw-r--r-- | src/components/script/dom/webidls/TestBinding.webidl | 2 |
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 f186e3f8024..63bd00f3e90 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -688,8 +688,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); |