auto merge of #1050 : Ms2ger/servo/get_cx, r=jdm

This commit is contained in:
bors-servo 2013-10-14 09:37:14 -07:00
commit 5d00b52055
8 changed files with 19 additions and 19 deletions

View file

@ -655,8 +655,7 @@ impl Node<ScriptView> {
pub fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
let win = self.owner_doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
(win.reflector().get_jsobject(), cx)
(win.reflector().get_jsobject(), win.get_cx())
}
// http://dom.spec.whatwg.org/#concept-node-replace-all