Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify _obj_toString by using JS_NewStringCopyN.

Browse source
This commit is contained in:
Ms2ger 2014-12-20 16:40:20 +01:00
parent 8a4eea0032
commit ef3901fceb
2 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3891,8 +3891,7 @@ class CGDOMJSProxyHandler_obj_toString(CGAbstractExternMethod):
JSString* jsresult; JSString* jsresult;
return xpc_qsStringToJsstring(cx, result, &jsresult) ? jsresult : NULL;""" return xpc_qsStringToJsstring(cx, result, &jsresult) ? jsresult : NULL;"""
return """let s = "%s".to_c_str(); return """_obj_toString(cx, "%s")""" % self.descriptor.name
_obj_toString(cx, s.as_ptr())""" % self.descriptor.name
def definition_body(self): def definition_body(self):
return CGGeneric(self.getBody()) return CGGeneric(self.getBody())

32
components/script/dom/bindings/proxyhandler.rs
View file

@ -6,8 +6,8 @@
use dom::bindings::conversions::is_dom_proxy; use dom::bindings::conversions::is_dom_proxy;
use dom::bindings::utils::delete_property_by_id; use dom::bindings::utils::delete_property_by_id;
use js::jsapi::{JSContext, jsid, JSPropertyDescriptor, JSObject, JSString, jschar}; use js::jsapi::{JSContext, jsid, JSPropertyDescriptor, JSObject, JSString};
use js::jsapi::{JS_GetPropertyDescriptorById, JS_NewUCString, JS_malloc, JS_free}; use js::jsapi::{JS_GetPropertyDescriptorById, JS_NewStringCopyN};
use js::jsapi::{JS_DefinePropertyById, JS_NewObjectWithGivenProto}; use js::jsapi::{JS_DefinePropertyById, JS_NewObjectWithGivenProto};
use js::jsapi::{JS_ReportErrorFlagsAndNumber, JS_StrictPropertyStub}; use js::jsapi::{JS_ReportErrorFlagsAndNumber, JS_StrictPropertyStub};
use js::jsapi::{JSREPORT_WARNING, JSREPORT_STRICT, JSREPORT_STRICT_MODE_ERROR}; use js::jsapi::{JSREPORT_WARNING, JSREPORT_STRICT, JSREPORT_STRICT_MODE_ERROR};
@ -21,8 +21,6 @@ use js::{JSPROP_GETTER, JSPROP_ENUMERATE, JSPROP_READONLY, JSRESOLVE_QUALIFIED};
use libc; use libc;
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use std::string;
use std::mem::size_of;
static JSPROXYSLOT_EXPANDO: u32 = 0; static JSPROXYSLOT_EXPANDO: u32 = 0;
@ -82,26 +80,16 @@ pub unsafe extern fn delete_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid,
return delete_property_by_id(cx, expando, id, &mut *bp); return delete_property_by_id(cx, expando, id, &mut *bp);
} }
pub fn _obj_toString(cx: *mut JSContext, className: *const libc::c_char) -> *mut JSString { pub fn _obj_toString(cx: *mut JSContext, name: &str) -> *mut JSString {
unsafe { unsafe {
let name = string::raw::from_buf(className as *const i8 as *const u8);
let nchars = "[object ]".len() + name.len();
let chars: *mut jschar = JS_malloc(cx, (nchars + 1) as libc::size_t * (size_of::<jschar>() as libc::size_t)) as *mut jschar;
if chars.is_null() {
return ptr::null_mut();
}
let result = format!("[object {}]", name); let result = format!("[object {}]", name);
let result = result.as_slice();
for (i, c) in result.chars().enumerate() { let chars = result.as_ptr() as *const libc::c_char;
*chars.offset(i as int) = c as jschar; let length = result.len() as libc::size_t;
}
*chars.offset(nchars as int) = 0; let string = JS_NewStringCopyN(cx, chars, length);
let jsstr = JS_NewUCString(cx, chars, nchars as libc::size_t); assert!(string.is_not_null());
if jsstr.is_null() { return string;
JS_free(cx, chars as *mut libc::c_void);
}
jsstr
} }
} }