Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the paint worklet's base URL for the 2d canvas' origin checks.

Browse source
This commit is contained in:
Josh Matthews 2019-10-01 17:54:43 -04:00
parent 81a67aed9e
commit 583536c940
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -24,6 +24,7 @@ use crate::dom::globalscope::GlobalScope;
use crate::dom::htmlcanvaselement::{CanvasContext, HTMLCanvasElement}; use crate::dom::htmlcanvaselement::{CanvasContext, HTMLCanvasElement};
use crate::dom::imagedata::ImageData; use crate::dom::imagedata::ImageData;
use crate::dom::node::{Node, NodeDamage}; use crate::dom::node::{Node, NodeDamage};
use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope;
use crate::dom::textmetrics::TextMetrics; use crate::dom::textmetrics::TextMetrics;
use crate::unpremultiplytable::UNPREMULTIPLY_TABLE; use crate::unpremultiplytable::UNPREMULTIPLY_TABLE;
use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg}; use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg};
@ -144,6 +145,14 @@ impl CanvasState {
.unwrap(); .unwrap();
let (ipc_renderer, canvas_id) = receiver.recv().unwrap(); let (ipc_renderer, canvas_id) = receiver.recv().unwrap();
debug!("Done."); debug!("Done.");
// Worklets always receive a unique origin. This messes with fetching
// cached images in the case of paint worklets, since the image cache
// is keyed on the origin requesting the image data.
let origin = if global.is::<PaintWorkletGlobalScope>() {
global.api_base_url().origin()
} else {
global.origin().immutable().clone()
};
CanvasState { CanvasState {
ipc_renderer: ipc_renderer, ipc_renderer: ipc_renderer,
canvas_id: canvas_id, canvas_id: canvas_id,
@ -153,7 +162,7 @@ impl CanvasState {
base_url: global.api_base_url(), base_url: global.api_base_url(),
missing_image_urls: DomRefCell::new(Vec::new()), missing_image_urls: DomRefCell::new(Vec::new()),
saved_states: DomRefCell::new(Vec::new()), saved_states: DomRefCell::new(Vec::new()),
origin: global.origin().immutable().clone(), origin,
} }
} }