mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Avoid dropping image requests on the ground from non-script-initiated reflow.
This commit is contained in:
parent
541ecbfe21
commit
980eb5ac33
6 changed files with 96 additions and 47 deletions
|
@ -343,9 +343,10 @@ pub mod utils {
|
|||
|
||||
pub fn request_image_from_cache(window: &Window, url: ServoUrl) -> ImageResponse {
|
||||
let image_cache = window.image_cache_thread();
|
||||
//XXXjdm add a image cache mode that doesn't store anything for NotRequested?
|
||||
let response =
|
||||
image_cache.find_image_or_metadata(url.into(), UsePlaceholder::No);
|
||||
image_cache.find_image_or_metadata(url.into(),
|
||||
UsePlaceholder::No,
|
||||
CanRequestImages::No);
|
||||
match response {
|
||||
Ok(ImageOrMetadataAvailable::ImageAvailable(image)) =>
|
||||
ImageResponse::Loaded(image),
|
||||
|
|
|
@ -39,7 +39,7 @@ use ipc_channel::router::ROUTER;
|
|||
use net_traits::{FetchResponseListener, FetchMetadata, Metadata, NetworkError};
|
||||
use net_traits::image::base::{Image, ImageMetadata};
|
||||
use net_traits::image_cache_thread::{ImageResponder, ImageResponse, PendingImageId, ImageState};
|
||||
use net_traits::image_cache_thread::{UsePlaceholder, ImageOrMetadataAvailable};
|
||||
use net_traits::image_cache_thread::{UsePlaceholder, ImageOrMetadataAvailable, CanRequestImages};
|
||||
use net_traits::request::{RequestInit, Type as RequestType};
|
||||
use network_listener::{NetworkListener, PreInvoke};
|
||||
use num_traits::ToPrimitive;
|
||||
|
@ -293,7 +293,9 @@ impl HTMLImageElement {
|
|||
|
||||
let image_cache = window.image_cache_thread();
|
||||
let response =
|
||||
image_cache.find_image_or_metadata(img_url_cloned.into(), UsePlaceholder::Yes);
|
||||
image_cache.find_image_or_metadata(img_url_cloned.into(),
|
||||
UsePlaceholder::Yes,
|
||||
CanRequestImages::Yes);
|
||||
match response {
|
||||
Ok(ImageOrMetadataAvailable::ImageAvailable(image)) => {
|
||||
let event = box ImageResponseHandlerRunnable::new(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue