mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Use the origin of the actual image response when determining if a canvas is origin clean.
This commit is contained in:
parent
d855c929ef
commit
5acee23f5d
22 changed files with 79 additions and 92 deletions
|
@ -183,7 +183,7 @@ impl<'a> LayoutContext<'a> {
|
|||
}
|
||||
|
||||
match self.get_or_request_image_or_meta(node, url.clone(), use_placeholder) {
|
||||
Some(ImageOrMetadataAvailable::ImageAvailable(image)) => {
|
||||
Some(ImageOrMetadataAvailable::ImageAvailable(image, _)) => {
|
||||
let image_info = WebRenderImageInfo::from_image(&*image);
|
||||
if image_info.key.is_none() {
|
||||
Some(image_info)
|
||||
|
|
|
@ -378,7 +378,7 @@ impl ImageFragmentInfo {
|
|||
});
|
||||
|
||||
let (image, metadata) = match image_or_metadata {
|
||||
Some(ImageOrMetadataAvailable::ImageAvailable(i)) => {
|
||||
Some(ImageOrMetadataAvailable::ImageAvailable(i, _)) => {
|
||||
(Some(i.clone()), Some(ImageMetadata { height: i.height, width: i.width } ))
|
||||
}
|
||||
Some(ImageOrMetadataAvailable::MetadataAvailable(m)) => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue