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

Merge remote-tracking branch 'origin/master' into HEAD

Browse source 
Conflicts:
	src/components/script/dom/bindings/proxyhandler.rs
	src/components/script/dom/bindings/text.rs
This commit is contained in:
Brian Anderson 2013-08-29 15:22:17 -07:00
commit 9624148f18
58 changed files with 2099 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/script/dom/bindings/proxyhandler.rs
View file

@ -44,8 +44,9 @@ pub extern fn getPropertyDescriptor(cx: *JSContext, proxy: *JSObject, id: jsid,
}
}
pub extern fn defineProperty(cx: *JSContext, proxy: *JSObject, id: jsid,
desc: *JSPropertyDescriptor) -> JSBool {
#[fixed_stack_segment]
pub fn defineProperty_(cx: *JSContext, proxy: *JSObject, id: jsid,
desc: *JSPropertyDescriptor) -> JSBool {
unsafe {
if ((*desc).attrs & JSPROP_GETTER) != 0 && (*desc).setter == Some(JS_StrictPropertyStub) {
/*return JS_ReportErrorFlagsAndNumber(cx,
@ -66,6 +67,11 @@ pub extern fn defineProperty(cx: *JSContext, proxy: *JSObject, id: jsid,
}
}
pub extern fn defineProperty(cx: *JSContext, proxy: *JSObject, id: jsid,
desc: *JSPropertyDescriptor) -> JSBool {
defineProperty_(cx, proxy, id, desc)
}
#[fixed_stack_segment]
pub fn _obj_toString(cx: *JSContext, className: *libc::c_char) -> *JSString {
unsafe {