diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-03-10 11:40:13 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-03-10 16:31:13 +0100 |
| commit | 17411db8cae1fe2786986541e110516fc7ef9dcc (patch) | |
| tree | 8bdb18e0eb3cceec0e98a1ef128cedf6518086b5 /src/components/script/dom/bindings/codegen | |
| parent | 476699a1142d90cf0ada164e17af880be32902d5 (diff) | |
| download | servo-17411db8cae1fe2786986541e110516fc7ef9dcc.tar.gz servo-17411db8cae1fe2786986541e110516fc7ef9dcc.zip | |
Replace str_to_jsval and domstring_to_jsval by a ToJSValConvertible implementation.
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 28ef759a70f..6b377dae22a 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1535,10 +1535,7 @@ for (uint32_t i = 0; i < length; ++i) { return (wrappingCode, False) if type.isString(): - if type.nullable(): - return (wrapAndSetPtr("*${jsvalPtr} = domstring_to_jsval(cx, %s)" % result), False) - else: - return (wrapAndSetPtr("*${jsvalPtr} = str_to_jsval(cx, %s)" % result), False) + return (setValue("(%s).to_jsval(cx)" % result), True) if type.isEnum(): if type.nullable(): @@ -5258,7 +5255,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::utils::{CreateDOMGlobal, CreateInterfaceObjects2}', 'dom::bindings::utils::{ConstantSpec, cx_for_dom_object, Default}', 'dom::bindings::utils::{dom_object_slot, DOM_OBJECT_SLOT, DOMClass}', - 'dom::bindings::utils::{DOMJSClass, domstring_to_jsval, Empty}', + 'dom::bindings::utils::{DOMJSClass, Empty}', 'dom::bindings::utils::{FindEnumStringIndex, GetArrayIndexFromId}', 'dom::bindings::utils::{GetPropertyOnPrototype, GetProtoOrIfaceArray}', 'dom::bindings::utils::{GetReflector, HasPropertyOnPrototype, IntVal}', @@ -5266,7 +5263,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::utils::{NativePropertyHooks}', 'dom::bindings::utils::global_object_for_js_object', 'dom::bindings::utils::{Reflectable}', - 'dom::bindings::utils::{squirrel_away_unique, str_to_jsval}', + 'dom::bindings::utils::{squirrel_away_unique}', 'dom::bindings::utils::{ThrowingConstructor, unwrap, unwrap_jsmanaged}', 'dom::bindings::utils::{unwrap_object, VoidVal, with_gc_disabled}', 'dom::bindings::utils::{with_gc_enabled, XrayResolveProperty}', |