diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2012-10-04 11:02:53 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2012-10-04 15:28:10 -0700 |
commit | 994c47d22b0a3603978d4b6dcb8ffed72e65ac9a (patch) | |
tree | 6939083c1dd3a6cf070a92214573c95cdd1f1833 /src/servo/dom/bindings/utils.rs | |
parent | e105f3b5571f0cbfae3fc6a96938d4d039bb660d (diff) | |
download | servo-994c47d22b0a3603978d4b6dcb8ffed72e65ac9a.tar.gz servo-994c47d22b0a3603978d4b6dcb8ffed72e65ac9a.zip |
Update for language changes; remove pipe protocols.
Diffstat (limited to 'src/servo/dom/bindings/utils.rs')
-rw-r--r-- | src/servo/dom/bindings/utils.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/servo/dom/bindings/utils.rs b/src/servo/dom/bindings/utils.rs index 0ccb7386cd3..43566c83b3e 100644 --- a/src/servo/dom/bindings/utils.rs +++ b/src/servo/dom/bindings/utils.rs @@ -45,7 +45,7 @@ fn jsval_to_str(cx: *JSContext, v: jsval) -> Result<~str, ()> { } let len = 0; - let chars = JS_GetStringCharsZAndLength(cx, jsstr, ptr::addr_of(len)); + let chars = JS_GetStringCharsZAndLength(cx, jsstr, ptr::to_unsafe_ptr(&len)); return if chars.is_null() { Err(()) } else { @@ -70,7 +70,7 @@ unsafe fn domstring_to_jsval(cx: *JSContext, str: DOMString) -> jsval { } } -fn get_compartment(cx: *JSContext) -> *bare_compartment { +pub fn get_compartment(cx: *JSContext) -> *bare_compartment { unsafe { let privptr: *libc::c_void = JS_GetContextPrivate(cx); let compartment: *bare_compartment = cast::reinterpret_cast(&privptr); @@ -94,7 +94,7 @@ extern fn has_instance(_cx: *JSContext, obj: **JSObject, v: *jsval, bp: *mut JSB return 1; } -fn prototype_jsclass(name: ~str) -> fn(+bare_compartment) -> JSClass { +pub fn prototype_jsclass(name: ~str) -> fn(+compartment: bare_compartment) -> JSClass { |+compartment: bare_compartment, copy name| { {name: compartment.add_name(name), flags: 0, @@ -122,8 +122,8 @@ fn prototype_jsclass(name: ~str) -> fn(+bare_compartment) -> JSClass { } } -fn instance_jsclass(name: ~str, finalize: *u8) - -> fn(+bare_compartment) -> JSClass { +pub fn instance_jsclass(name: ~str, finalize: *u8) + -> fn(+compartment: bare_compartment) -> JSClass { |+compartment: bare_compartment, copy name| { {name: compartment.add_name(name), flags: JSCLASS_HAS_RESERVED_SLOTS(1), @@ -151,7 +151,7 @@ fn instance_jsclass(name: ~str, finalize: *u8) } } -fn define_empty_prototype(name: ~str, proto: Option<~str>, compartment: bare_compartment) +pub fn define_empty_prototype(name: ~str, proto: Option<~str>, compartment: bare_compartment) -> js::rust::jsobj { compartment.register_class(utils::prototype_jsclass(name)); |