Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-12 18:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve jsid_to_str's name and documentation.

Browse source
This commit is contained in:
Ms2ger 2016-09-20 10:18:05 +02:00
parent 821797d6f7
commit 6023560863
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -4658,7 +4658,7 @@ class CGProxyNamedOperation(CGProxySpecialOperation):
def define(self): def define(self):
# Our first argument is the id we're getting. # Our first argument is the id we're getting.
argName = self.arguments[0].identifier.name argName = self.arguments[0].identifier.name
return ("let %s = jsid_to_str(cx, id);\n" return ("let %s = string_jsid_to_string(cx, id);\n"
"let this = UnwrapProxy(proxy);\n" "let this = UnwrapProxy(proxy);\n"
"let this = &*this;\n" % argName + "let this = &*this;\n" % argName +
CGProxySpecialOperation.define(self)) CGProxySpecialOperation.define(self))
@ -5528,13 +5528,13 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
'dom::bindings::conversions::StringificationBehavior', 'dom::bindings::conversions::StringificationBehavior',
'dom::bindings::conversions::ToJSValConvertible', 'dom::bindings::conversions::ToJSValConvertible',
'dom::bindings::conversions::is_array_like', 'dom::bindings::conversions::is_array_like',
'dom::bindings::conversions::jsid_to_str',
'dom::bindings::conversions::native_from_handlevalue', 'dom::bindings::conversions::native_from_handlevalue',
'dom::bindings::conversions::native_from_object', 'dom::bindings::conversions::native_from_object',
'dom::bindings::conversions::private_from_object', 'dom::bindings::conversions::private_from_object',
'dom::bindings::conversions::root_from_handleobject', 'dom::bindings::conversions::root_from_handleobject',
'dom::bindings::conversions::root_from_handlevalue', 'dom::bindings::conversions::root_from_handlevalue',
'dom::bindings::conversions::root_from_object', 'dom::bindings::conversions::root_from_object',
'dom::bindings::conversions::string_jsid_to_string',
'dom::bindings::codegen::PrototypeList', 'dom::bindings::codegen::PrototypeList',
'dom::bindings::codegen::RegisterBindings', 'dom::bindings::codegen::RegisterBindings',
'dom::bindings::codegen::UnionTypes', 'dom::bindings::codegen::UnionTypes',

11
components/script/dom/bindings/conversions.rs
View file

@ -115,9 +115,14 @@ impl <T: Reflectable + IDLInterface> FromJSValConvertible for Root<T> {
} }
} }
/// Convert the given `jsid` to a `DOMString`. Fails if the `jsid` is not a /// Convert `id` to a `DOMString`, assuming it is string-valued.
/// string, or if the string does not contain valid UTF-16. ///
pub fn jsid_to_str(cx: *mut JSContext, id: HandleId) -> DOMString { /// Handling of invalid UTF-16 in strings depends on the relevant option.
///
/// # Panics
///
/// Panics if `id` is not string-valued.
pub fn string_jsid_to_string(cx: *mut JSContext, id: HandleId) -> DOMString {
unsafe { unsafe {
assert!(RUST_JSID_IS_STRING(id)); assert!(RUST_JSID_IS_STRING(id));
jsstring_to_str(cx, RUST_JSID_TO_STRING(id)) jsstring_to_str(cx, RUST_JSID_TO_STRING(id))