diff options
Diffstat (limited to 'components/script/dom/htmlcanvaselement.rs')
-rw-r--r-- | components/script/dom/htmlcanvaselement.rs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index a4b628383d7..b4118e234c3 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -432,8 +432,7 @@ impl<'a> From<&'a WebGLContextAttributes> for GLContextAttributes { pub mod utils { use crate::dom::window::Window; - use net_traits::image_cache::CanRequestImages; - use net_traits::image_cache::{ImageOrMetadataAvailable, ImageResponse, UsePlaceholder}; + use net_traits::image_cache::ImageResponse; use net_traits::request::CorsSettings; use servo_url::ServoUrl; @@ -443,18 +442,15 @@ pub mod utils { cors_setting: Option<CorsSettings>, ) -> ImageResponse { let image_cache = window.image_cache(); - let response = image_cache.find_image_or_metadata( - url.into(), + let result = image_cache.get_image( + url.clone(), window.origin().immutable().clone(), cors_setting, - UsePlaceholder::No, - CanRequestImages::No, ); - match response { - Ok(ImageOrMetadataAvailable::ImageAvailable(image, url)) => { - ImageResponse::Loaded(image, url) - }, - _ => ImageResponse::None, + + match result { + Some(image) => ImageResponse::Loaded(image, url), + None => ImageResponse::None, } } } |