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

@ -125,7 +125,7 @@ impl Document {
}
pub fn Constructor(owner: @mut Window) -> Fallible<AbstractDocument> {
let cx = owner.page.js_info.get_ref().js_compartment.cx.ptr;
let cx = owner.get_cx();
let document = AbstractDocument::as_abstract(cx, @mut Document::new(None, XML));
@ -242,14 +242,12 @@ impl Document {
}
fn get_cx(&self) -> *JSContext {
let win = self.window.get_ref();
win.page.js_info.get_ref().js_compartment.cx.ptr
self.window.get_ref().get_cx()
}
fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
let win = self.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
(win.reflector().get_jsobject(), cx)
(win.reflector().get_jsobject(), win.get_cx())
}
pub fn GetElementsByTagName(&self, tag: &DOMString) -> @mut HTMLCollection {