From e834e532c51a92d31f3e3feac6f85ce6d5b9a5df Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 25 Feb 2014 19:12:34 +0100 Subject: [PATCH] Fetch the image cache inside the update_image function. --- src/components/script/dom/htmlimageelement.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs index a049d649763..38996620b59 100644 --- a/src/components/script/dom/htmlimageelement.rs +++ b/src/components/script/dom/htmlimageelement.rs @@ -16,7 +16,6 @@ use extra::url::Url; use servo_util::geometry::to_px; use layout_interface::{ContentBoxQuery, ContentBoxResponse}; use servo_net::image_cache_task; -use servo_net::image_cache_task::ImageCacheTask; use servo_util::url::parse_url; use servo_util::namespace::Null; use servo_util::str::DOMString; @@ -66,8 +65,11 @@ impl HTMLImageElement { impl HTMLImageElement { /// Makes the local `image` member match the status of the `src` attribute and starts /// prefetching the image. This method must be called after `src` is changed. - fn update_image(&mut self, image_cache: ImageCacheTask, url: Option) { + fn update_image(&mut self, url: Option) { let elem = &mut self.htmlelement.element; + let document = elem.node.owner_doc(); + let window = document.get().window.get(); + let image_cache = &window.image_cache_task; let src_opt = elem.get_attribute(Null, "src").map(|x| x.get().Value()); match src_opt { None => {} @@ -90,7 +92,7 @@ impl HTMLImageElement { let document = self.htmlelement.element.node.owner_doc(); let window = document.get().window.get(); let url = window.page.url.as_ref().map(|&(ref url, _)| url.clone()); - self.update_image(window.image_cache_task.clone(), url); + self.update_image(url); } } @@ -99,9 +101,7 @@ impl HTMLImageElement { // This might not handle remove src attribute actually since // `self.update_image()` will see the missing src attribute and return early. if "src" == name { - let document = self.htmlelement.element.node.owner_doc(); - let window = document.get().window.get(); - self.update_image(window.image_cache_task.clone(), None); + self.update_image(None); } }