aboutsummaryrefslogtreecommitdiffstats
path: root/components/shared/net/image_cache.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/shared/net/image_cache.rs')
-rw-r--r--components/shared/net/image_cache.rs18
1 files changed, 4 insertions, 14 deletions
diff --git a/components/shared/net/image_cache.rs b/components/shared/net/image_cache.rs
index d1087bace63..317fd1b66ef 100644
--- a/components/shared/net/image_cache.rs
+++ b/components/shared/net/image_cache.rs
@@ -7,12 +7,13 @@ use std::sync::Arc;
use ipc_channel::ipc::IpcSender;
use log::debug;
use malloc_size_of_derive::MallocSizeOf;
+use pixels::{Image, ImageMetadata};
use serde::{Deserialize, Serialize};
use servo_url::{ImmutableOrigin, ServoUrl};
+use webrender_traits::WebRenderNetApi;
-use crate::image::base::{Image, ImageMetadata};
use crate::request::CorsSettings;
-use crate::{FetchResponseMsg, WebrenderIpcSender};
+use crate::FetchResponseMsg;
// ======================================================================
// Aux structs and enums.
@@ -98,7 +99,7 @@ pub enum ImageCacheResult {
}
pub trait ImageCache: Sync + Send {
- fn new(webrender_api: WebrenderIpcSender) -> Self
+ fn new(webrender_api: WebRenderNetApi) -> Self
where
Self: Sized;
@@ -140,14 +141,3 @@ pub trait ImageCache: Sync + Send {
/// Inform the image cache about a response for a pending request.
fn notify_pending_response(&self, id: PendingImageId, action: FetchResponseMsg);
}
-
-/// Whether this response passed any CORS checks, and is thus safe to read from
-/// in cross-origin environments.
-#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
-pub enum CorsStatus {
- /// The response is either same-origin or cross-origin but passed CORS checks.
- Safe,
- /// The response is cross-origin and did not pass CORS checks. It is unsafe
- /// to expose pixel data to the requesting environment.
- Unsafe,
-}