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

Speed up JS bindings by using Rust jsval manipulation inlining.

Browse source
This commit is contained in:
Josh Matthews 2012-10-10 08:25:37 -04:00
parent ea432a28c6
commit 283f5415df
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rust-mozjs

@ -1 +1 @@
Subproject commit 21de9b86992e4a1d60ef82a8611c1fe08aa81641 Subproject commit a1430323431984d7b3b4795055ef0ad4abbe37f9

28
src/servo/dom/bindings/node.rs
View file

@ -7,7 +7,7 @@ use js::jsapi::bindgen::{JS_ValueToString, JS_GetStringCharsZAndLength, JS_Repor
JS_DefineFunctions, JS_DefineProperty, JS_GetContextPrivate}; JS_DefineFunctions, JS_DefineProperty, JS_GetContextPrivate};
use js::jsapi::bindgen::*; use js::jsapi::bindgen::*;
use js::glue::bindgen::*; use js::glue::bindgen::*;
use js::crust::{JS_PropertyStub, JS_StrictPropertyStub, JS_EnumerateStub, JS_ConvertStub}; use js::jsval::{INT_TO_JSVAL, JSVAL_TO_PRIVATE};
use dom::node::{Node, NodeScope, Text, Doctype, Comment, Element}; use dom::node::{Node, NodeScope, Text, Doctype, Comment, Element};
use utils::{rust_box, squirrel_away_unique, get_compartment, domstring_to_jsval, str}; use utils::{rust_box, squirrel_away_unique, get_compartment, domstring_to_jsval, str};
@ -75,7 +75,7 @@ fn NodeBundle(n: Node, s: NodeScope) -> NodeBundle {
unsafe fn unwrap(obj: *JSObject) -> *rust_box<NodeBundle> { unsafe fn unwrap(obj: *JSObject) -> *rust_box<NodeBundle> {
let val = JS_GetReservedSlot(obj, 0); let val = JS_GetReservedSlot(obj, 0);
cast::reinterpret_cast(&RUST_JSVAL_TO_PRIVATE(val)) cast::reinterpret_cast(&JSVAL_TO_PRIVATE(val))
} }
#[allow(non_implicitly_copyable_typarams)] #[allow(non_implicitly_copyable_typarams)]
@ -126,6 +126,19 @@ extern fn getNextSibling(cx: *JSContext, _argc: c_uint, vp: *mut jsval) -> JSBoo
return 1; return 1;
} }
impl NodeBundle {
fn getNodeType() -> i32 {
do self.node.read |nd| {
match nd.kind {
~Element(*) => 1,
~Text(*) => 3,
~Comment(*) => 8,
~Doctype(*) => 10
}
}
}
}
extern fn getNodeType(cx: *JSContext, _argc: c_uint, vp: *mut jsval) -> JSBool { extern fn getNodeType(cx: *JSContext, _argc: c_uint, vp: *mut jsval) -> JSBool {
unsafe { unsafe {
let obj = JS_THIS_OBJECT(cx, cast::reinterpret_cast(&vp)); let obj = JS_THIS_OBJECT(cx, cast::reinterpret_cast(&vp));
@ -134,15 +147,8 @@ extern fn getNodeType(cx: *JSContext, _argc: c_uint, vp: *mut jsval) -> JSBool {
} }
let bundle = unwrap(obj); let bundle = unwrap(obj);
let nodeType = do (*bundle).payload.node.read |nd| { let nodeType = (*bundle).payload.getNodeType();
match nd.kind { *vp = INT_TO_JSVAL(nodeType);
~Element(*) => 1,
~Text(*) => 3,
~Comment(*) => 8,
~Doctype(*) => 10
}
};
*vp = RUST_INT_TO_JSVAL(nodeType);
} }
return 1; return 1;
} }