From 2742fd2beaad4dafd1caca0e78c5b8cce77fa2e4 Mon Sep 17 00:00:00 2001
From: Julien Tregoat <jules@jules.nyc>
Date: Fri, 28 Jun 2019 22:37:59 -0400
Subject: Refactor ImageCache::find_image_or_metadata API.

---
 components/script/dom/htmlcanvaselement.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'components/script/dom/htmlcanvaselement.rs')

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,
         }
     }
 }
-- 
cgit v1.2.3