diff --git a/src/servo/dom/bindings/text.rs b/src/servo/dom/bindings/text.rs index 4d89363fc62..d5f8fe7581d 100644 --- a/src/servo/dom/bindings/text.rs +++ b/src/servo/dom/bindings/text.rs @@ -79,10 +79,8 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode) -> jsobj { assert!(cache.get_wrapper().is_null()); cache.set_wrapper(obj.ptr); - unsafe { - let raw_ptr = node.raw_object() as *libc::c_void; - JS_SetReservedSlot(obj.ptr, DOM_OBJECT_SLOT as u32, RUST_PRIVATE_TO_JSVAL(raw_ptr)); - } + let raw_ptr = node.raw_object() as *libc::c_void; + JS_SetReservedSlot(obj.ptr, DOM_OBJECT_SLOT as u32, RUST_PRIVATE_TO_JSVAL(raw_ptr)); return obj; } \ No newline at end of file diff --git a/src/servo/dom/bindings/window.rs b/src/servo/dom/bindings/window.rs index 92910a029f6..9ff133e6f31 100644 --- a/src/servo/dom/bindings/window.rs +++ b/src/servo/dom/bindings/window.rs @@ -67,11 +67,9 @@ extern fn close(cx: *JSContext, _argc: c_uint, vp: *JSVal) -> JSBool { } extern fn gc(cx: *JSContext, _argc: c_uint, _vp: *JSVal) -> JSBool { - unsafe { - let runtime = JS_GetRuntime(cx); - JS_GC(runtime); - return 1; - } + let runtime = JS_GetRuntime(cx); + JS_GC(runtime); + return 1; } unsafe fn unwrap(obj: *JSObject) -> *rust_box { @@ -130,9 +128,7 @@ pub fn init(compartment: @mut Compartment) { } ]; - unsafe { - JS_DefineFunctions(compartment.cx.ptr, proto.ptr, &methods[0]); - } + JS_DefineFunctions(compartment.cx.ptr, proto.ptr, &methods[0]); } pub fn create(compartment: @mut Compartment, win: @mut Window) { diff --git a/src/servo/dom/document.rs b/src/servo/dom/document.rs index 26bb27ac26f..11fc5de0457 100644 --- a/src/servo/dom/document.rs +++ b/src/servo/dom/document.rs @@ -29,7 +29,7 @@ pub fn Document(root: AbstractNode, do root.with_imm_node |node| { assert!(node.wrapper.get_wrapper().is_not_null()); let rootable = node.wrapper.get_rootable(); - unsafe { JS_AddObjectRoot(compartment.cx.ptr, rootable); } + JS_AddObjectRoot(compartment.cx.ptr, rootable); } document::create(compartment, doc); doc @@ -42,7 +42,7 @@ impl Drop for Document { do self.root.with_imm_node |node| { assert!(node.wrapper.get_wrapper().is_not_null()); let rootable = node.wrapper.get_rootable(); - unsafe { JS_RemoveObjectRoot(compartment.cx.ptr, rootable); } + JS_RemoveObjectRoot(compartment.cx.ptr, rootable); } } } diff --git a/src/servo/html/hubbub_html_parser.rs b/src/servo/html/hubbub_html_parser.rs index 27146f49d67..ab9d6c789f8 100644 --- a/src/servo/html/hubbub_html_parser.rs +++ b/src/servo/html/hubbub_html_parser.rs @@ -243,7 +243,7 @@ pub fn parse_html(url: Url, let url = url::from_str("http://example.com/"); // FIXME let url_cell = Cell(url); do child_node.with_imm_text |text_node| { - let data = text_node.text.to_str(); // FIXME: Bad copy. + let data = text_node.parent.data.to_str(); // FIXME: Bad copy. let provenance = InlineProvenance(result::unwrap(url_cell.take()), data); css_chan2.send(CSSTaskNewFile(provenance)); }