Replace Document::{with_base, with_mut_base} by Document::{document, mut_document}.

This commit is contained in:
Ms2ger 2013-10-21 17:21:36 +02:00
parent 364256e359
commit b90766404c
6 changed files with 77 additions and 111 deletions

View file

@ -43,12 +43,10 @@ impl HTMLImageElement {
pub fn AfterSetAttr(&mut self, name: &DOMString, _value: &DOMString) {
let name = null_str_as_empty(name);
if "src" == name {
let doc = self.htmlelement.element.node.owner_doc();
do doc.with_base |doc| {
let window = doc.window;
let url = window.page.url.map(|&(ref url, _)| url.clone());
self.update_image(window.image_cache_task.clone(), url);
}
let document = self.htmlelement.element.node.owner_doc();
let window = document.document().window;
let url = window.page.url.map(|&(ref url, _)| url.clone());
self.update_image(window.image_cache_task.clone(), url);
}
}
@ -100,7 +98,7 @@ impl HTMLImageElement {
pub fn Width(&self, abstract_self: AbstractNode<ScriptView>) -> u32 {
let node = &self.htmlelement.element.node;
let page = node.owner_doc().with_base(|doc| doc.window).page;
let page = node.owner_doc().document().window.page;
let (port, chan) = stream();
match page.query_layout(ContentBoxQuery(abstract_self, chan), port) {
ContentBoxResponse(rect) => {
@ -121,7 +119,7 @@ impl HTMLImageElement {
pub fn Height(&self, abstract_self: AbstractNode<ScriptView>) -> u32 {
let node = &self.htmlelement.element.node;
let page = node.owner_doc().with_base(|doc| doc.window).page;
let page = node.owner_doc().document().window.page;
let (port, chan) = stream();
match page.query_layout(ContentBoxQuery(abstract_self, chan), port) {
ContentBoxResponse(rect) => {