diff options
257 files changed, 1754 insertions, 1767 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 0639e70549a..2a26a1c5752 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -23,7 +23,7 @@ use crate::dom::element::Element; use crate::dom::globalscope::GlobalScope; use crate::dom::htmlcanvaselement::{CanvasContext, HTMLCanvasElement}; use crate::dom::imagedata::ImageData; -use crate::dom::node::{window_from_node, Node, NodeDamage}; +use crate::dom::node::{Node, NodeDamage}; use crate::unpremultiplytable::UNPREMULTIPLY_TABLE; use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg}; use canvas_traits::canvas::{CompositionOrBlending, FillOrStrokeStyle, FillRule}; @@ -65,16 +65,6 @@ pub struct CanvasRenderingContext2D { /// For rendering contexts created by an HTML canvas element, this is Some, /// for ones created by a paint worklet, this is None. canvas: Option<Dom<HTMLCanvasElement>>, - #[ignore_malloc_size_of = "Arc"] - image_cache: Arc<ImageCache>, - /// Any missing image URLs. - missing_image_urls: DomRefCell<Vec<ServoUrl>>, - /// The base URL for resolving CSS image URL values. - /// Needed because of https://github.com/servo/servo/issues/17625 - base_url: ServoUrl, - state: DomRefCell<CanvasContextState>, - saved_states: DomRefCell<Vec<CanvasContextState>>, - origin_clean: Cell<bool>, canvas_state: DomRefCell<CanvasState>, } @@ -119,11 +109,22 @@ impl CanvasContextState { } } +#[must_root] #[derive(JSTraceable, MallocSizeOf)] pub struct CanvasState { #[ignore_malloc_size_of = "Defined in ipc-channel"] ipc_renderer: IpcSender<CanvasMsg>, canvas_id: CanvasId, + state: DomRefCell<CanvasContextState>, + origin_clean: Cell<bool>, + #[ignore_malloc_size_of = "Arc"] + image_cache: Arc<dyn ImageCache>, + /// The base URL for resolving CSS image URL values. + /// Needed because of https://github.com/servo/servo/issues/17625 + base_url: ServoUrl, + /// Any missing image URLs. + missing_image_urls: DomRefCell<Vec<ServoUrl>>, + saved_states: DomRefCell<Vec<CanvasContextState>>, } impl CanvasState { @@ -141,6 +142,12 @@ impl CanvasState { CanvasState { ipc_renderer: ipc_renderer, canvas_id: canvas_id, + state: DomRefCell::new(CanvasContextState::new()), + origin_clean: Cell::new(true), + image_cache: global.image_cache(), + base_url: global.api_base_url(), + missing_image_urls: DomRefCell::new(Vec::new()), + saved_states: DomRefCell::new(Vec::new()), } } @@ -169,172 +176,122 @@ impl CanvasState { )) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect - pub fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { - if let Some(rect) = self.create_drawable_rect(x, y, width, height) { - self.send_canvas_2d_msg(Canvas2dMsg::FillRect(rect)); - } - } - - // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect - pub fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { - if let Some(rect) = self.create_drawable_rect(x, y, width, height) { - self.send_canvas_2d_msg(Canvas2dMsg::ClearRect(rect)); - } + fn origin_is_clean(&self) -> bool { + self.origin_clean.get() } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect - pub fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { - if let Some(rect) = self.create_drawable_rect(x, y, width, height) { - self.send_canvas_2d_msg(Canvas2dMsg::StrokeRect(rect)); - } + fn set_origin_unclean(&self) { + self.origin_clean.set(false) } -} -impl CanvasRenderingContext2D { - pub fn new_inherited( - global: &GlobalScope, - canvas: Option<&HTMLCanvasElement>, - image_cache: Arc<dyn ImageCache>, - base_url: ServoUrl, - size: Size2D<u32>, - ) -> CanvasRenderingContext2D { - CanvasRenderingContext2D { - reflector_: Reflector::new(), - canvas: canvas.map(Dom::from_ref), - image_cache: image_cache, - missing_image_urls: DomRefCell::new(Vec::new()), - base_url: base_url, - state: DomRefCell::new(CanvasContextState::new()), - saved_states: DomRefCell::new(Vec::new()), - origin_clean: Cell::new(true), - canvas_state: DomRefCell::new(CanvasState::new( - global, - Size2D::new(size.width as u64, size.height as u64), - )), + // https://html.spec.whatwg.org/multipage/#the-image-argument-is-not-origin-clean + fn is_origin_clean(&self, image: CanvasImageSource) -> bool { + match image { + CanvasImageSource::HTMLCanvasElement(canvas) => canvas.origin_is_clean(), + CanvasImageSource::HTMLImageElement(image) => { + image.same_origin(GlobalScope::entry().origin()) + }, + CanvasImageSource::CSSStyleValue(_) => true, } } - pub fn new( - global: &GlobalScope, - canvas: &HTMLCanvasElement, - size: Size2D<u32>, - ) -> DomRoot<CanvasRenderingContext2D> { - let window = window_from_node(canvas); - let image_cache = window.image_cache(); - let base_url = window.get_url(); - let boxed = Box::new(CanvasRenderingContext2D::new_inherited( - global, - Some(canvas), - image_cache, - base_url, - size, - )); - reflect_dom_object(boxed, global, CanvasRenderingContext2DBinding::Wrap) - } + fn fetch_image_data(&self, url: ServoUrl) -> Option<(Vec<u8>, Size2D<u32>)> { + let img = match self.request_image_from_cache(url) { + ImageResponse::Loaded(img, _) => img, + ImageResponse::PlaceholderLoaded(_, _) | + ImageResponse::None | + ImageResponse::MetadataLoaded(_) => { + return None; + }, + }; - // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions - pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) { - self.reset_to_initial_state(); - self.canvas_state - .borrow() - .ipc_renderer - .send(CanvasMsg::Recreate( - size, - self.canvas_state.borrow().get_canvas_id(), - )) - .unwrap(); - } + let image_size = Size2D::new(img.width, img.height); + let image_data = match img.format { + PixelFormat::BGRA8 => img.bytes.to_vec(), + pixel_format => unimplemented!("unsupported pixel format ({:?})", pixel_format), + }; - // https://html.spec.whatwg.org/multipage/#reset-the-rendering-context-to-its-default-state - fn reset_to_initial_state(&self) { - self.saved_states.borrow_mut().clear(); - *self.state.borrow_mut() = CanvasContextState::new(); + Some((image_data, image_size)) } - fn mark_as_dirty(&self) { - if let Some(ref canvas) = self.canvas { - canvas.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage); + #[inline] + fn request_image_from_cache(&self, url: ServoUrl) -> ImageResponse { + let response = self.image_cache.find_image_or_metadata( + url.clone(), + UsePlaceholder::No, + CanRequestImages::No, + ); + match response { + Ok(ImageOrMetadataAvailable::ImageAvailable(image, url)) => { + ImageResponse::Loaded(image, url) + }, + Err(ImageState::Pending(_)) => ImageResponse::None, + _ => { + // Rather annoyingly, we get the same response back from + // A load which really failed and from a load which hasn't started yet. + self.missing_image_urls.borrow_mut().push(url); + ImageResponse::None + }, } } - fn update_transform(&self) { - self.send_canvas_2d_msg(Canvas2dMsg::SetTransform(self.state.borrow().transform)) - } - - // It is used by DrawImage to calculate the size of the source and destination rectangles based - // on the drawImage call arguments - // source rectangle = area of the original image to be copied - // destination rectangle = area of the destination canvas where the source image is going to be drawn - fn adjust_source_dest_rects( - &self, - image_size: Size2D<f64>, - sx: f64, - sy: f64, - sw: f64, - sh: f64, - dx: f64, - dy: f64, - dw: f64, - dh: f64, - ) -> (Rect<f64>, Rect<f64>) { - let image_rect = Rect::new( - Point2D::new(0f64, 0f64), - Size2D::new(image_size.width as f64, image_size.height as f64), - ); - - // The source rectangle is the rectangle whose corners are the four points (sx, sy), - // (sx+sw, sy), (sx+sw, sy+sh), (sx, sy+sh). - let source_rect = Rect::new( - Point2D::new(sx.min(sx + sw), sy.min(sy + sh)), - Size2D::new(sw.abs(), sh.abs()), - ); + fn parse_color(&self, canvas: Option<&HTMLCanvasElement>, string: &str) -> Result<RGBA, ()> { + let mut input = ParserInput::new(string); + let mut parser = Parser::new(&mut input); + let color = CSSColor::parse(&mut parser); + if parser.is_exhausted() { + match color { + Ok(CSSColor::RGBA(rgba)) => Ok(rgba), + Ok(CSSColor::CurrentColor) => { + // TODO: https://github.com/whatwg/html/issues/1099 + // Reconsider how to calculate currentColor in a display:none canvas - // When the source rectangle is outside the source image, - // the source rectangle must be clipped to the source image - let source_rect_clipped = source_rect - .intersection(&image_rect) - .unwrap_or(Rect::zero()); + // TODO: will need to check that the context bitmap mode is fixed + // once we implement CanvasProxy + let canvas = match canvas { + // https://drafts.css-houdini.org/css-paint-api/#2d-rendering-context + // Whenever "currentColor" is used as a color in the PaintRenderingContext2D API, + // it is treated as opaque black. + None => return Ok(RGBA::new(0, 0, 0, 255)), + Some(ref canvas) => &**canvas, + }; - // Width and height ratios between the non clipped and clipped source rectangles - let width_ratio: f64 = source_rect_clipped.size.width / source_rect.size.width; - let height_ratio: f64 = source_rect_clipped.size.height / source_rect.size.height; + let canvas_element = canvas.upcast::<Element>(); - // When the source rectangle is outside the source image, - // the destination rectangle must be clipped in the same proportion. - let dest_rect_width_scaled: f64 = dw * width_ratio; - let dest_rect_height_scaled: f64 = dh * height_ratio; + match canvas_element.style() { + Some(ref s) if canvas_element.has_css_layout_box() => { + Ok(s.get_color().color) + }, + _ => Ok(RGBA::new(0, 0, 0, 255)), + } + }, + _ => Err(()), + } + } else { + Err(()) + } + } - // The destination rectangle is the rectangle whose corners are the four points (dx, dy), - // (dx+dw, dy), (dx+dw, dy+dh), (dx, dy+dh). - let dest_rect = Rect::new( - Point2D::new( - dx.min(dx + dest_rect_width_scaled), - dy.min(dy + dest_rect_height_scaled), - ), - Size2D::new(dest_rect_width_scaled.abs(), dest_rect_height_scaled.abs()), - ); + pub fn get_rect(&self, canvas: Option<&HTMLCanvasElement>, rect: Rect<u32>) -> Vec<u8> { + assert!(self.origin_is_clean()); - let source_rect = Rect::new( - Point2D::new(source_rect_clipped.origin.x, source_rect_clipped.origin.y), - Size2D::new( - source_rect_clipped.size.width, - source_rect_clipped.size.height, - ), - ); + // FIXME(nox): This is probably wrong when this is a context for an + // offscreen canvas. + let canvas_size = canvas.as_ref().map_or(Size2D::zero(), |c| c.get_size()); + assert!(Rect::from_size(canvas_size).contains_rect(&rect)); - (source_rect, dest_rect) - } + let (sender, receiver) = ipc::bytes_channel().unwrap(); + self.send_canvas_2d_msg(Canvas2dMsg::GetImageData(rect, canvas_size, sender)); + let mut pixels = receiver.recv().unwrap().to_vec(); - // https://html.spec.whatwg.org/multipage/#the-image-argument-is-not-origin-clean - fn is_origin_clean(&self, image: CanvasImageSource) -> bool { - match image { - CanvasImageSource::HTMLCanvasElement(canvas) => canvas.origin_is_clean(), - CanvasImageSource::HTMLImageElement(image) => { - image.same_origin(GlobalScope::entry().origin()) - }, - CanvasImageSource::CSSStyleValue(_) => true, + for chunk in pixels.chunks_mut(4) { + let b = chunk[0]; + chunk[0] = UNPREMULTIPLY_TABLE[256 * (chunk[3] as usize) + chunk[2] as usize]; + chunk[1] = UNPREMULTIPLY_TABLE[256 * (chunk[3] as usize) + chunk[1] as usize]; + chunk[2] = UNPREMULTIPLY_TABLE[256 * (chunk[3] as usize) + b as usize]; } + + pixels } // @@ -360,6 +317,7 @@ impl CanvasRenderingContext2D { // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage fn draw_image( &self, + htmlcanvas: Option<&HTMLCanvasElement>, image: CanvasImageSource, sx: f64, sy: f64, @@ -372,20 +330,20 @@ impl CanvasRenderingContext2D { ) -> ErrorResult { let result = match image { CanvasImageSource::HTMLCanvasElement(ref canvas) => { - self.draw_html_canvas_element(&canvas, sx, sy, sw, sh, dx, dy, dw, dh) + self.draw_html_canvas_element(&canvas, htmlcanvas, sx, sy, sw, sh, dx, dy, dw, dh) }, CanvasImageSource::HTMLImageElement(ref image) => { // https://html.spec.whatwg.org/multipage/#img-error // If the image argument is an HTMLImageElement object that is in the broken state, // then throw an InvalidStateError exception let url = image.get_url().ok_or(Error::InvalidState)?; - self.fetch_and_draw_image_data(url, sx, sy, sw, sh, dx, dy, dw, dh) + self.fetch_and_draw_image_data(htmlcanvas, url, sx, sy, sw, sh, dx, dy, dw, dh) }, CanvasImageSource::CSSStyleValue(ref value) => { let url = value .get_url(self.base_url.clone()) .ok_or(Error::InvalidState)?; - self.fetch_and_draw_image_data(url, sx, sy, sw, sh, dx, dy, dw, dh) + self.fetch_and_draw_image_data(htmlcanvas, url, sx, sy, sw, sh, dx, dy, dw, dh) }, }; @@ -398,6 +356,7 @@ impl CanvasRenderingContext2D { fn draw_html_canvas_element( &self, canvas: &HTMLCanvasElement, + htmlcanvas: Option<&HTMLCanvasElement>, sx: f64, sy: f64, sw: Option<f64>, @@ -433,7 +392,7 @@ impl CanvasRenderingContext2D { match *context { CanvasContext::Context2d(ref context) => { context.send_canvas_2d_msg(Canvas2dMsg::DrawImageInOther( - self.canvas_state.borrow().get_canvas_id(), + self.get_canvas_id(), image_size, dest_rect, source_rect, @@ -452,12 +411,13 @@ impl CanvasRenderingContext2D { )); } - self.mark_as_dirty(); + self.mark_as_dirty(htmlcanvas); Ok(()) } fn fetch_and_draw_image_data( &self, + canvas: Option<&HTMLCanvasElement>, url: ServoUrl, sx: f64, sy: f64, @@ -494,182 +454,359 @@ impl CanvasRenderingContext2D { source_rect, smoothing_enabled, )); - self.mark_as_dirty(); + self.mark_as_dirty(canvas); Ok(()) } - fn fetch_image_data(&self, url: ServoUrl) -> Option<(Vec<u8>, Size2D<u32>)> { - let img = match self.request_image_from_cache(url) { - ImageResponse::Loaded(img, _) => img, - ImageResponse::PlaceholderLoaded(_, _) | - ImageResponse::None | - ImageResponse::MetadataLoaded(_) => { - return None; - }, - }; + fn mark_as_dirty(&self, canvas: Option<&HTMLCanvasElement>) { + if let Some(ref canvas) = canvas { + canvas.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage); + } + } - let image_size = Size2D::new(img.width, img.height); - let image_data = match img.format { - PixelFormat::BGRA8 => img.bytes.to_vec(), - pixel_format => unimplemented!("unsupported pixel format ({:?})", pixel_format), - }; + // It is used by DrawImage to calculate the size of the source and destination rectangles based + // on the drawImage call arguments + // source rectangle = area of the original image to be copied + // destination rectangle = area of the destination canvas where the source image is going to be drawn + fn adjust_source_dest_rects( + &self, + image_size: Size2D<f64>, + sx: f64, + sy: f64, + sw: f64, + sh: f64, + dx: f64, + dy: f64, + dw: f64, + dh: f64, + ) -> (Rect<f64>, Rect<f64>) { + let image_rect = Rect::new( + Point2D::new(0f64, 0f64), + Size2D::new(image_size.width as f64, image_size.height as f64), + ); - Some((image_data, image_size)) - } + // The source rectangle is the rectangle whose corners are the four points (sx, sy), + // (sx+sw, sy), (sx+sw, sy+sh), (sx, sy+sh). + let source_rect = Rect::new( + Point2D::new(sx.min(sx + sw), sy.min(sy + sh)), + Size2D::new(sw.abs(), sh.abs()), + ); - #[inline] - fn request_image_from_cache(&self, url: ServoUrl) -> ImageResponse { - let response = self.image_cache.find_image_or_metadata( - url.clone(), - UsePlaceholder::No, - CanRequestImages::No, + // When the source rectangle is outside the source image, + // the source rectangle must be clipped to the source image + let source_rect_clipped = source_rect + .intersection(&image_rect) + .unwrap_or(Rect::zero()); + + // Width and height ratios between the non clipped and clipped source rectangles + let width_ratio: f64 = source_rect_clipped.size.width / source_rect.size.width; + let height_ratio: f64 = source_rect_clipped.size.height / source_rect.size.height; + + // When the source rectangle is outside the source image, + // the destination rectangle must be clipped in the same proportion. + let dest_rect_width_scaled: f64 = dw * width_ratio; + let dest_rect_height_scaled: f64 = dh * height_ratio; + + // The destination rectangle is the rectangle whose corners are the four points (dx, dy), + // (dx+dw, dy), (dx+dw, dy+dh), (dx, dy+dh). + let dest_rect = Rect::new( + Point2D::new( + dx.min(dx + dest_rect_width_scaled), + dy.min(dy + dest_rect_height_scaled), + ), + Size2D::new(dest_rect_width_scaled.abs(), dest_rect_height_scaled.abs()), ); - match response { - Ok(ImageOrMetadataAvailable::ImageAvailable(image, url)) => { - ImageResponse::Loaded(image, url) - }, - Err(ImageState::Pending(_)) => ImageResponse::None, - _ => { - // Rather annoyingly, we get the same response back from - // A load which really failed and from a load which hasn't started yet. - self.missing_image_urls.borrow_mut().push(url); - ImageResponse::None - }, - } - } - pub fn take_missing_image_urls(&self) -> Vec<ServoUrl> { - mem::replace(&mut self.missing_image_urls.borrow_mut(), vec![]) + let source_rect = Rect::new( + Point2D::new(source_rect_clipped.origin.x, source_rect_clipped.origin.y), + Size2D::new( + source_rect_clipped.size.width, + source_rect_clipped.size.height, + ), + ); + + (source_rect, dest_rect) } - fn parse_color(&self, string: &str) -> Result<RGBA, ()> { - let mut input = ParserInput::new(string); - let mut parser = Parser::new(&mut input); - let color = CSSColor::parse(&mut parser); - if parser.is_exhausted() { - match color { - Ok(CSSColor::RGBA(rgba)) => Ok(rgba), - Ok(CSSColor::CurrentColor) => { - // TODO: https://github.com/whatwg/html/issues/1099 - // Reconsider how to calculate currentColor in a display:none canvas + fn update_transform(&self) { + self.send_canvas_2d_msg(Canvas2dMsg::SetTransform(self.state.borrow().transform)) + } - // TODO: will need to check that the context bitmap mode is fixed - // once we implement CanvasProxy - let canvas = match self.canvas { - // https://drafts.css-houdini.org/css-paint-api/#2d-rendering-context - // Whenever "currentColor" is used as a color in the PaintRenderingContext2D API, - // it is treated as opaque black. - None => return Ok(RGBA::new(0, 0, 0, 255)), - Some(ref canvas) => &**canvas, - }; + // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect + pub fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { + if let Some(rect) = self.create_drawable_rect(x, y, width, height) { + self.send_canvas_2d_msg(Canvas2dMsg::FillRect(rect)); + } + } - let canvas_element = canvas.upcast::<Element>(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect + pub fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { + if let Some(rect) = self.create_drawable_rect(x, y, width, height) { + self.send_canvas_2d_msg(Canvas2dMsg::ClearRect(rect)); + } + } - match canvas_element.style() { - Some(ref s) if canvas_element.has_css_layout_box() => { - Ok(s.get_color().color) - }, - _ => Ok(RGBA::new(0, 0, 0, 255)), - } - }, - _ => Err(()), - } - } else { - Err(()) + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect + pub fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { + if let Some(rect) = self.create_drawable_rect(x, y, width, height) { + self.send_canvas_2d_msg(Canvas2dMsg::StrokeRect(rect)); } } - pub fn get_canvas_id(&self) -> CanvasId { - self.canvas_state.borrow().get_canvas_id() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx + pub fn ShadowOffsetX(&self) -> f64 { + self.state.borrow().shadow_offset_x } - pub fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) { - self.canvas_state.borrow().send_canvas_2d_msg(msg) + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx + pub fn SetShadowOffsetX(&self, value: f64) { + if !value.is_finite() || value == self.state.borrow().shadow_offset_x { + return; + } + self.state.borrow_mut().shadow_offset_x = value; + self.send_canvas_2d_msg(Canvas2dMsg::SetShadowOffsetX(value)) } - pub fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> { - self.canvas_state.borrow().ipc_renderer.clone() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety + pub fn ShadowOffsetY(&self) -> f64 { + self.state.borrow().shadow_offset_y } - pub fn origin_is_clean(&self) -> bool { - self.origin_clean.get() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety + pub fn SetShadowOffsetY(&self, value: f64) { + if !value.is_finite() || value == self.state.borrow().shadow_offset_y { + return; + } + self.state.borrow_mut().shadow_offset_y = value; + self.send_canvas_2d_msg(Canvas2dMsg::SetShadowOffsetY(value)) } - fn set_origin_unclean(&self) { - self.origin_clean.set(false) + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur + pub fn ShadowBlur(&self) -> f64 { + self.state.borrow().shadow_blur } - pub fn get_rect(&self, rect: Rect<u32>) -> Vec<u8> { - assert!(self.origin_is_clean()); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur + pub fn SetShadowBlur(&self, value: f64) { + if !value.is_finite() || value < 0f64 || value == self.state.borrow().shadow_blur { + return; + } + self.state.borrow_mut().shadow_blur = value; + self.send_canvas_2d_msg(Canvas2dMsg::SetShadowBlur(value)) + } - // FIXME(nox): This is probably wrong when this is a context for an - // offscreen canvas. - let canvas_size = self - .canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size()); - assert!(Rect::from_size(canvas_size).contains_rect(&rect)); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor + pub fn ShadowColor(&self) -> DOMString { + let mut result = String::new(); + serialize(&self.state.borrow().shadow_color, &mut result).unwrap(); + DOMString::from(result) + } - let (sender, receiver) = ipc::bytes_channel().unwrap(); - self.send_canvas_2d_msg(Canvas2dMsg::GetImageData(rect, canvas_size, sender)); - let mut pixels = receiver.recv().unwrap().to_vec(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor + pub fn SetShadowColor(&self, value: DOMString) { + if let Ok(color) = parse_color(&value) { + self.state.borrow_mut().shadow_color = color; + self.send_canvas_2d_msg(Canvas2dMsg::SetShadowColor(color)) + } + } - for chunk in pixels.chunks_mut(4) { - let b = chunk[0]; - chunk[0] = UNPREMULTIPLY_TABLE[256 * (chunk[3] as usize) + chunk[2] as usize]; - chunk[1] = UNPREMULTIPLY_TABLE[256 * (chunk[3] as usize) + chunk[1] as usize]; - chunk[2] = UNPREMULTIPLY_TABLE[256 * (chunk[3] as usize) + b as usize]; + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + pub fn StrokeStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { + match self.state.borrow().stroke_style { + CanvasFillOrStrokeStyle::Color(ref rgba) => { + let mut result = String::new(); + serialize(rgba, &mut result).unwrap(); + StringOrCanvasGradientOrCanvasPattern::String(DOMString::from(result)) + }, + CanvasFillOrStrokeStyle::Gradient(ref gradient) => { + StringOrCanvasGradientOrCanvasPattern::CanvasGradient(DomRoot::from_ref(&*gradient)) + }, + CanvasFillOrStrokeStyle::Pattern(ref pattern) => { + StringOrCanvasGradientOrCanvasPattern::CanvasPattern(DomRoot::from_ref(&*pattern)) + }, } + } - pixels + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + pub fn SetStrokeStyle( + &self, + canvas: Option<&HTMLCanvasElement>, + value: StringOrCanvasGradientOrCanvasPattern, + ) { + match value { + StringOrCanvasGradientOrCanvasPattern::String(string) => { + if let Ok(rgba) = self.parse_color(canvas, &string) { + self.state.borrow_mut().stroke_style = CanvasFillOrStrokeStyle::Color(rgba); + self.send_canvas_2d_msg(Canvas2dMsg::SetStrokeStyle(FillOrStrokeStyle::Color( + rgba, + ))); + } + }, + StringOrCanvasGradientOrCanvasPattern::CanvasGradient(gradient) => { + self.state.borrow_mut().stroke_style = + CanvasFillOrStrokeStyle::Gradient(Dom::from_ref(&*gradient)); + self.send_canvas_2d_msg(Canvas2dMsg::SetStrokeStyle( + gradient.to_fill_or_stroke_style(), + )); + }, + StringOrCanvasGradientOrCanvasPattern::CanvasPattern(pattern) => { + self.state.borrow_mut().stroke_style = + CanvasFillOrStrokeStyle::Pattern(Dom::from_ref(&*pattern)); + self.send_canvas_2d_msg(Canvas2dMsg::SetStrokeStyle( + pattern.to_fill_or_stroke_style(), + )); + if !pattern.origin_is_clean() { + self.set_origin_unclean(); + } + }, + } } -} -pub trait LayoutCanvasRenderingContext2DHelpers { - #[allow(unsafe_code)] - unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg>; - #[allow(unsafe_code)] - unsafe fn get_canvas_id(&self) -> CanvasId; -} + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + pub fn FillStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { + match self.state.borrow().fill_style { + CanvasFillOrStrokeStyle::Color(ref rgba) => { + let mut result = String::new(); + serialize(rgba, &mut result).unwrap(); + StringOrCanvasGradientOrCanvasPattern::String(DOMString::from(result)) + }, + CanvasFillOrStrokeStyle::Gradient(ref gradient) => { + StringOrCanvasGradientOrCanvasPattern::CanvasGradient(DomRoot::from_ref(&*gradient)) + }, + CanvasFillOrStrokeStyle::Pattern(ref pattern) => { + StringOrCanvasGradientOrCanvasPattern::CanvasPattern(DomRoot::from_ref(&*pattern)) + }, + } + } -impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> { - #[allow(unsafe_code)] - unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> { - (*self.unsafe_get()) - .canvas_state - .borrow_for_layout() - .ipc_renderer - .clone() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + pub fn SetFillStyle( + &self, + canvas: Option<&HTMLCanvasElement>, + value: StringOrCanvasGradientOrCanvasPattern, + ) { + match value { + StringOrCanvasGradientOrCanvasPattern::String(string) => { + if let Ok(rgba) = self.parse_color(canvas, &string) { + self.state.borrow_mut().fill_style = CanvasFillOrStrokeStyle::Color(rgba); + self.send_canvas_2d_msg(Canvas2dMsg::SetFillStyle(FillOrStrokeStyle::Color( + rgba, + ))) + } + }, + StringOrCanvasGradientOrCanvasPattern::CanvasGradient(gradient) => { + self.state.borrow_mut().fill_style = + CanvasFillOrStrokeStyle::Gradient(Dom::from_ref(&*gradient)); + self.send_canvas_2d_msg(Canvas2dMsg::SetFillStyle( + gradient.to_fill_or_stroke_style(), + )); + }, + StringOrCanvasGradientOrCanvasPattern::CanvasPattern(pattern) => { + self.state.borrow_mut().fill_style = + CanvasFillOrStrokeStyle::Pattern(Dom::from_ref(&*pattern)); + self.send_canvas_2d_msg(Canvas2dMsg::SetFillStyle( + pattern.to_fill_or_stroke_style(), + )); + if !pattern.origin_is_clean() { + self.set_origin_unclean(); + } + }, + } } - #[allow(unsafe_code)] - unsafe fn get_canvas_id(&self) -> CanvasId { - (*self.unsafe_get()) - .canvas_state - .borrow_for_layout() - .get_canvas_id() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createlineargradient + pub fn CreateLinearGradient( + &self, + global: &GlobalScope, + x0: Finite<f64>, + y0: Finite<f64>, + x1: Finite<f64>, + y1: Finite<f64>, + ) -> DomRoot<CanvasGradient> { + CanvasGradient::new( + global, + CanvasGradientStyle::Linear(LinearGradientStyle::new(*x0, *y0, *x1, *y1, Vec::new())), + ) } -} -// We add a guard to each of methods by the spec: -// http://www.w3.org/html/wg/drafts/2dcontext/html5_canvas_CR/ -// -// > Except where otherwise specified, for the 2D context interface, -// > any method call with a numeric argument whose value is infinite or a NaN value must be ignored. -// -// Restricted values are guarded in glue code. Therefore we need not add a guard. -// -// FIXME: this behavior should might be generated by some annotattions to idl. -impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { - // https://html.spec.whatwg.org/multipage/#dom-context-2d-canvas - fn Canvas(&self) -> DomRoot<HTMLCanvasElement> { - // This method is not called from a paint worklet rendering context, - // so it's OK to panic if self.canvas is None. - DomRoot::from_ref(self.canvas.as_ref().expect("No canvas.")) + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createradialgradient + pub fn CreateRadialGradient( + &self, + global: &GlobalScope, + x0: Finite<f64>, + y0: Finite<f64>, + r0: Finite<f64>, + x1: Finite<f64>, + y1: Finite<f64>, + r1: Finite<f64>, + ) -> Fallible<DomRoot<CanvasGradient>> { + if *r0 < 0. || *r1 < 0. { + return Err(Error::IndexSize); + } + + Ok(CanvasGradient::new( + global, + CanvasGradientStyle::Radial(RadialGradientStyle::new( + *x0, + *y0, + *r0, + *x1, + *y1, + *r1, + Vec::new(), + )), + )) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern + pub fn CreatePattern( + &self, + global: &GlobalScope, + image: CanvasImageSource, + mut repetition: DOMString, + ) -> Fallible<DomRoot<CanvasPattern>> { + let (image_data, image_size) = match image { + CanvasImageSource::HTMLImageElement(ref image) => { + // https://html.spec.whatwg.org/multipage/#img-error + // If the image argument is an HTMLImageElement object that is in the broken state, + // then throw an InvalidStateError exception + image + .get_url() + .and_then(|url| self.fetch_image_data(url)) + .ok_or(Error::InvalidState)? + }, + CanvasImageSource::HTMLCanvasElement(ref canvas) => { + let (data, size) = canvas.fetch_all_data().ok_or(Error::InvalidState)?; + let data = data + .map(|data| data.to_vec()) + .unwrap_or_else(|| vec![0; size.area() as usize * 4]); + (data, size) + }, + CanvasImageSource::CSSStyleValue(ref value) => value + .get_url(self.base_url.clone()) + .and_then(|url| self.fetch_image_data(url)) + .ok_or(Error::InvalidState)?, + }; + + if repetition.is_empty() { + repetition.push_str("repeat"); + } + + if let Ok(rep) = RepetitionStyle::from_str(&repetition) { + Ok(CanvasPattern::new( + global, + image_data, + image_size, + rep, + self.is_origin_clean(image), + )) + } else { + Err(Error::Syntax) + } } // https://html.spec.whatwg.org/multipage/#dom-context-2d-save - fn Save(&self) { + pub fn Save(&self) { self.saved_states .borrow_mut() .push(self.state.borrow().clone()); @@ -678,7 +815,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { #[allow(unrooted_must_root)] // https://html.spec.whatwg.org/multipage/#dom-context-2d-restore - fn Restore(&self) { + pub fn Restore(&self) { let mut saved_states = self.saved_states.borrow_mut(); if let Some(state) = saved_states.pop() { self.state.borrow_mut().clone_from(&state); @@ -686,200 +823,283 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale - fn Scale(&self, x: f64, y: f64) { - if !(x.is_finite() && y.is_finite()) { - return; - } - - let transform = self.state.borrow().transform; - self.state.borrow_mut().transform = transform.pre_scale(x as f32, y as f32); - self.update_transform() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha + pub fn GlobalAlpha(&self) -> f64 { + self.state.borrow().global_alpha } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate - fn Rotate(&self, angle: f64) { - if angle == 0.0 || !angle.is_finite() { + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha + pub fn SetGlobalAlpha(&self, alpha: f64) { + if !alpha.is_finite() || alpha > 1.0 || alpha < 0.0 { return; } - let (sin, cos) = (angle.sin(), angle.cos()); - let transform = self.state.borrow().transform; - self.state.borrow_mut().transform = transform.pre_mul(&Transform2D::row_major( - cos as f32, - sin as f32, - -sin as f32, - cos as f32, - 0.0, - 0.0, - )); - self.update_transform() + self.state.borrow_mut().global_alpha = alpha; + self.send_canvas_2d_msg(Canvas2dMsg::SetGlobalAlpha(alpha as f32)) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate - fn Translate(&self, x: f64, y: f64) { - if !(x.is_finite() && y.is_finite()) { - return; + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation + pub fn GlobalCompositeOperation(&self) -> DOMString { + match self.state.borrow().global_composition { + CompositionOrBlending::Composition(op) => DOMString::from(op.to_str()), + CompositionOrBlending::Blending(op) => DOMString::from(op.to_str()), } - - let transform = self.state.borrow().transform; - self.state.borrow_mut().transform = transform.pre_translate(vec2(x as f32, y as f32)); - self.update_transform() } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform - fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { - if !(a.is_finite() && - b.is_finite() && - c.is_finite() && - d.is_finite() && - e.is_finite() && - f.is_finite()) - { - return; + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation + pub fn SetGlobalCompositeOperation(&self, op_str: DOMString) { + if let Ok(op) = CompositionOrBlending::from_str(&op_str) { + self.state.borrow_mut().global_composition = op; + self.send_canvas_2d_msg(Canvas2dMsg::SetGlobalComposition(op)) } - - let transform = self.state.borrow().transform; - self.state.borrow_mut().transform = transform.pre_mul(&Transform2D::row_major( - a as f32, b as f32, c as f32, d as f32, e as f32, f as f32, - )); - self.update_transform() } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform - fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { - if !(a.is_finite() && - b.is_finite() && - c.is_finite() && - d.is_finite() && - e.is_finite() && - f.is_finite()) - { - return; - } + // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled + pub fn ImageSmoothingEnabled(&self) -> bool { + self.state.borrow().image_smoothing_enabled + } - self.state.borrow_mut().transform = - Transform2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32); - self.update_transform() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled + pub fn SetImageSmoothingEnabled(&self, value: bool) { + self.state.borrow_mut().image_smoothing_enabled = value; } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform - fn ResetTransform(&self) { - self.state.borrow_mut().transform = Transform2D::identity(); - self.update_transform() + // https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext + pub fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option<f64>) { + let parsed_text: String = text.into(); + self.send_canvas_2d_msg(Canvas2dMsg::FillText(parsed_text, x, y, max_width)); } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha - fn GlobalAlpha(&self) -> f64 { - let state = self.state.borrow(); - state.global_alpha + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth + pub fn LineWidth(&self) -> f64 { + self.state.borrow().line_width } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha - fn SetGlobalAlpha(&self, alpha: f64) { - if !alpha.is_finite() || alpha > 1.0 || alpha < 0.0 { + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth + pub fn SetLineWidth(&self, width: f64) { + if !width.is_finite() || width <= 0.0 { return; } - self.state.borrow_mut().global_alpha = alpha; - self.send_canvas_2d_msg(Canvas2dMsg::SetGlobalAlpha(alpha as f32)) + self.state.borrow_mut().line_width = width; + self.send_canvas_2d_msg(Canvas2dMsg::SetLineWidth(width as f32)) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation - fn GlobalCompositeOperation(&self) -> DOMString { - let state = self.state.borrow(); - match state.global_composition { - CompositionOrBlending::Composition(op) => DOMString::from(op.to_str()), - CompositionOrBlending::Blending(op) => DOMString::from(op.to_str()), + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap + pub fn LineCap(&self) -> CanvasLineCap { + match self.state.borrow().line_cap { + LineCapStyle::Butt => CanvasLineCap::Butt, + LineCapStyle::Round => CanvasLineCap::Round, + LineCapStyle::Square => CanvasLineCap::Square, } } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation - fn SetGlobalCompositeOperation(&self, op_str: DOMString) { - if let Ok(op) = CompositionOrBlending::from_str(&op_str) { - self.state.borrow_mut().global_composition = op; - self.send_canvas_2d_msg(Canvas2dMsg::SetGlobalComposition(op)) - } + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap + pub fn SetLineCap(&self, cap: CanvasLineCap) { + let line_cap = match cap { + CanvasLineCap::Butt => LineCapStyle::Butt, + CanvasLineCap::Round => LineCapStyle::Round, + CanvasLineCap::Square => LineCapStyle::Square, + }; + self.state.borrow_mut().line_cap = line_cap; + self.send_canvas_2d_msg(Canvas2dMsg::SetLineCap(line_cap)); } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect - fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.borrow().FillRect(x, y, width, height); - self.mark_as_dirty(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin + pub fn LineJoin(&self) -> CanvasLineJoin { + match self.state.borrow().line_join { + LineJoinStyle::Round => CanvasLineJoin::Round, + LineJoinStyle::Bevel => CanvasLineJoin::Bevel, + LineJoinStyle::Miter => CanvasLineJoin::Miter, + } } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect - fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.borrow().ClearRect(x, y, width, height); - self.mark_as_dirty(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin + pub fn SetLineJoin(&self, join: CanvasLineJoin) { + let line_join = match join { + CanvasLineJoin::Round => LineJoinStyle::Round, + CanvasLineJoin::Bevel => LineJoinStyle::Bevel, + CanvasLineJoin::Miter => LineJoinStyle::Miter, + }; + self.state.borrow_mut().line_join = line_join; + self.send_canvas_2d_msg(Canvas2dMsg::SetLineJoin(line_join)); } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect - fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.borrow().StrokeRect(x, y, width, height); - self.mark_as_dirty(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit + pub fn MiterLimit(&self) -> f64 { + self.state.borrow().miter_limit } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath - fn BeginPath(&self) { - self.send_canvas_2d_msg(Canvas2dMsg::BeginPath); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit + pub fn SetMiterLimit(&self, limit: f64) { + if !limit.is_finite() || limit <= 0.0 { + return; + } + + self.state.borrow_mut().miter_limit = limit; + self.send_canvas_2d_msg(Canvas2dMsg::SetMiterLimit(limit as f32)) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath - fn ClosePath(&self) { - self.send_canvas_2d_msg(Canvas2dMsg::ClosePath); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata + pub fn CreateImageData( + &self, + global: &GlobalScope, + sw: i32, + sh: i32, + ) -> Fallible<DomRoot<ImageData>> { + if sw == 0 || sh == 0 { + return Err(Error::IndexSize); + } + ImageData::new(global, sw.abs() as u32, sh.abs() as u32, None) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill - fn Fill(&self, _: CanvasFillRule) { - // TODO: Process fill rule - self.send_canvas_2d_msg(Canvas2dMsg::Fill); - self.mark_as_dirty(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata + pub fn CreateImageData_( + &self, + global: &GlobalScope, + imagedata: &ImageData, + ) -> Fallible<DomRoot<ImageData>> { + ImageData::new(global, imagedata.Width(), imagedata.Height(), None) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke - fn Stroke(&self) { - self.send_canvas_2d_msg(Canvas2dMsg::Stroke); - self.mark_as_dirty(); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-getimagedata + pub fn GetImageData( + &self, + canvas: Option<&HTMLCanvasElement>, + global: &GlobalScope, + sx: i32, + sy: i32, + sw: i32, + sh: i32, + ) -> Fallible<DomRoot<ImageData>> { + // FIXME(nox): There are many arithmetic operations here that can + // overflow or underflow, this should probably be audited. + + if sw == 0 || sh == 0 { + return Err(Error::IndexSize); + } + + if !self.origin_is_clean() { + return Err(Error::Security); + } + + let (origin, size) = adjust_size_sign(Point2D::new(sx, sy), Size2D::new(sw, sh)); + // FIXME(nox): This is probably wrong when this is a context for an + // offscreen canvas. + let canvas_size = canvas.as_ref().map_or(Size2D::zero(), |c| c.get_size()); + let read_rect = match pixels::clip(origin, size, canvas_size) { + Some(rect) => rect, + None => { + // All the pixels are outside the canvas surface. + return ImageData::new(global, size.width, size.height, None); + }, + }; + + ImageData::new( + global, + size.width, + size.height, + Some(self.get_rect(canvas, read_rect)), + ) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip - fn Clip(&self, _: CanvasFillRule) { - // TODO: Process fill rule - self.send_canvas_2d_msg(Canvas2dMsg::Clip); + // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata + pub fn PutImageData( + &self, + canvas: Option<&HTMLCanvasElement>, + imagedata: &ImageData, + dx: i32, + dy: i32, + ) { + self.PutImageData_( + canvas, + imagedata, + dx, + dy, + 0, + 0, + imagedata.Width() as i32, + imagedata.Height() as i32, + ) } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-ispointinpath - fn IsPointInPath(&self, x: f64, y: f64, fill_rule: CanvasFillRule) -> bool { - let fill_rule = match fill_rule { - CanvasFillRule::Nonzero => FillRule::Nonzero, - CanvasFillRule::Evenodd => FillRule::Evenodd, + // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata + #[allow(unsafe_code)] + pub fn PutImageData_( + &self, + canvas: Option<&HTMLCanvasElement>, + imagedata: &ImageData, + dx: i32, + dy: i32, + dirty_x: i32, + dirty_y: i32, + dirty_width: i32, + dirty_height: i32, + ) { + // FIXME(nox): There are many arithmetic operations here that can + // overflow or underflow, this should probably be audited. + + let imagedata_size = Size2D::new(imagedata.Width(), imagedata.Height()); + if imagedata_size.area() == 0 { + return; + } + + // Step 1. + // Done later. + + // Step 2. + // TODO: throw InvalidState if buffer is detached. + + // FIXME(nox): This is probably wrong when this is a context for an + // offscreen canvas. + let canvas_size = canvas.as_ref().map_or(Size2D::zero(), |c| c.get_size()); + + // Steps 3-6. + let (src_origin, src_size) = adjust_size_sign( + Point2D::new(dirty_x, dirty_y), + Size2D::new(dirty_width, dirty_height), + ); + let src_rect = match pixels::clip(src_origin, src_size, imagedata_size) { + Some(rect) => rect, + None => return, + }; + let (dst_origin, _) = adjust_size_sign( + Point2D::new(dirty_x.saturating_add(dx), dirty_y.saturating_add(dy)), + Size2D::new(dirty_width, dirty_height), + ); + // By clipping to the canvas surface, we avoid sending any pixel + // that would fall outside it. + let dst_rect = match pixels::clip(dst_origin, src_rect.size, canvas_size) { + Some(rect) => rect, + None => return, }; - let (sender, receiver) = - profiled_ipc::channel::<bool>(self.global().time_profiler_chan().clone()).unwrap(); - self.send_canvas_2d_msg(Canvas2dMsg::IsPointInPath(x, y, fill_rule, sender)); - receiver.recv().unwrap() - } - // https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext - fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option<f64>) { - let parsed_text: String = text.into(); - self.send_canvas_2d_msg(Canvas2dMsg::FillText(parsed_text, x, y, max_width)); - self.mark_as_dirty(); + // Step 7. + let (sender, receiver) = ipc::bytes_channel().unwrap(); + let pixels = unsafe { &imagedata.get_rect(Rect::new(src_rect.origin, dst_rect.size)) }; + self.send_canvas_2d_msg(Canvas2dMsg::PutImageData(dst_rect, receiver)); + sender.send(pixels).unwrap(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage - fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult { + pub fn DrawImage( + &self, + canvas: Option<&HTMLCanvasElement>, + image: CanvasImageSource, + dx: f64, + dy: f64, + ) -> ErrorResult { if !(dx.is_finite() && dy.is_finite()) { return Ok(()); } - self.draw_image(image, 0f64, 0f64, None, None, dx, dy, None, None) + self.draw_image(canvas, image, 0f64, 0f64, None, None, dx, dy, None, None) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage - fn DrawImage_( + pub fn DrawImage_( &self, + canvas: Option<&HTMLCanvasElement>, image: CanvasImageSource, dx: f64, dy: f64, @@ -890,12 +1110,24 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { return Ok(()); } - self.draw_image(image, 0f64, 0f64, None, None, dx, dy, Some(dw), Some(dh)) + self.draw_image( + canvas, + image, + 0f64, + 0f64, + None, + None, + dx, + dy, + Some(dw), + Some(dh), + ) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage - fn DrawImage__( + pub fn DrawImage__( &self, + canvas: Option<&HTMLCanvasElement>, image: CanvasImageSource, sx: f64, sy: f64, @@ -919,6 +1151,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } self.draw_image( + canvas, image, sx, sy, @@ -931,8 +1164,136 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { ) } + // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath + pub fn BeginPath(&self) { + self.send_canvas_2d_msg(Canvas2dMsg::BeginPath); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill + pub fn Fill(&self, _fill_rule: CanvasFillRule) { + // TODO: Process fill rule + self.send_canvas_2d_msg(Canvas2dMsg::Fill); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke + pub fn Stroke(&self) { + self.send_canvas_2d_msg(Canvas2dMsg::Stroke); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip + pub fn Clip(&self, _fill_rule: CanvasFillRule) { + // TODO: Process fill rule + self.send_canvas_2d_msg(Canvas2dMsg::Clip); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-ispointinpath + pub fn IsPointInPath( + &self, + global: &GlobalScope, + x: f64, + y: f64, + fill_rule: CanvasFillRule, + ) -> bool { + let fill_rule = match fill_rule { + CanvasFillRule::Nonzero => FillRule::Nonzero, + CanvasFillRule::Evenodd => FillRule::Evenodd, + }; + let (sender, receiver) = + profiled_ipc::channel::<bool>(global.time_profiler_chan().clone()).unwrap(); + self.send_canvas_2d_msg(Canvas2dMsg::IsPointInPath(x, y, fill_rule, sender)); + receiver.recv().unwrap() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale + pub fn Scale(&self, x: f64, y: f64) { + if !(x.is_finite() && y.is_finite()) { + return; + } + + let transform = self.state.borrow().transform; + self.state.borrow_mut().transform = transform.pre_scale(x as f32, y as f32); + self.update_transform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate + pub fn Rotate(&self, angle: f64) { + if angle == 0.0 || !angle.is_finite() { + return; + } + + let (sin, cos) = (angle.sin(), angle.cos()); + let transform = self.state.borrow().transform; + self.state.borrow_mut().transform = transform.pre_mul(&Transform2D::row_major( + cos as f32, + sin as f32, + -sin as f32, + cos as f32, + 0.0, + 0.0, + )); + self.update_transform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate + pub fn Translate(&self, x: f64, y: f64) { + if !(x.is_finite() && y.is_finite()) { + return; + } + + let transform = self.state.borrow().transform; + self.state.borrow_mut().transform = transform.pre_translate(vec2(x as f32, y as f32)); + self.update_transform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform + pub fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + if !(a.is_finite() && + b.is_finite() && + c.is_finite() && + d.is_finite() && + e.is_finite() && + f.is_finite()) + { + return; + } + + let transform = self.state.borrow().transform; + self.state.borrow_mut().transform = transform.pre_mul(&Transform2D::row_major( + a as f32, b as f32, c as f32, d as f32, e as f32, f as f32, + )); + self.update_transform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform + pub fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + if !(a.is_finite() && + b.is_finite() && + c.is_finite() && + d.is_finite() && + e.is_finite() && + f.is_finite()) + { + return; + } + + self.state.borrow_mut().transform = + Transform2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32); + self.update_transform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform + pub fn ResetTransform(&self) { + self.state.borrow_mut().transform = Transform2D::identity(); + self.update_transform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath + pub fn ClosePath(&self) { + self.send_canvas_2d_msg(Canvas2dMsg::ClosePath); + } + // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto - fn MoveTo(&self, x: f64, y: f64) { + pub fn MoveTo(&self, x: f64, y: f64) { if !(x.is_finite() && y.is_finite()) { return; } @@ -940,7 +1301,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-lineto - fn LineTo(&self, x: f64, y: f64) { + pub fn LineTo(&self, x: f64, y: f64) { if !(x.is_finite() && y.is_finite()) { return; } @@ -948,7 +1309,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rect - fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { + pub fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { if [x, y, width, height].iter().all(|val| val.is_finite()) { let rect = Rect::new( Point2D::new(x as f32, y as f32), @@ -959,7 +1320,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto - fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { + pub fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { if !(cpx.is_finite() && cpy.is_finite() && x.is_finite() && y.is_finite()) { return; } @@ -970,7 +1331,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beziercurveto - fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { + pub fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { if !(cp1x.is_finite() && cp1y.is_finite() && cp2x.is_finite() && @@ -988,7 +1349,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arc - fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> ErrorResult { + pub fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> ErrorResult { if !([x, y, r, start, end].iter().all(|x| x.is_finite())) { return Ok(()); } @@ -1008,7 +1369,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arcto - fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> ErrorResult { + pub fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> ErrorResult { if !([cp1x, cp1y, cp2x, cp2y, r].iter().all(|x| x.is_finite())) { return Ok(()); } @@ -1025,7 +1386,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-ellipse - fn Ellipse( + pub fn Ellipse( &self, x: f64, y: f64, @@ -1057,173 +1418,430 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { )); Ok(()) } +} + +impl CanvasRenderingContext2D { + pub fn new_inherited( + global: &GlobalScope, + canvas: Option<&HTMLCanvasElement>, + size: Size2D<u32>, + ) -> CanvasRenderingContext2D { + CanvasRenderingContext2D { + reflector_: Reflector::new(), + canvas: canvas.map(Dom::from_ref), + canvas_state: DomRefCell::new(CanvasState::new( + global, + Size2D::new(size.width as u64, size.height as u64), + )), + } + } + + pub fn new( + global: &GlobalScope, + canvas: &HTMLCanvasElement, + size: Size2D<u32>, + ) -> DomRoot<CanvasRenderingContext2D> { + let boxed = Box::new(CanvasRenderingContext2D::new_inherited( + global, + Some(canvas), + size, + )); + reflect_dom_object(boxed, global, CanvasRenderingContext2DBinding::Wrap) + } + + // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions + pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) { + self.reset_to_initial_state(); + self.canvas_state + .borrow() + .ipc_renderer + .send(CanvasMsg::Recreate( + size, + self.canvas_state.borrow().get_canvas_id(), + )) + .unwrap(); + } + + // https://html.spec.whatwg.org/multipage/#reset-the-rendering-context-to-its-default-state + fn reset_to_initial_state(&self) { + self.canvas_state.borrow().saved_states.borrow_mut().clear(); + *self.canvas_state.borrow().state.borrow_mut() = CanvasContextState::new(); + } + + fn mark_as_dirty(&self) { + self.canvas_state + .borrow() + .mark_as_dirty(self.canvas.as_ref().map(|c| &**c)) + } + + pub fn take_missing_image_urls(&self) -> Vec<ServoUrl> { + mem::replace( + &mut self.canvas_state.borrow().missing_image_urls.borrow_mut(), + vec![], + ) + } + + pub fn get_canvas_id(&self) -> CanvasId { + self.canvas_state.borrow().get_canvas_id() + } + + pub fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) { + self.canvas_state.borrow().send_canvas_2d_msg(msg) + } + + pub fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> { + self.canvas_state.borrow().ipc_renderer.clone() + } + + pub fn origin_is_clean(&self) -> bool { + self.canvas_state.borrow().origin_is_clean() + } + + pub fn get_rect(&self, rect: Rect<u32>) -> Vec<u8> { + self.canvas_state + .borrow() + .get_rect(self.canvas.as_ref().map(|c| &**c), rect) + } +} + +pub trait LayoutCanvasRenderingContext2DHelpers { + #[allow(unsafe_code)] + unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg>; + #[allow(unsafe_code)] + unsafe fn get_canvas_id(&self) -> CanvasId; +} + +impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> { + #[allow(unsafe_code)] + unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> { + (*self.unsafe_get()) + .canvas_state + .borrow_for_layout() + .ipc_renderer + .clone() + } + + #[allow(unsafe_code)] + unsafe fn get_canvas_id(&self) -> CanvasId { + (*self.unsafe_get()) + .canvas_state + .borrow_for_layout() + .get_canvas_id() + } +} + +// We add a guard to each of methods by the spec: +// http://www.w3.org/html/wg/drafts/2dcontext/html5_canvas_CR/ +// +// > Except where otherwise specified, for the 2D context interface, +// > any method call with a numeric argument whose value is infinite or a NaN value must be ignored. +// +// Restricted values are guarded in glue code. Therefore we need not add a guard. +// +// FIXME: this behavior should might be generated by some annotattions to idl. +impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { + // https://html.spec.whatwg.org/multipage/#dom-context-2d-canvas + fn Canvas(&self) -> DomRoot<HTMLCanvasElement> { + // This method is not called from a paint worklet rendering context, + // so it's OK to panic if self.canvas is None. + DomRoot::from_ref(self.canvas.as_ref().expect("No canvas.")) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-save + fn Save(&self) { + self.canvas_state.borrow().Save() + } + + #[allow(unrooted_must_root)] + // https://html.spec.whatwg.org/multipage/#dom-context-2d-restore + fn Restore(&self) { + self.canvas_state.borrow().Restore() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale + fn Scale(&self, x: f64, y: f64) { + self.canvas_state.borrow().Scale(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate + fn Rotate(&self, angle: f64) { + self.canvas_state.borrow().Rotate(angle) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate + fn Translate(&self, x: f64, y: f64) { + self.canvas_state.borrow().Translate(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform + fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + self.canvas_state.borrow().Transform(a, b, c, d, e, f) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform + fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + self.canvas_state.borrow().SetTransform(a, b, c, d, e, f) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform + fn ResetTransform(&self) { + self.canvas_state.borrow().ResetTransform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha + fn GlobalAlpha(&self) -> f64 { + self.canvas_state.borrow().GlobalAlpha() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha + fn SetGlobalAlpha(&self, alpha: f64) { + self.canvas_state.borrow().SetGlobalAlpha(alpha) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation + fn GlobalCompositeOperation(&self) -> DOMString { + self.canvas_state.borrow().GlobalCompositeOperation() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation + fn SetGlobalCompositeOperation(&self, op_str: DOMString) { + self.canvas_state + .borrow() + .SetGlobalCompositeOperation(op_str) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect + fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { + self.canvas_state.borrow().FillRect(x, y, width, height); + self.mark_as_dirty(); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect + fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { + self.canvas_state.borrow().ClearRect(x, y, width, height); + self.mark_as_dirty(); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect + fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { + self.canvas_state.borrow().StrokeRect(x, y, width, height); + self.mark_as_dirty(); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath + fn BeginPath(&self) { + self.canvas_state.borrow().BeginPath() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath + fn ClosePath(&self) { + self.canvas_state.borrow().ClosePath() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill + fn Fill(&self, fill_rule: CanvasFillRule) { + self.canvas_state.borrow().Fill(fill_rule); + self.mark_as_dirty(); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke + fn Stroke(&self) { + self.canvas_state.borrow().Stroke(); + self.mark_as_dirty(); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip + fn Clip(&self, fill_rule: CanvasFillRule) { + self.canvas_state.borrow().Clip(fill_rule) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-ispointinpath + fn IsPointInPath(&self, x: f64, y: f64, fill_rule: CanvasFillRule) -> bool { + self.canvas_state + .borrow() + .IsPointInPath(&self.global(), x, y, fill_rule) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext + fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option<f64>) { + self.canvas_state.borrow().FillText(text, x, y, max_width); + self.mark_as_dirty(); + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage + fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult { + self.canvas_state + .borrow() + .DrawImage(self.canvas.as_ref().map(|c| &**c), image, dx, dy) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage + fn DrawImage_( + &self, + image: CanvasImageSource, + dx: f64, + dy: f64, + dw: f64, + dh: f64, + ) -> ErrorResult { + self.canvas_state.borrow().DrawImage_( + self.canvas.as_ref().map(|c| &**c), + image, + dx, + dy, + dw, + dh, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage + fn DrawImage__( + &self, + image: CanvasImageSource, + sx: f64, + sy: f64, + sw: f64, + sh: f64, + dx: f64, + dy: f64, + dw: f64, + dh: f64, + ) -> ErrorResult { + self.canvas_state.borrow().DrawImage__( + self.canvas.as_ref().map(|c| &**c), + image, + sx, + sy, + sw, + sh, + dx, + dy, + dw, + dh, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto + fn MoveTo(&self, x: f64, y: f64) { + self.canvas_state.borrow().MoveTo(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-lineto + fn LineTo(&self, x: f64, y: f64) { + self.canvas_state.borrow().LineTo(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-rect + fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { + self.canvas_state.borrow().Rect(x, y, width, height) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto + fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { + self.canvas_state.borrow().QuadraticCurveTo(cpx, cpy, x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-beziercurveto + fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { + self.canvas_state + .borrow() + .BezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-arc + fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> ErrorResult { + self.canvas_state.borrow().Arc(x, y, r, start, end, ccw) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-arcto + fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> ErrorResult { + self.canvas_state.borrow().ArcTo(cp1x, cp1y, cp2x, cp2y, r) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-ellipse + fn Ellipse( + &self, + x: f64, + y: f64, + rx: f64, + ry: f64, + rotation: f64, + start: f64, + end: f64, + ccw: bool, + ) -> ErrorResult { + self.canvas_state + .borrow() + .Ellipse(x, y, rx, ry, rotation, start, end, ccw) + } // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled fn ImageSmoothingEnabled(&self) -> bool { - let state = self.state.borrow(); - state.image_smoothing_enabled + self.canvas_state.borrow().ImageSmoothingEnabled() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled fn SetImageSmoothingEnabled(&self, value: bool) { - self.state.borrow_mut().image_smoothing_enabled = value; + self.canvas_state.borrow().SetImageSmoothingEnabled(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn StrokeStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { - match self.state.borrow().stroke_style { - CanvasFillOrStrokeStyle::Color(ref rgba) => { - let mut result = String::new(); - serialize(rgba, &mut result).unwrap(); - StringOrCanvasGradientOrCanvasPattern::String(DOMString::from(result)) - }, - CanvasFillOrStrokeStyle::Gradient(ref gradient) => { - StringOrCanvasGradientOrCanvasPattern::CanvasGradient(DomRoot::from_ref(&*gradient)) - }, - CanvasFillOrStrokeStyle::Pattern(ref pattern) => { - StringOrCanvasGradientOrCanvasPattern::CanvasPattern(DomRoot::from_ref(&*pattern)) - }, - } + self.canvas_state.borrow().StrokeStyle() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) { - match value { - StringOrCanvasGradientOrCanvasPattern::String(string) => { - if let Ok(rgba) = self.parse_color(&string) { - self.state.borrow_mut().stroke_style = CanvasFillOrStrokeStyle::Color(rgba); - self.send_canvas_2d_msg(Canvas2dMsg::SetStrokeStyle(FillOrStrokeStyle::Color( - rgba, - ))); - } - }, - StringOrCanvasGradientOrCanvasPattern::CanvasGradient(gradient) => { - self.state.borrow_mut().stroke_style = - CanvasFillOrStrokeStyle::Gradient(Dom::from_ref(&*gradient)); - self.send_canvas_2d_msg(Canvas2dMsg::SetStrokeStyle( - gradient.to_fill_or_stroke_style(), - )); - }, - StringOrCanvasGradientOrCanvasPattern::CanvasPattern(pattern) => { - self.state.borrow_mut().stroke_style = - CanvasFillOrStrokeStyle::Pattern(Dom::from_ref(&*pattern)); - self.send_canvas_2d_msg(Canvas2dMsg::SetStrokeStyle( - pattern.to_fill_or_stroke_style(), - )); - if !pattern.origin_is_clean() { - self.set_origin_unclean(); - } - }, - } + self.canvas_state + .borrow() + .SetStrokeStyle(self.canvas.as_ref().map(|c| &**c), value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn FillStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { - match self.state.borrow().fill_style { - CanvasFillOrStrokeStyle::Color(ref rgba) => { - let mut result = String::new(); - serialize(rgba, &mut result).unwrap(); - StringOrCanvasGradientOrCanvasPattern::String(DOMString::from(result)) - }, - CanvasFillOrStrokeStyle::Gradient(ref gradient) => { - StringOrCanvasGradientOrCanvasPattern::CanvasGradient(DomRoot::from_ref(&*gradient)) - }, - CanvasFillOrStrokeStyle::Pattern(ref pattern) => { - StringOrCanvasGradientOrCanvasPattern::CanvasPattern(DomRoot::from_ref(&*pattern)) - }, - } + self.canvas_state.borrow().FillStyle() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) { - match value { - StringOrCanvasGradientOrCanvasPattern::String(string) => { - if let Ok(rgba) = self.parse_color(&string) { - self.state.borrow_mut().fill_style = CanvasFillOrStrokeStyle::Color(rgba); - self.send_canvas_2d_msg(Canvas2dMsg::SetFillStyle(FillOrStrokeStyle::Color( - rgba, - ))) - } - }, - StringOrCanvasGradientOrCanvasPattern::CanvasGradient(gradient) => { - self.state.borrow_mut().fill_style = - CanvasFillOrStrokeStyle::Gradient(Dom::from_ref(&*gradient)); - self.send_canvas_2d_msg(Canvas2dMsg::SetFillStyle( - gradient.to_fill_or_stroke_style(), - )); - }, - StringOrCanvasGradientOrCanvasPattern::CanvasPattern(pattern) => { - self.state.borrow_mut().fill_style = - CanvasFillOrStrokeStyle::Pattern(Dom::from_ref(&*pattern)); - self.send_canvas_2d_msg(Canvas2dMsg::SetFillStyle( - pattern.to_fill_or_stroke_style(), - )); - if !pattern.origin_is_clean() { - self.set_origin_unclean(); - } - }, - } + self.canvas_state + .borrow() + .SetFillStyle(self.canvas.as_ref().map(|c| &**c), value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata fn CreateImageData(&self, sw: i32, sh: i32) -> Fallible<DomRoot<ImageData>> { - if sw == 0 || sh == 0 { - return Err(Error::IndexSize); - } - ImageData::new(&self.global(), sw.abs() as u32, sh.abs() as u32, None) + self.canvas_state + .borrow() + .CreateImageData(&self.global(), sw, sh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata fn CreateImageData_(&self, imagedata: &ImageData) -> Fallible<DomRoot<ImageData>> { - ImageData::new(&self.global(), imagedata.Width(), imagedata.Height(), None) + self.canvas_state + .borrow() + .CreateImageData_(&self.global(), imagedata) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-getimagedata fn GetImageData(&self, sx: i32, sy: i32, sw: i32, sh: i32) -> Fallible<DomRoot<ImageData>> { - // FIXME(nox): There are many arithmetic operations here that can - // overflow or underflow, this should probably be audited. - - if sw == 0 || sh == 0 { - return Err(Error::IndexSize); - } - - if !self.origin_is_clean() { - return Err(Error::Security); - } - - let (origin, size) = adjust_size_sign(Point2D::new(sx, sy), Size2D::new(sw, sh)); - // FIXME(nox): This is probably wrong when this is a context for an - // offscreen canvas. - let canvas_size = self - .canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size()); - let read_rect = match pixels::clip(origin, size, canvas_size) { - Some(rect) => rect, - None => { - // All the pixels are outside the canvas surface. - return ImageData::new(&self.global(), size.width, size.height, None); - }, - }; - - ImageData::new( + self.canvas_state.borrow().GetImageData( + self.canvas.as_ref().map(|c| &**c), &self.global(), - size.width, - size.height, - Some(self.get_rect(read_rect)), + sx, + sy, + sw, + sh, ) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata fn PutImageData(&self, imagedata: &ImageData, dx: i32, dy: i32) { - self.PutImageData_( + self.canvas_state.borrow().PutImageData( + self.canvas.as_ref().map(|c| &**c), imagedata, dx, dy, - 0, - 0, - imagedata.Width() as i32, - imagedata.Height() as i32, ) } @@ -1239,52 +1857,16 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { dirty_width: i32, dirty_height: i32, ) { - // FIXME(nox): There are many arithmetic operations here that can - // overflow or underflow, this should probably be audited. - - let imagedata_size = Size2D::new(imagedata.Width(), imagedata.Height()); - if imagedata_size.area() == 0 { - return; - } - - // Step 1. - // Done later. - - // Step 2. - // TODO: throw InvalidState if buffer is detached. - - // FIXME(nox): This is probably wrong when this is a context for an - // offscreen canvas. - let canvas_size = self - .canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size()); - - // Steps 3-6. - let (src_origin, src_size) = adjust_size_sign( - Point2D::new(dirty_x, dirty_y), - Size2D::new(dirty_width, dirty_height), - ); - let src_rect = match pixels::clip(src_origin, src_size, imagedata_size) { - Some(rect) => rect, - None => return, - }; - let (dst_origin, _) = adjust_size_sign( - Point2D::new(dirty_x.saturating_add(dx), dirty_y.saturating_add(dy)), - Size2D::new(dirty_width, dirty_height), + self.canvas_state.borrow().PutImageData_( + self.canvas.as_ref().map(|c| &**c), + imagedata, + dx, + dy, + dirty_x, + dirty_y, + dirty_width, + dirty_height, ); - // By clipping to the canvas surface, we avoid sending any pixel - // that would fall outside it. - let dst_rect = match pixels::clip(dst_origin, src_rect.size, canvas_size) { - Some(rect) => rect, - None => return, - }; - - // Step 7. - let (sender, receiver) = ipc::bytes_channel().unwrap(); - let pixels = unsafe { &imagedata.get_rect(Rect::new(src_rect.origin, dst_rect.size)) }; - self.send_canvas_2d_msg(Canvas2dMsg::PutImageData(dst_rect, receiver)); - sender.send(pixels).unwrap(); self.mark_as_dirty(); } @@ -1296,10 +1878,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { x1: Finite<f64>, y1: Finite<f64>, ) -> DomRoot<CanvasGradient> { - CanvasGradient::new( - &self.global(), - CanvasGradientStyle::Linear(LinearGradientStyle::new(*x0, *y0, *x1, *y1, Vec::new())), - ) + self.canvas_state + .borrow() + .CreateLinearGradient(&self.global(), x0, y0, x1, y1) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createradialgradient @@ -1312,197 +1893,100 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { y1: Finite<f64>, r1: Finite<f64>, ) -> Fallible<DomRoot<CanvasGradient>> { - if *r0 < 0. || *r1 < 0. { - return Err(Error::IndexSize); - } - - Ok(CanvasGradient::new( - &self.global(), - CanvasGradientStyle::Radial(RadialGradientStyle::new( - *x0, - *y0, - *r0, - *x1, - *y1, - *r1, - Vec::new(), - )), - )) + self.canvas_state + .borrow() + .CreateRadialGradient(&self.global(), x0, y0, r0, x1, y1, r1) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern fn CreatePattern( &self, image: CanvasImageSource, - mut repetition: DOMString, + repetition: DOMString, ) -> Fallible<DomRoot<CanvasPattern>> { - let (image_data, image_size) = match image { - CanvasImageSource::HTMLImageElement(ref image) => { - // https://html.spec.whatwg.org/multipage/#img-error - // If the image argument is an HTMLImageElement object that is in the broken state, - // then throw an InvalidStateError exception - image - .get_url() - .and_then(|url| self.fetch_image_data(url)) - .ok_or(Error::InvalidState)? - }, - CanvasImageSource::HTMLCanvasElement(ref canvas) => { - let (data, size) = canvas.fetch_all_data().ok_or(Error::InvalidState)?; - let data = data - .map(|data| data.to_vec()) - .unwrap_or_else(|| vec![0; size.area() as usize * 4]); - (data, size) - }, - CanvasImageSource::CSSStyleValue(ref value) => value - .get_url(self.base_url.clone()) - .and_then(|url| self.fetch_image_data(url)) - .ok_or(Error::InvalidState)?, - }; - - if repetition.is_empty() { - repetition.push_str("repeat"); - } - - if let Ok(rep) = RepetitionStyle::from_str(&repetition) { - Ok(CanvasPattern::new( - &self.global(), - image_data, - image_size, - rep, - self.is_origin_clean(image), - )) - } else { - Err(Error::Syntax) - } + self.canvas_state + .borrow() + .CreatePattern(&self.global(), image, repetition) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth fn LineWidth(&self) -> f64 { - let state = self.state.borrow(); - state.line_width + self.canvas_state.borrow().LineWidth() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth fn SetLineWidth(&self, width: f64) { - if !width.is_finite() || width <= 0.0 { - return; - } - - self.state.borrow_mut().line_width = width; - self.send_canvas_2d_msg(Canvas2dMsg::SetLineWidth(width as f32)) + self.canvas_state.borrow().SetLineWidth(width) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap fn LineCap(&self) -> CanvasLineCap { - match self.state.borrow().line_cap { - LineCapStyle::Butt => CanvasLineCap::Butt, - LineCapStyle::Round => CanvasLineCap::Round, - LineCapStyle::Square => CanvasLineCap::Square, - } + self.canvas_state.borrow().LineCap() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap fn SetLineCap(&self, cap: CanvasLineCap) { - let line_cap = match cap { - CanvasLineCap::Butt => LineCapStyle::Butt, - CanvasLineCap::Round => LineCapStyle::Round, - CanvasLineCap::Square => LineCapStyle::Square, - }; - self.state.borrow_mut().line_cap = line_cap; - self.send_canvas_2d_msg(Canvas2dMsg::SetLineCap(line_cap)); + self.canvas_state.borrow().SetLineCap(cap) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin fn LineJoin(&self) -> CanvasLineJoin { - match self.state.borrow().line_join { - LineJoinStyle::Round => CanvasLineJoin::Round, - LineJoinStyle::Bevel => CanvasLineJoin::Bevel, - LineJoinStyle::Miter => CanvasLineJoin::Miter, - } + self.canvas_state.borrow().LineJoin() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin fn SetLineJoin(&self, join: CanvasLineJoin) { - let line_join = match join { - CanvasLineJoin::Round => LineJoinStyle::Round, - CanvasLineJoin::Bevel => LineJoinStyle::Bevel, - CanvasLineJoin::Miter => LineJoinStyle::Miter, - }; - self.state.borrow_mut().line_join = line_join; - self.send_canvas_2d_msg(Canvas2dMsg::SetLineJoin(line_join)); + self.canvas_state.borrow().SetLineJoin(join) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit fn MiterLimit(&self) -> f64 { - let state = self.state.borrow(); - state.miter_limit + self.canvas_state.borrow().MiterLimit() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit fn SetMiterLimit(&self, limit: f64) { - if !limit.is_finite() || limit <= 0.0 { - return; - } - - self.state.borrow_mut().miter_limit = limit; - self.send_canvas_2d_msg(Canvas2dMsg::SetMiterLimit(limit as f32)) + self.canvas_state.borrow().SetMiterLimit(limit) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx fn ShadowOffsetX(&self) -> f64 { - self.state.borrow().shadow_offset_x + self.canvas_state.borrow().ShadowOffsetX() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx fn SetShadowOffsetX(&self, value: f64) { - if !value.is_finite() || value == self.state.borrow().shadow_offset_x { - return; - } - self.state.borrow_mut().shadow_offset_x = value; - self.send_canvas_2d_msg(Canvas2dMsg::SetShadowOffsetX(value)) + self.canvas_state.borrow().SetShadowOffsetX(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety fn ShadowOffsetY(&self) -> f64 { - self.state.borrow().shadow_offset_y + self.canvas_state.borrow().ShadowOffsetY() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety fn SetShadowOffsetY(&self, value: f64) { - if !value.is_finite() || value == self.state.borrow().shadow_offset_y { - return; - } - self.state.borrow_mut().shadow_offset_y = value; - self.send_canvas_2d_msg(Canvas2dMsg::SetShadowOffsetY(value)) + self.canvas_state.borrow().SetShadowOffsetY(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur fn ShadowBlur(&self) -> f64 { - self.state.borrow().shadow_blur + self.canvas_state.borrow().ShadowBlur() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur fn SetShadowBlur(&self, value: f64) { - if !value.is_finite() || value < 0f64 || value == self.state.borrow().shadow_blur { - return; - } - self.state.borrow_mut().shadow_blur = value; - self.send_canvas_2d_msg(Canvas2dMsg::SetShadowBlur(value)) + self.canvas_state.borrow().SetShadowBlur(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn ShadowColor(&self) -> DOMString { - let mut result = String::new(); - serialize(&self.state.borrow().shadow_color, &mut result).unwrap(); - DOMString::from(result) + self.canvas_state.borrow().ShadowColor() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn SetShadowColor(&self, value: DOMString) { - if let Ok(color) = parse_color(&value) { - self.state.borrow_mut().shadow_color = color; - self.send_canvas_2d_msg(Canvas2dMsg::SetShadowColor(color)) - } + self.canvas_state.borrow().SetShadowColor(value) } } diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 75d4b272834..66691a557e1 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -38,6 +38,7 @@ use js::jsapi::{JSAutoRealm, JSContext}; use js::jsval::UndefinedValue; use js::rust::HandleValue; use msg::constellation_msg::{PipelineId, TopLevelBrowsingContextId}; +use net_traits::image_cache::ImageCache; use net_traits::request::{CredentialsMode, Destination, ParserMetadata}; use net_traits::request::{Referrer, RequestBuilder, RequestMode}; use net_traits::IpcSend; @@ -174,6 +175,8 @@ pub struct DedicatedWorkerGlobalScope { #[ignore_malloc_size_of = "Can't measure trait objects"] /// Sender to the parent thread. parent_sender: Box<ScriptChan + Send>, + #[ignore_malloc_size_of = "Arc"] + image_cache: Arc<ImageCache>, } impl WorkerEventLoopMethods for DedicatedWorkerGlobalScope { @@ -225,6 +228,7 @@ impl DedicatedWorkerGlobalScope { timer_event_chan: IpcSender<TimerEvent>, timer_event_port: Receiver<(TrustedWorkerAddress, TimerEvent)>, closing: Arc<AtomicBool>, + image_cache: Arc<dyn ImageCache>, ) -> DedicatedWorkerGlobalScope { DedicatedWorkerGlobalScope { workerglobalscope: WorkerGlobalScope::new_inherited( @@ -242,6 +246,7 @@ impl DedicatedWorkerGlobalScope { timer_event_port: timer_event_port, parent_sender: parent_sender, worker: DomRefCell::new(None), + image_cache: image_cache, } } @@ -259,6 +264,7 @@ impl DedicatedWorkerGlobalScope { timer_event_chan: IpcSender<TimerEvent>, timer_event_port: Receiver<(TrustedWorkerAddress, TimerEvent)>, closing: Arc<AtomicBool>, + image_cache: Arc<dyn ImageCache>, ) -> DomRoot<DedicatedWorkerGlobalScope> { let cx = runtime.cx(); let scope = Box::new(DedicatedWorkerGlobalScope::new_inherited( @@ -274,6 +280,7 @@ impl DedicatedWorkerGlobalScope { timer_event_chan, timer_event_port, closing, + image_cache, )); unsafe { DedicatedWorkerGlobalScopeBinding::Wrap(cx, scope) } } @@ -292,6 +299,7 @@ impl DedicatedWorkerGlobalScope { worker_name: String, worker_type: WorkerType, closing: Arc<AtomicBool>, + image_cache: Arc<dyn ImageCache>, ) { let serialized_worker_url = worker_url.to_string(); let name = format!("WebWorker for {}", serialized_worker_url); @@ -363,6 +371,7 @@ impl DedicatedWorkerGlobalScope { timer_ipc_chan, timer_rx, closing, + image_cache, ); // FIXME(njn): workers currently don't have a unique ID suitable for using in reporter // registration (#6631), so we instead use a random number and cross our fingers. @@ -428,6 +437,10 @@ impl DedicatedWorkerGlobalScope { .expect("Thread spawning failed"); } + pub fn image_cache(&self) -> Arc<dyn ImageCache> { + self.image_cache.clone() + } + pub fn script_chan(&self) -> Box<dyn ScriptChan + Send> { Box::new(WorkerThreadWorkerChan { sender: self.own_sender.clone(), diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index f803d6228b7..1330021035a 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -20,6 +20,7 @@ use crate::dom::errorevent::ErrorEvent; use crate::dom::event::{Event, EventBubbles, EventCancelable, EventStatus}; use crate::dom::eventsource::EventSource; use crate::dom::eventtarget::EventTarget; +use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope; use crate::dom::performance::Performance; use crate::dom::window::Window; use crate::dom::workerglobalscope::WorkerGlobalScope; @@ -51,6 +52,7 @@ use js::rust::{get_object_class, CompileOptionsWrapper, ParentRuntime, Runtime}; use js::rust::{HandleValue, MutableHandleValue}; use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL}; use msg::constellation_msg::PipelineId; +use net_traits::image_cache::ImageCache; use net_traits::{CoreResourceThread, IpcSend, ResourceThreads}; use profile_traits::{mem as profile_mem, time as profile_time}; use script_traits::{MsDuration, ScriptToConstellationChan, TimerEvent}; @@ -376,6 +378,19 @@ impl GlobalScope { &self.origin } + pub fn image_cache(&self) -> Arc<dyn ImageCache> { + if let Some(window) = self.downcast::<Window>() { + return window.image_cache(); + } + if let Some(worker) = self.downcast::<DedicatedWorkerGlobalScope>() { + return worker.image_cache(); + } + if let Some(worker) = self.downcast::<PaintWorkletGlobalScope>() { + return worker.image_cache(); + } + unreachable!(); + } + /// Get the [base url](https://html.spec.whatwg.org/multipage/#api-base-url) /// for this global scope. pub fn api_base_url(&self) -> ServoUrl { diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs index bc1e6fb6fac..5086287dbb3 100644 --- a/components/script/dom/offscreencanvas.rs +++ b/components/script/dom/offscreencanvas.rs @@ -93,7 +93,12 @@ impl OffscreenCanvas { }; } let size = self.get_size(); - let context = OffscreenCanvasRenderingContext2D::new(&self.global(), self, size); + let context = OffscreenCanvasRenderingContext2D::new( + &self.global(), + self, + size, + self.placeholder.as_ref().map(|c| &**c), + ); *self.context.borrow_mut() = Some(OffscreenCanvasContext::OffscreenContext2d( Dom::from_ref(&*context), )); diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs index 5e2050635b5..502600a9145 100644 --- a/components/script/dom/offscreencanvasrenderingcontext2d.rs +++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs @@ -3,12 +3,25 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::cell::DomRefCell; +use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasFillRule; +use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasImageSource; +use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineCap; +use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineJoin; use crate::dom::bindings::codegen::Bindings::OffscreenCanvasRenderingContext2DBinding; use crate::dom::bindings::codegen::Bindings::OffscreenCanvasRenderingContext2DBinding::OffscreenCanvasRenderingContext2DMethods; -use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; +use crate::dom::bindings::codegen::UnionTypes::StringOrCanvasGradientOrCanvasPattern; +use crate::dom::bindings::error::ErrorResult; +use crate::dom::bindings::error::Fallible; +use crate::dom::bindings::num::Finite; +use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::str::DOMString; +use crate::dom::canvasgradient::CanvasGradient; +use crate::dom::canvaspattern::CanvasPattern; use crate::dom::canvasrenderingcontext2d::CanvasState; use crate::dom::globalscope::GlobalScope; +use crate::dom::htmlcanvaselement::HTMLCanvasElement; +use crate::dom::imagedata::ImageData; use crate::dom::offscreencanvas::OffscreenCanvas; use dom_struct::dom_struct; use euclid::Size2D; @@ -18,18 +31,24 @@ pub struct OffscreenCanvasRenderingContext2D { reflector_: Reflector, canvas: Option<Dom<OffscreenCanvas>>, canvas_state: DomRefCell<CanvasState>, + htmlcanvas: Option<Dom<HTMLCanvasElement>>, } impl OffscreenCanvasRenderingContext2D { - pub fn new_inherited( + fn new_inherited( global: &GlobalScope, canvas: Option<&OffscreenCanvas>, size: Size2D<u64>, + htmlcanvas: Option<&HTMLCanvasElement>, ) -> OffscreenCanvasRenderingContext2D { OffscreenCanvasRenderingContext2D { reflector_: Reflector::new(), canvas: canvas.map(Dom::from_ref), - canvas_state: DomRefCell::new(CanvasState::new(global, size)), + htmlcanvas: htmlcanvas.map(Dom::from_ref), + canvas_state: DomRefCell::new(CanvasState::new( + global, + Size2D::new(size.width as u64, size.height as u64), + )), } } @@ -37,11 +56,13 @@ impl OffscreenCanvasRenderingContext2D { global: &GlobalScope, canvas: &OffscreenCanvas, size: Size2D<u64>, + htmlcanvas: Option<&HTMLCanvasElement>, ) -> DomRoot<OffscreenCanvasRenderingContext2D> { let boxed = Box::new(OffscreenCanvasRenderingContext2D::new_inherited( global, Some(canvas), size, + htmlcanvas, )); reflect_dom_object( boxed, @@ -71,4 +92,424 @@ impl OffscreenCanvasRenderingContext2DMethods for OffscreenCanvasRenderingContex fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { self.canvas_state.borrow().StrokeRect(x, y, width, height); } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx + fn ShadowOffsetX(&self) -> f64 { + self.canvas_state.borrow().ShadowOffsetX() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx + fn SetShadowOffsetX(&self, value: f64) { + self.canvas_state.borrow().SetShadowOffsetX(value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety + fn ShadowOffsetY(&self) -> f64 { + self.canvas_state.borrow().ShadowOffsetY() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety + fn SetShadowOffsetY(&self, value: f64) { + self.canvas_state.borrow().SetShadowOffsetY(value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur + fn ShadowBlur(&self) -> f64 { + self.canvas_state.borrow().ShadowBlur() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur + fn SetShadowBlur(&self, value: f64) { + self.canvas_state.borrow().SetShadowBlur(value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor + fn ShadowColor(&self) -> DOMString { + self.canvas_state.borrow().ShadowColor() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor + fn SetShadowColor(&self, value: DOMString) { + self.canvas_state.borrow().SetShadowColor(value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + fn StrokeStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { + self.canvas_state.borrow().StrokeStyle() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) { + self.canvas_state + .borrow() + .SetStrokeStyle(self.htmlcanvas.as_ref().map(|c| &**c), value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + fn FillStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { + self.canvas_state.borrow().FillStyle() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle + fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) { + self.canvas_state + .borrow() + .SetFillStyle(self.htmlcanvas.as_ref().map(|c| &**c), value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createlineargradient + fn CreateLinearGradient( + &self, + x0: Finite<f64>, + y0: Finite<f64>, + x1: Finite<f64>, + y1: Finite<f64>, + ) -> DomRoot<CanvasGradient> { + self.canvas_state + .borrow() + .CreateLinearGradient(&self.global(), x0, y0, x1, y1) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createradialgradient + fn CreateRadialGradient( + &self, + x0: Finite<f64>, + y0: Finite<f64>, + r0: Finite<f64>, + x1: Finite<f64>, + y1: Finite<f64>, + r1: Finite<f64>, + ) -> Fallible<DomRoot<CanvasGradient>> { + self.canvas_state + .borrow() + .CreateRadialGradient(&self.global(), x0, y0, r0, x1, y1, r1) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern + fn CreatePattern( + &self, + image: CanvasImageSource, + repetition: DOMString, + ) -> Fallible<DomRoot<CanvasPattern>> { + self.canvas_state + .borrow() + .CreatePattern(&self.global(), image, repetition) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-save + fn Save(&self) { + self.canvas_state.borrow().Save() + } + + #[allow(unrooted_must_root)] + // https://html.spec.whatwg.org/multipage/#dom-context-2d-restore + fn Restore(&self) { + self.canvas_state.borrow().Restore() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha + fn GlobalAlpha(&self) -> f64 { + self.canvas_state.borrow().GlobalAlpha() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha + fn SetGlobalAlpha(&self, alpha: f64) { + self.canvas_state.borrow().SetGlobalAlpha(alpha) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation + fn GlobalCompositeOperation(&self) -> DOMString { + self.canvas_state.borrow().GlobalCompositeOperation() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation + fn SetGlobalCompositeOperation(&self, op_str: DOMString) { + self.canvas_state + .borrow() + .SetGlobalCompositeOperation(op_str) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled + fn ImageSmoothingEnabled(&self) -> bool { + self.canvas_state.borrow().ImageSmoothingEnabled() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled + fn SetImageSmoothingEnabled(&self, value: bool) { + self.canvas_state.borrow().SetImageSmoothingEnabled(value) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext + fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option<f64>) { + self.canvas_state.borrow().FillText(text, x, y, max_width) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth + fn LineWidth(&self) -> f64 { + self.canvas_state.borrow().LineWidth() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth + fn SetLineWidth(&self, width: f64) { + self.canvas_state.borrow().SetLineWidth(width) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap + fn LineCap(&self) -> CanvasLineCap { + self.canvas_state.borrow().LineCap() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap + fn SetLineCap(&self, cap: CanvasLineCap) { + self.canvas_state.borrow().SetLineCap(cap) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin + fn LineJoin(&self) -> CanvasLineJoin { + self.canvas_state.borrow().LineJoin() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin + fn SetLineJoin(&self, join: CanvasLineJoin) { + self.canvas_state.borrow().SetLineJoin(join) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit + fn MiterLimit(&self) -> f64 { + self.canvas_state.borrow().MiterLimit() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit + fn SetMiterLimit(&self, limit: f64) { + self.canvas_state.borrow().SetMiterLimit(limit) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata + fn CreateImageData(&self, sw: i32, sh: i32) -> Fallible<DomRoot<ImageData>> { + self.canvas_state + .borrow() + .CreateImageData(&self.global(), sw, sh) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata + fn CreateImageData_(&self, imagedata: &ImageData) -> Fallible<DomRoot<ImageData>> { + self.canvas_state + .borrow() + .CreateImageData_(&self.global(), imagedata) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-getimagedata + fn GetImageData(&self, sx: i32, sy: i32, sw: i32, sh: i32) -> Fallible<DomRoot<ImageData>> { + self.canvas_state.borrow().GetImageData( + self.htmlcanvas.as_ref().map(|c| &**c), + &self.global(), + sx, + sy, + sw, + sh, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata + fn PutImageData(&self, imagedata: &ImageData, dx: i32, dy: i32) { + self.canvas_state.borrow().PutImageData( + self.htmlcanvas.as_ref().map(|c| &**c), + imagedata, + dx, + dy, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata + #[allow(unsafe_code)] + fn PutImageData_( + &self, + imagedata: &ImageData, + dx: i32, + dy: i32, + dirty_x: i32, + dirty_y: i32, + dirty_width: i32, + dirty_height: i32, + ) { + self.canvas_state.borrow().PutImageData_( + self.htmlcanvas.as_ref().map(|c| &**c), + imagedata, + dx, + dy, + dirty_x, + dirty_y, + dirty_width, + dirty_height, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage + fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult { + self.canvas_state + .borrow() + .DrawImage(self.htmlcanvas.as_ref().map(|c| &**c), image, dx, dy) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage + fn DrawImage_( + &self, + image: CanvasImageSource, + dx: f64, + dy: f64, + dw: f64, + dh: f64, + ) -> ErrorResult { + self.canvas_state.borrow().DrawImage_( + self.htmlcanvas.as_ref().map(|c| &**c), + image, + dx, + dy, + dw, + dh, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage + fn DrawImage__( + &self, + image: CanvasImageSource, + sx: f64, + sy: f64, + sw: f64, + sh: f64, + dx: f64, + dy: f64, + dw: f64, + dh: f64, + ) -> ErrorResult { + self.canvas_state.borrow().DrawImage__( + self.htmlcanvas.as_ref().map(|c| &**c), + image, + sx, + sy, + sw, + sh, + dx, + dy, + dw, + dh, + ) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath + fn BeginPath(&self) { + self.canvas_state.borrow().BeginPath() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill + fn Fill(&self, fill_rule: CanvasFillRule) { + self.canvas_state.borrow().Fill(fill_rule) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke + fn Stroke(&self) { + self.canvas_state.borrow().Stroke() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip + fn Clip(&self, fill_rule: CanvasFillRule) { + self.canvas_state.borrow().Clip(fill_rule) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-ispointinpath + fn IsPointInPath(&self, x: f64, y: f64, fill_rule: CanvasFillRule) -> bool { + self.canvas_state + .borrow() + .IsPointInPath(&self.global(), x, y, fill_rule) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale + fn Scale(&self, x: f64, y: f64) { + self.canvas_state.borrow().Scale(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate + fn Rotate(&self, angle: f64) { + self.canvas_state.borrow().Rotate(angle) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate + fn Translate(&self, x: f64, y: f64) { + self.canvas_state.borrow().Translate(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform + fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + self.canvas_state.borrow().Transform(a, b, c, d, e, f) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform + fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + self.canvas_state.borrow().SetTransform(a, b, c, d, e, f) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform + fn ResetTransform(&self) { + self.canvas_state.borrow().ResetTransform() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath + fn ClosePath(&self) { + self.canvas_state.borrow().ClosePath() + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto + fn MoveTo(&self, x: f64, y: f64) { + self.canvas_state.borrow().MoveTo(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-lineto + fn LineTo(&self, x: f64, y: f64) { + self.canvas_state.borrow().LineTo(x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-rect + fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { + self.canvas_state.borrow().Rect(x, y, width, height) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto + fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { + self.canvas_state.borrow().QuadraticCurveTo(cpx, cpy, x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-beziercurveto + fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { + self.canvas_state + .borrow() + .BezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-arc + fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> ErrorResult { + self.canvas_state.borrow().Arc(x, y, r, start, end, ccw) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-arcto + fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> ErrorResult { + self.canvas_state.borrow().ArcTo(cp1x, cp1y, cp2x, cp2y, r) + } + + // https://html.spec.whatwg.org/multipage/#dom-context-2d-ellipse + fn Ellipse( + &self, + x: f64, + y: f64, + rx: f64, + ry: f64, + rotation: f64, + start: f64, + end: f64, + ccw: bool, + ) -> ErrorResult { + self.canvas_state + .borrow() + .Ellipse(x, y, rx, ry, rotation, start, end, ccw) + } } diff --git a/components/script/dom/paintrenderingcontext2d.rs b/components/script/dom/paintrenderingcontext2d.rs index 9454cc36c93..9bf7cc38eb4 100644 --- a/components/script/dom/paintrenderingcontext2d.rs +++ b/components/script/dom/paintrenderingcontext2d.rs @@ -21,7 +21,6 @@ use crate::dom::canvasgradient::CanvasGradient; use crate::dom::canvaspattern::CanvasPattern; use crate::dom::canvasrenderingcontext2d::CanvasRenderingContext2D; use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope; -use crate::dom::workletglobalscope::WorkletGlobalScope; use canvas_traits::canvas::CanvasImageData; use canvas_traits::canvas::CanvasMsg; use canvas_traits::canvas::FromLayoutMsg; @@ -44,16 +43,8 @@ pub struct PaintRenderingContext2D { impl PaintRenderingContext2D { fn new_inherited(global: &PaintWorkletGlobalScope) -> PaintRenderingContext2D { let size = Size2D::zero(); - let image_cache = global.image_cache(); - let base_url = global.upcast::<WorkletGlobalScope>().base_url(); PaintRenderingContext2D { - context: CanvasRenderingContext2D::new_inherited( - global.upcast(), - None, - image_cache, - base_url, - size, - ), + context: CanvasRenderingContext2D::new_inherited(global.upcast(), None, size), device_pixel_ratio: Cell::new(TypedScale::new(1.0)), } } diff --git a/components/script/dom/webidls/CanvasGradient.webidl b/components/script/dom/webidls/CanvasGradient.webidl index 406360849b2..ec00d4a73f2 100644 --- a/components/script/dom/webidls/CanvasGradient.webidl +++ b/components/script/dom/webidls/CanvasGradient.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/#canvasgradient -[Exposed=(Window, PaintWorklet)] +[Exposed=(Window, PaintWorklet, Worker)] interface CanvasGradient { // opaque object [Throws] diff --git a/components/script/dom/webidls/CanvasPattern.webidl b/components/script/dom/webidls/CanvasPattern.webidl index 156b9dee726..bfd33b082f8 100644 --- a/components/script/dom/webidls/CanvasPattern.webidl +++ b/components/script/dom/webidls/CanvasPattern.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/#canvaspattern -[Exposed=(Window, PaintWorklet)] +[Exposed=(Window, PaintWorklet, Worker)] interface CanvasPattern { //void setTransform(SVGMatrix matrix); }; diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl index 0f47448b84c..92e8b80d5ef 100644 --- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl +++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl @@ -39,14 +39,14 @@ CanvasRenderingContext2D implements CanvasPathDrawingStyles; CanvasRenderingContext2D implements CanvasTextDrawingStyles; CanvasRenderingContext2D implements CanvasPath; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasState { // state void save(); // push state on state stack void restore(); // pop state stack and restore state }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasTransform { // transformations (default transform is the identity matrix) void scale(unrestricted double x, unrestricted double y); @@ -70,21 +70,21 @@ interface CanvasTransform { void resetTransform(); }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasCompositing { // compositing attribute unrestricted double globalAlpha; // (default 1.0) attribute DOMString globalCompositeOperation; // (default source-over) }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasImageSmoothing { // image smoothing attribute boolean imageSmoothingEnabled; // (default true) // attribute ImageSmoothingQuality imageSmoothingQuality; // (default low) }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasFillStrokeStyles { // colours and styles (see also the CanvasDrawingStyles interface) attribute (DOMString or CanvasGradient or CanvasPattern) strokeStyle; // (default black) @@ -96,7 +96,7 @@ interface CanvasFillStrokeStyles { CanvasPattern createPattern(CanvasImageSource image, [TreatNullAs=EmptyString] DOMString repetition); }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasShadowStyles { // shadows attribute unrestricted double shadowOffsetX; // (default 0) @@ -105,7 +105,7 @@ interface CanvasShadowStyles { attribute DOMString shadowColor; // (default transparent black) }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasFilters { // filters //attribute DOMString filter; // (default "none") @@ -119,7 +119,7 @@ interface CanvasRect { void strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h); }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasDrawPath { // path API (see also CanvasPath) void beginPath(); @@ -145,7 +145,7 @@ interface CanvasUserInterface { //void scrollPathIntoView(Path2D path); }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasText { // text (see also the CanvasPathDrawingStyles and CanvasTextDrawingStyles interfaces) [Pref="dom.canvas-text.enabled"] @@ -156,7 +156,7 @@ interface CanvasText { //TextMetrics measureText(DOMString text); }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasDrawImage { // drawing images [Throws] @@ -171,7 +171,7 @@ interface CanvasDrawImage { unrestricted double dw, unrestricted double dh); }; -[Exposed=Window, NoInterfaceObject] +[Exposed=(Window, Worker), NoInterfaceObject] interface CanvasImageData { // pixel manipulation [Throws] @@ -193,7 +193,7 @@ enum CanvasTextAlign { "start", "end", "left", "right", "center" }; enum CanvasTextBaseline { "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" }; enum CanvasDirection { "ltr", "rtl", "inherit" }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasPathDrawingStyles { // line caps/joins attribute unrestricted double lineWidth; // (default 1) @@ -207,7 +207,7 @@ interface CanvasPathDrawingStyles { //attribute unrestricted double lineDashOffset; }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasTextDrawingStyles { // text //attribute DOMString font; // (default 10px sans-serif) @@ -217,7 +217,7 @@ interface CanvasTextDrawingStyles { //attribute CanvasDirection direction; // "ltr", "rtl", "inherit" (default: "inherit") }; -[Exposed=(PaintWorklet, Window), NoInterfaceObject] +[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject] interface CanvasPath { // shared path API methods void closePath(); diff --git a/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl b/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl index aa5b50a6a47..71b9955ee9c 100644 --- a/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl +++ b/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl @@ -8,23 +8,22 @@ interface OffscreenCanvasRenderingContext2D { //void commit(); readonly attribute OffscreenCanvas canvas; }; +OffscreenCanvasRenderingContext2D implements CanvasState; +OffscreenCanvasRenderingContext2D implements CanvasCompositing; +OffscreenCanvasRenderingContext2D implements CanvasImageSmoothing; +OffscreenCanvasRenderingContext2D implements CanvasFillStrokeStyles; +OffscreenCanvasRenderingContext2D implements CanvasShadowStyles; +OffscreenCanvasRenderingContext2D implements CanvasFilters; OffscreenCanvasRenderingContext2D implements CanvasRect; - -//OffscreenCanvasRenderingContext2D includes CanvasState; -//OffscreenCanvasRenderingContext2D includes CanvasTransform; -//OffscreenCanvasRenderingContext2D includes CanvasCompositing; -//OffscreenCanvasRenderingContext2D includes CanvasImageSmoothing; -//OffscreenCanvasRenderingContext2D includes CanvasFillStrokeStyles; -//OffscreenCanvasRenderingContext2D includes CanvasShadowStyles; -//OffscreenCanvasRenderingContext2D includes CanvasFilters; -//OffscreenCanvasRenderingContext2D includes CanvasDrawPath; -//OffscreenCanvasRenderingContext2D includes CanvasText; -//OffscreenCanvasRenderingContext2D includes CanvasDrawImage; -//OffscreenCanvasRenderingContext2D includes CanvasImageData; -//OffscreenCanvasRenderingContext2D includes CanvasPathDrawingStyles; -//OffscreenCanvasRenderingContext2D includes CanvasTextDrawingStyles; -//OffscreenCanvasRenderingContext2D includes CanvasPath; +OffscreenCanvasRenderingContext2D implements CanvasTransform; +OffscreenCanvasRenderingContext2D implements CanvasDrawPath; +OffscreenCanvasRenderingContext2D implements CanvasText; +OffscreenCanvasRenderingContext2D implements CanvasDrawImage; +OffscreenCanvasRenderingContext2D implements CanvasImageData; +OffscreenCanvasRenderingContext2D implements CanvasPathDrawingStyles; +OffscreenCanvasRenderingContext2D implements CanvasTextDrawingStyles; +OffscreenCanvasRenderingContext2D implements CanvasPath; diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 28b5715df89..3914ef59fe7 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -125,6 +125,7 @@ impl Worker { String::from(&*worker_options.name), worker_options.type_, closing, + global.image_cache(), ); Ok(worker) diff --git a/tests/wpt/metadata/html/dom/interfaces.worker.js.ini b/tests/wpt/metadata/html/dom/interfaces.worker.js.ini index 2301241aec5..10c0c22bcc9 100644 --- a/tests/wpt/metadata/html/dom/interfaces.worker.js.ini +++ b/tests/wpt/metadata/html/dom/interfaces.worker.js.ini @@ -297,9 +297,6 @@ [OffscreenCanvasRenderingContext2D interface: operation getLineDash()] expected: FAIL - [CanvasGradient interface: existence and properties of interface object] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute globalCompositeOperation] expected: FAIL @@ -348,9 +345,6 @@ [OffscreenCanvasRenderingContext2D interface: attribute shadowColor] expected: FAIL - [CanvasGradient interface: operation addColorStop(double, DOMString)] - expected: FAIL - [DedicatedWorkerGlobalScope interface: attribute name] expected: FAIL @@ -396,9 +390,6 @@ [ImageBitmap interface: existence and properties of interface prototype object's @@unscopables property] expected: FAIL - [CanvasPattern interface: existence and properties of interface prototype object's @@unscopables property] - expected: FAIL - [MessageEvent interface: operation initMessageEvent(DOMString, boolean, boolean, any, USVString, DOMString, MessageEventSource, [object Object\])] expected: FAIL @@ -429,9 +420,6 @@ [WorkerGlobalScope interface: operation createImageBitmap(ImageBitmapSource, ImageBitmapOptions)] expected: FAIL - [CanvasGradient interface object length] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation bezierCurveTo(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double)] expected: FAIL @@ -465,9 +453,6 @@ [OffscreenCanvasRenderingContext2D interface: attribute lineJoin] expected: FAIL - [CanvasPattern interface: existence and properties of interface prototype object's "constructor" property] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation rect(unrestricted double, unrestricted double, unrestricted double, unrestricted double)] expected: FAIL @@ -495,9 +480,6 @@ [OffscreenCanvas interface: attribute height] expected: FAIL - [CanvasPattern interface object name] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation setTransform(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double)] expected: FAIL @@ -534,9 +516,6 @@ [WorkerNavigator interface: self.navigator must inherit property "hardwareConcurrency" with the proper type] expected: FAIL - [CanvasGradient interface: existence and properties of interface prototype object's "constructor" property] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(Path2D, unrestricted double, unrestricted double, CanvasFillRule)] expected: FAIL @@ -546,9 +525,6 @@ [OffscreenCanvasRenderingContext2D interface: operation createImageData(long, long)] expected: FAIL - [CanvasPattern interface: existence and properties of interface prototype object] - expected: FAIL - [Path2D interface: operation lineTo(unrestricted double, unrestricted double)] expected: FAIL @@ -585,9 +561,6 @@ [OffscreenCanvasRenderingContext2D interface: operation createPattern(CanvasImageSource, DOMString)] expected: FAIL - [CanvasPattern interface: existence and properties of interface object] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation transform(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double)] expected: FAIL @@ -627,9 +600,6 @@ [Path2D interface: operation ellipse(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, boolean)] expected: FAIL - [CanvasGradient interface: existence and properties of interface prototype object's @@unscopables property] - expected: FAIL - [MessageEvent interface: new MessageEvent("message", { data: 5 }) must inherit property "ports" with the proper type] expected: FAIL @@ -687,9 +657,6 @@ [Path2D interface: operation addPath(Path2D, DOMMatrix2DInit)] expected: FAIL - [CanvasGradient interface: existence and properties of interface prototype object] - expected: FAIL - [WorkerGlobalScope interface: self must inherit property "createImageBitmap(ImageBitmapSource, long, long, long, long, ImageBitmapOptions)" with the proper type] expected: FAIL @@ -705,9 +672,6 @@ [OffscreenCanvas interface: existence and properties of interface prototype object's @@unscopables property] expected: FAIL - [CanvasPattern interface object length] - expected: FAIL - [WorkerNavigator interface: self.navigator must inherit property "languages" with the proper type] expected: FAIL @@ -720,9 +684,6 @@ [OffscreenCanvas interface: operation convertToBlob(ImageEncodeOptions)] expected: FAIL - [CanvasGradient interface object name] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation clip(CanvasFillRule)] expected: FAIL diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html.ini deleted file mode 100644 index 3dfee1c611c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.globalAlpha.default.html] - [OffscreenCanvas test: 2d.composite.globalAlpha.default] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js.ini deleted file mode 100644 index eab13534d04..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.globalAlpha.default.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html.ini deleted file mode 100644 index bb971da8573..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.globalAlpha.invalid.html] - [OffscreenCanvas test: 2d.composite.globalAlpha.invalid] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js.ini deleted file mode 100644 index a506fe0c594..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.globalAlpha.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html.ini deleted file mode 100644 index 26ffe3e956d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.range.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.globalAlpha.range.html] - [OffscreenCanvas test: 2d.composite.globalAlpha.range] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js.ini deleted file mode 100644 index 07d6e131928..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.range.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.globalAlpha.range.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html.ini deleted file mode 100644 index d1189d51043..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.casesensitive.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.casesensitive.html] - [OffscreenCanvas test: 2d.composite.operation.casesensitive] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js.ini deleted file mode 100644 index b26f140f8b1..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.casesensitive.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.casesensitive.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini new file mode 100644 index 00000000000..de667d420b0 --- /dev/null +++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini @@ -0,0 +1,4 @@ +[2d.composite.operation.clear.html] + [OffscreenCanvas test: 2d.composite.operation.clear] + expected: FAIL + diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini new file mode 100644 index 00000000000..9b0ed482eba --- /dev/null +++ b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini @@ -0,0 +1,4 @@ +[2d.composite.operation.clear.worker.html] + [2d] + expected: FAIL + diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.darker.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.darker.html.ini deleted file mode 100644 index 3399a2fca3c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.darker.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.darker.html] - [OffscreenCanvas test: 2d.composite.operation.darker] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js.ini deleted file mode 100644 index 6014e4d252d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.darker.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.darker.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.default.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.default.html.ini deleted file mode 100644 index 017d4110c7e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.default.html] - [OffscreenCanvas test: 2d.composite.operation.default] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.default.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.default.worker.js.ini deleted file mode 100644 index 7e1ab5f11c0..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.default.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.highlight.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.highlight.html.ini deleted file mode 100644 index 15c6e3915ed..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.highlight.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.highlight.html] - [OffscreenCanvas test: 2d.composite.operation.highlight] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js.ini deleted file mode 100644 index eee287682cd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.highlight.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.highlight.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html.ini deleted file mode 100644 index 131b4f2edba..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.nullsuffix.html] - [OffscreenCanvas test: 2d.composite.operation.nullsuffix] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js.ini deleted file mode 100644 index 33278955e32..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.nullsuffix.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.nullsuffix.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.over.html.ini deleted file mode 100644 index 09844222bf4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.over.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.over.html] - [OffscreenCanvas test: 2d.composite.operation.over] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.over.worker.js.ini deleted file mode 100644 index c9433ccd1a4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.over.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.over.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html.ini deleted file mode 100644 index cc675b7f873..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.unrecognised.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.unrecognised.html] - [OffscreenCanvas test: 2d.composite.operation.unrecognised] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js.ini deleted file mode 100644 index 7f5a1a9f9fc..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.unrecognised.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.operation.unrecognised.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.destination-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.destination-out.html.ini deleted file mode 100644 index bb799af2c18..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.destination-out.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.solid.destination-out.html] - [OffscreenCanvas test: 2d.composite.solid.destination-out] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js.ini deleted file mode 100644 index 4f8863ac532..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.destination-out.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.solid.destination-out.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.source-out.html.ini deleted file mode 100644 index f1c92f310f6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.source-out.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.solid.source-out.html] - [OffscreenCanvas test: 2d.composite.solid.source-out] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js.ini deleted file mode 100644 index 101bb66ceab..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.source-out.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.solid.source-out.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.xor.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.xor.html.ini deleted file mode 100644 index 7bdd705f197..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.xor.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.solid.xor.html] - [OffscreenCanvas test: 2d.composite.solid.xor] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js.ini deleted file mode 100644 index bdd739f4857..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.solid.xor.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.solid.xor.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html.ini deleted file mode 100644 index 84ab4521c71..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.copy.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js.ini deleted file mode 100644 index 37f306552c5..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.copy.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.copy.worker.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html.ini deleted file mode 100644 index da4ee21e365..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.destination-atop.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js.ini deleted file mode 100644 index e5a2a57db4a..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-atop.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.destination-atop.worker.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html.ini deleted file mode 100644 index eebb512860b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.destination-in.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js.ini deleted file mode 100644 index 6c70bf8774f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.destination-in.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.destination-in.worker.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html.ini deleted file mode 100644 index e5bc8c9691a..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.source-in.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js.ini deleted file mode 100644 index fe4d2171e32..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-in.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.source-in.worker.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html.ini deleted file mode 100644 index fe1f7462978..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.source-out.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js.ini deleted file mode 100644 index 86902705d75..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.fill.source-out.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.composite.uncovered.fill.source-out.worker.html] - [fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/conformance-requirements/2d.missingargs.html.ini b/tests/wpt/metadata/offscreen-canvas/conformance-requirements/2d.missingargs.html.ini deleted file mode 100644 index cc56c9bc2ed..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/conformance-requirements/2d.missingargs.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.missingargs.html] - [Missing arguments cause TypeError] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js.ini deleted file mode 100644 index 16c63d68959..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/conformance-requirements/2d.missingargs.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.missingargs.worker.html] - [Missing arguments cause TypeError] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini deleted file mode 100644 index ddc364f4b22..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.drawImage.clip.html] - [OffscreenCanvas test: 2d.drawImage.clip] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini deleted file mode 100644 index f387c1acd65..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.clip.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.drawImage.clip.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini deleted file mode 100644 index 0a613ba46a2..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.drawImage.path.html] - [OffscreenCanvas test: 2d.drawImage.path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini deleted file mode 100644 index e3dc6d5ad67..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.path.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.drawImage.path.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini deleted file mode 100644 index 43c1fd403c1..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.drawImage.transform.html] - [OffscreenCanvas test: 2d.drawImage.transform] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini deleted file mode 100644 index 864d3b3ba40..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.transform.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.drawImage.transform.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html.ini deleted file mode 100644 index 523f79dd067..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.basic.html] - [clearRect clears to transparent black] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js.ini deleted file mode 100644 index 37ef86f8b11..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.basic.worker.html] - [clearRect clears to transparent black] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html.ini deleted file mode 100644 index 7228e71c8f9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.globalalpha.html] - [clearRect is not affected by globalAlpha] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js.ini deleted file mode 100644 index 788a3757518..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.globalalpha.worker.html] - [clearRect is not affected by globalAlpha] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html.ini deleted file mode 100644 index 8d0098a26a7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.globalcomposite.html] - [clearRect is not affected by globalCompositeOperation] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js.ini deleted file mode 100644 index fb7993da78b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.globalcomposite.worker.html] - [clearRect is not affected by globalCompositeOperation] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html.ini deleted file mode 100644 index 786b4e678a0..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.negative.html] - [clearRect of negative sizes works] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js.ini deleted file mode 100644 index e598a5c818e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.negative.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.negative.worker.html] - [clearRect of negative sizes works] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html.ini deleted file mode 100644 index 28da42a31a5..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.transform.html] - [clearRect is affected by transforms] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js.ini deleted file mode 100644 index f4a9d6ca931..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.clearRect.transform.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.clearRect.transform.worker.html] - [clearRect is affected by transforms] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html.ini deleted file mode 100644 index 53dd2ef414a..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.globalalpha.html] - [strokeRect is affected by globalAlpha] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js.ini deleted file mode 100644 index 3354050d12f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.globalalpha.worker.html] - [strokeRect is affected by globalAlpha] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html.ini deleted file mode 100644 index 6f3282ded7c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.globalcomposite.html] - [strokeRect is not affected by globalCompositeOperation] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js.ini deleted file mode 100644 index f47dc3da8d6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.globalcomposite.worker.html] - [strokeRect is not affected by globalCompositeOperation] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html.ini deleted file mode 100644 index 3bfa8a111c7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.zero.1.html] - [strokeRect of 0x0 pixels draws nothing] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js.ini deleted file mode 100644 index f8cac68a527..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.zero.1.worker.html] - [strokeRect of 0x0 pixels draws nothing] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html.ini deleted file mode 100644 index 096a763ec04..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.zero.2.html] - [strokeRect of 0x0 pixels draws nothing, including caps and joins] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js.ini deleted file mode 100644 index 0fee6a2f534..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.zero.2.worker.html] - [strokeRect of 0x0 pixels draws nothing, including caps and joins] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html.ini deleted file mode 100644 index 0cc2e94ab38..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.zero.4.html] - [strokeRect of Nx0 pixels draws a closed line with no caps] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js.ini deleted file mode 100644 index b0c23cf9afd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeRect.zero.4.worker.html] - [strokeRect of Nx0 pixels draws a closed line with no caps] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html.ini deleted file mode 100644 index d5e4a14741b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.default.html] - [OffscreenCanvas test: 2d.fillStyle.default] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js.ini deleted file mode 100644 index 1023e66e472..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.default.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html.ini deleted file mode 100644 index 35ba79c7db9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.get.semitransparent.html] - [OffscreenCanvas test: 2d.fillStyle.get.semitransparent] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js.ini deleted file mode 100644 index 3ff46291875..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.get.semitransparent.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html.ini deleted file mode 100644 index 1e19a14f5e3..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.get.solid.html] - [OffscreenCanvas test: 2d.fillStyle.get.solid] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js.ini deleted file mode 100644 index 7826dc5e41d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.solid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.get.solid.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html.ini deleted file mode 100644 index f40b77f521c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.get.transparent.html] - [OffscreenCanvas test: 2d.fillStyle.get.transparent] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js.ini deleted file mode 100644 index 19705ab487a..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.get.transparent.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.get.transparent.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html.ini deleted file mode 100644 index 808374de5b7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.hsla-clamp-6.html] - [OffscreenCanvas test: 2d.fillStyle.parse.hsla-clamp-6] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js.ini deleted file mode 100644 index 0e2ef511f9e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.hsla-clamp-6.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html.ini deleted file mode 100644 index 9ea1a0ff765..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.rgba-clamp-1.html] - [OffscreenCanvas test: 2d.fillStyle.parse.rgba-clamp-1] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js.ini deleted file mode 100644 index 0cde7c0b47d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.rgba-clamp-1.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html.ini deleted file mode 100644 index f9d00d9eb86..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.transparent-1.html] - [OffscreenCanvas test: 2d.fillStyle.parse.transparent-1] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js.ini deleted file mode 100644 index dbc1586755b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.transparent-1.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html.ini deleted file mode 100644 index 6944ac66536..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.transparent-2.html] - [OffscreenCanvas test: 2d.fillStyle.parse.transparent-2] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js.ini deleted file mode 100644 index acbbeabc51f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.fillStyle.parse.transparent-2.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html.ini deleted file mode 100644 index c84f1f030c4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.object.compare.html] - [OffscreenCanvas test: 2d.gradient.object.compare] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js.ini deleted file mode 100644 index 4596194eaf5..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.compare.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.object.compare.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html.ini deleted file mode 100644 index fc40b8809c0..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.object.invalidcolour.html] - [OffscreenCanvas test: 2d.gradient.object.invalidcolour] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js.ini deleted file mode 100644 index b0d9b5c9911..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidcolour.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.object.invalidcolour.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html.ini deleted file mode 100644 index edbb671f16d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.object.invalidoffset.html] - [OffscreenCanvas test: 2d.gradient.object.invalidoffset] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js.ini deleted file mode 100644 index 7b081f066a2..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.object.invalidoffset.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.object.invalidoffset.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html.ini deleted file mode 100644 index 3e6e3339c78..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.radial.negative.html] - [createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js.ini deleted file mode 100644 index f496c9c89b5..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.gradient.radial.negative.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.gradient.radial.negative.worker.html] - [createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html.ini deleted file mode 100644 index 0faa767cef0..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeStyle.default.html] - [OffscreenCanvas test: 2d.strokeStyle.default] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js.ini deleted file mode 100644 index 6530b291aa9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.strokeStyle.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.strokeStyle.default.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.html.ini b/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.html.ini index d4ae438e9c5..238d59160e2 100644 --- a/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.html.ini +++ b/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.html.ini @@ -2,9 +2,6 @@ [Test that imageSmoothingEnabled = false (nearest-neighbor interpolation) works with stroke() and createPattern().] expected: FAIL - [When the context is created, imageSmoothingEnabled must be set to true.] - expected: FAIL - [Test that imageSmoothingEnabled = false (nearest-neighbor interpolation) works with drawImage().] expected: FAIL diff --git a/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.worker.js.ini index f3efdb61c21..41f3cd168b2 100644 --- a/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.worker.js.ini +++ b/tests/wpt/metadata/offscreen-canvas/image-smoothing/image.smoothing.worker.js.ini @@ -2,9 +2,6 @@ [Test that imageSmoothingEnabled = false (nearest-neighbor interpolation) works with stroke() and createPattern().] expected: FAIL - [When the context is created, imageSmoothingEnabled must be set to true.] - expected: FAIL - [Test that imageSmoothingEnabled = false (nearest-neighbor interpolation) works with drawImage().] expected: FAIL diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.cap.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.cap.invalid.html.ini deleted file mode 100644 index 27875c87436..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.cap.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.cap.invalid.html] - [Setting lineCap to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js.ini deleted file mode 100644 index b5cecb19a1e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.cap.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.cap.invalid.worker.html] - [Setting lineCap to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.defaults.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.defaults.html.ini deleted file mode 100644 index 20d04dae0db..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.defaults.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.defaults.html] - [OffscreenCanvas test: 2d.line.defaults] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.defaults.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.defaults.worker.js.ini deleted file mode 100644 index 0762d1d60bf..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.defaults.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.defaults.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.join.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.join.invalid.html.ini deleted file mode 100644 index 1109b7a38f1..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.join.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.join.invalid.html] - [Setting lineJoin to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js.ini deleted file mode 100644 index 46eb383b55a..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.join.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.join.invalid.worker.html] - [Setting lineJoin to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.invalid.html.ini deleted file mode 100644 index 3a01b53509e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.miter.invalid.html] - [Setting miterLimit to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js.ini deleted file mode 100644 index d2e955cf939..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.miter.invalid.worker.html] - [Setting miterLimit to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.valid.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.valid.html.ini deleted file mode 100644 index dce18f01342..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.valid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.miter.valid.html] - [Setting miterLimit to valid values works] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js.ini deleted file mode 100644 index 8302498c56e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.miter.valid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.miter.valid.worker.html] - [Setting miterLimit to valid values works] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.invalid.html.ini deleted file mode 100644 index fd969612655..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.width.invalid.html] - [Setting lineWidth to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js.ini deleted file mode 100644 index c9a5166366e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.width.invalid.worker.html] - [Setting lineWidth to invalid values is ignored] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.valid.html.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.valid.html.ini deleted file mode 100644 index 02e6345e520..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.valid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.width.valid.html] - [Setting lineWidth to valid values works] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.valid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.valid.worker.js.ini deleted file mode 100644 index 6a875bde40f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/line-styles/2d.line.width.valid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.line.width.valid.worker.html] - [Setting lineWidth to valid values works] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arc.negative.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arc.negative.html.ini deleted file mode 100644 index 4b585270b2e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arc.negative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.arc.negative.html] - [arc() with negative radius throws INDEX_SIZE_ERR] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js.ini deleted file mode 100644 index ac7a3a23e80..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arc.negative.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.arc.negative.worker.html] - [arc() with negative radius throws INDEX_SIZE_ERR] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arcTo.negative.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arcTo.negative.html.ini deleted file mode 100644 index fef6c797f0e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arcTo.negative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.arcTo.negative.html] - [arcTo() with negative radius throws an exception] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js.ini deleted file mode 100644 index e47251dbcd1..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.arcTo.negative.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.arcTo.negative.worker.html] - [arcTo() with negative radius throws an exception] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html.ini deleted file mode 100644 index e42e4e4e747..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.arc.html] - [isPointInPath() works on arcs] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js.ini deleted file mode 100644 index 62635813ba7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.arc.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.arc.worker.html] - [isPointInPath() works on arcs] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html.ini deleted file mode 100644 index bc184542ddc..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.basic.1.html] - [isPointInPath() detects whether the point is inside the path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js.ini deleted file mode 100644 index efe813197e2..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.1.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.basic.1.worker.html] - [isPointInPath() detects whether the point is inside the path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html.ini deleted file mode 100644 index c2f9b9d0a5f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.basic.2.html] - [isPointInPath() detects whether the point is inside the path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js.ini deleted file mode 100644 index c52eaeecfba..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.basic.2.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.basic.2.worker.html] - [isPointInPath() detects whether the point is inside the path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html.ini deleted file mode 100644 index 1f5631c4a15..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.bezier.html] - [isPointInPath() works on Bezier curves] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js.ini deleted file mode 100644 index f8c74a90cfd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bezier.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.bezier.worker.html] - [isPointInPath() works on Bezier curves] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html.ini deleted file mode 100644 index cda5f0d68ff..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.bigarc.html] - [isPointInPath() works on unclosed arcs larger than 2pi] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js.ini deleted file mode 100644 index 9954a55e1f6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.bigarc.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.bigarc.worker.html] - [isPointInPath() works on unclosed arcs larger than 2pi] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html.ini deleted file mode 100644 index 3c9b541ae6f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.edge.html] - [isPointInPath() counts points on the path as being inside] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js.ini deleted file mode 100644 index be2bfe962f1..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.edge.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.edge.worker.html] - [isPointInPath() counts points on the path as being inside] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html.ini deleted file mode 100644 index af2b5fda3bd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.empty.html] - [isPointInPath() works when there is no path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js.ini deleted file mode 100644 index 010b5325757..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.empty.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.empty.worker.html] - [isPointInPath() works when there is no path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html.ini deleted file mode 100644 index 3e0bf6c8368..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.nonfinite.html] - [isPointInPath() returns false for non-finite arguments] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js.ini deleted file mode 100644 index ae66ad028f6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.nonfinite.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.nonfinite.worker.html] - [isPointInPath() returns false for non-finite arguments] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html.ini deleted file mode 100644 index 6478da5d0be..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.outside.html] - [isPointInPath() works on paths outside the canvas] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js.ini deleted file mode 100644 index 76910437217..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.outside.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.outside.worker.html] - [isPointInPath() works on paths outside the canvas] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html.ini deleted file mode 100644 index 37b6b70fe67..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.subpath.html] - [isPointInPath() uses the current path, not just the subpath] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js.ini deleted file mode 100644 index 816f85e3acd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.subpath.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.subpath.worker.html] - [isPointInPath() uses the current path, not just the subpath] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html.ini deleted file mode 100644 index 52c478188ee..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.1.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js.ini deleted file mode 100644 index f3ad5ee613b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.1.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.1.worker.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html.ini deleted file mode 100644 index 32f5fff9a70..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.2.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js.ini deleted file mode 100644 index 245e2c1ad4b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.2.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.2.worker.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html.ini deleted file mode 100644 index dbc6ca93496..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.3.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js.ini deleted file mode 100644 index 7b175cdddbd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.3.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.3.worker.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html.ini deleted file mode 100644 index 952fde695c4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.4.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js.ini deleted file mode 100644 index f858268a7db..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.transform.4.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.transform.4.worker.html] - [isPointInPath() handles transformations correctly] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html.ini deleted file mode 100644 index f58d77a38e1..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.unclosed.html] - [isPointInPath() works on unclosed subpaths] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js.ini deleted file mode 100644 index 7fc8caf8d81..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.unclosed.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.unclosed.worker.html] - [isPointInPath() works on unclosed subpaths] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html.ini deleted file mode 100644 index 447af885eac..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.winding.html] - [isPointInPath() uses the non-zero winding number rule] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js.ini deleted file mode 100644 index 22bd990f2f9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.isPointInPath.winding.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.isPointInPath.winding.worker.html] - [isPointInPath() uses the non-zero winding number rule] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html.ini deleted file mode 100644 index f27d0f296ed..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.lineTo.nonfinite.details.html] - [lineTo() with Infinity/NaN for first arg still converts the second arg] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js.ini deleted file mode 100644 index ba8184f4b8c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/path-objects/2d.path.lineTo.nonfinite.details.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.path.lineTo.nonfinite.details.worker.html] - [lineTo() with Infinity/NaN for first arg still converts the second arg] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html.ini deleted file mode 100644 index 7241b02429f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create1.basic.html] - [createImageData(imgdata) exists and returns something] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js.ini deleted file mode 100644 index bcac4caa174..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create1.basic.worker.html] - [createImageData(imgdata) exists and returns something] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html.ini deleted file mode 100644 index 51020b1e69d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create1.initial.html] - [createImageData(imgdata) returns transparent black data of the right size] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js.ini deleted file mode 100644 index e27ce5916ee..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create1.initial.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create1.initial.worker.html] - [createImageData(imgdata) returns transparent black data of the right size] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html.ini deleted file mode 100644 index 87b91fed437..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.basic.html] - [createImageData(sw, sh) exists and returns something] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js.ini deleted file mode 100644 index 0d766c5600e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.basic.worker.html] - [createImageData(sw, sh) exists and returns something] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html.ini deleted file mode 100644 index 447757c50ce..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.initial.html] - [createImageData(sw, sh) returns transparent black data of the right size] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js.ini deleted file mode 100644 index fc7e2f85b6e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.initial.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.initial.worker.html] - [createImageData(sw, sh) returns transparent black data of the right size] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html.ini deleted file mode 100644 index 3665e5303aa..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.large.html] - [createImageData(sw, sh) works for sizes much larger than the canvas] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js.ini deleted file mode 100644 index 29c749a6098..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.large.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.large.worker.html] - [createImageData(sw, sh) works for sizes much larger than the canvas] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html.ini deleted file mode 100644 index f19f18bd71b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.negative.html] - [createImageData(sw, sh) takes the absolute magnitude of the size arguments] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js.ini deleted file mode 100644 index 935ba1ddb8f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.negative.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.negative.worker.html] - [createImageData(sw, sh) takes the absolute magnitude of the size arguments] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini new file mode 100644 index 00000000000..8e7dad6133e --- /dev/null +++ b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini @@ -0,0 +1,4 @@ +[2d.imageData.create2.nonfinite.html] + [createImageData() throws TypeError if arguments are not finite] + expected: FAIL + diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js.ini new file mode 100644 index 00000000000..e8ad049fd30 --- /dev/null +++ b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js.ini @@ -0,0 +1,4 @@ +[2d.imageData.create2.nonfinite.worker.html] + [createImageData() throws TypeError if arguments are not finite] + expected: FAIL + diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html.ini deleted file mode 100644 index a12b09516d5..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.round.html] - [createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js.ini deleted file mode 100644 index e1e178b6139..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.round.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.round.worker.html] - [createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html.ini deleted file mode 100644 index 616a9902d83..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.zero.html] - [createImageData(sw, sh) throws INDEX_SIZE_ERR if size is zero] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js.ini deleted file mode 100644 index 6100902ad9f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.create2.zero.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.create2.zero.worker.html] - [createImageData(sw, sh) throws INDEX_SIZE_ERR if size is zero] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html.ini deleted file mode 100644 index 1d28cb78a6f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.basic.html] - [getImageData() exists and returns something] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js.ini deleted file mode 100644 index c904d9d62ae..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.basic.worker.html] - [getImageData() exists and returns something] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html.ini deleted file mode 100644 index 5cb6b2590a4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.length.html] - [getImageData() returns a correctly-sized Uint8ClampedArray] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js.ini deleted file mode 100644 index 4dac48516a4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.length.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.length.worker.html] - [getImageData() returns a correctly-sized Uint8ClampedArray] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html.ini new file mode 100644 index 00000000000..8ecd9e5dc7f --- /dev/null +++ b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.html.ini @@ -0,0 +1,4 @@ +[2d.imageData.get.nonfinite.html] + [getImageData() throws TypeError if arguments are not finite] + expected: FAIL + diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js.ini new file mode 100644 index 00000000000..7a555682cf0 --- /dev/null +++ b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.nonfinite.worker.js.ini @@ -0,0 +1,4 @@ +[2d.imageData.get.nonfinite.worker.html] + [getImageData() throws TypeError if arguments are not finite] + expected: FAIL + diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html.ini deleted file mode 100644 index 4de97ca275e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.source.size.html] - [getImageData() returns bigger ImageData for bigger source rectangle] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js.ini deleted file mode 100644 index a16be7db011..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.source.size.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.source.size.worker.html] - [getImageData() returns bigger ImageData for bigger source rectangle] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html.ini deleted file mode 100644 index 9fc3b2fad5e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.zero.html] - [getImageData() throws INDEX_SIZE_ERR if size is zero] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js.ini deleted file mode 100644 index 8dde01baaae..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.get.zero.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.get.zero.worker.html] - [getImageData() throws INDEX_SIZE_ERR if size is zero] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html.ini deleted file mode 100644 index ca443fe9946..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.clamp.html] - [ImageData.data clamps numbers to [0, 255\]] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js.ini deleted file mode 100644 index a8b4cd6b7f2..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.clamp.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.clamp.worker.html] - [ImageData.data clamps numbers to [0, 255\]] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html.ini deleted file mode 100644 index 3f99b410b24..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.nan.html] - [ImageData.data converts NaN to 0] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js.ini deleted file mode 100644 index 9a9c9f01401..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.nan.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.nan.worker.html] - [ImageData.data converts NaN to 0] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html.ini deleted file mode 100644 index c54f3dce7ed..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.properties.html] - [ImageData objects have the right properties] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js.ini deleted file mode 100644 index 153ce5bc565..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.properties.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.properties.worker.html] - [ImageData objects have the right properties] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html.ini deleted file mode 100644 index 2450b88dbc9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.readonly.html] - [ImageData objects properties are read-only] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js.ini deleted file mode 100644 index 199b334c19b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.readonly.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.readonly.worker.html] - [ImageData objects properties are read-only] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html.ini deleted file mode 100644 index ee47dd9d566..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.round.html] - [ImageData.data rounds numbers with round-to-zero] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js.ini deleted file mode 100644 index 83f49ef7d55..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.round.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.round.worker.html] - [ImageData.data rounds numbers with round-to-zero] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html.ini deleted file mode 100644 index 0f813ce5568..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.set.html] - [ImageData.data can be modified] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js.ini deleted file mode 100644 index 1311c661512..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.set.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.set.worker.html] - [ImageData.data can be modified] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html.ini deleted file mode 100644 index 6cb5561ca0d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.string.html] - [ImageData.data converts strings to numbers with ToNumber] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js.ini deleted file mode 100644 index a80a0b7c245..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.string.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.string.worker.html] - [ImageData.data converts strings to numbers with ToNumber] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html.ini deleted file mode 100644 index 8a012774d58..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.undefined.html] - [ImageData.data converts undefined to 0] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js.ini deleted file mode 100644 index 213bb8dcd92..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.object.undefined.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.object.undefined.worker.html] - [ImageData.data converts undefined to 0] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html.ini deleted file mode 100644 index 2cec1487d8c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.put.unchanged.html] - [putImageData(getImageData(...), ...) has no effect] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js.ini deleted file mode 100644 index e1a7370a528..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/pixel-manipulation/2d.imageData.put.unchanged.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.imageData.put.unchanged.worker.html] - [putImageData(getImageData(...), ...) has no effect] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html.ini deleted file mode 100644 index 9bdc5045fed..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowBlur.initial.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowBlur.initial] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js.ini deleted file mode 100644 index 49c9ac0080d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.initial.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowBlur.initial.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html.ini deleted file mode 100644 index db24d21d4ab..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowBlur.invalid.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowBlur.invalid] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js.ini deleted file mode 100644 index 4d7f95797bd..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowBlur.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowBlur.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html.ini deleted file mode 100644 index 3650ca10eaa..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowColor.initial.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowColor.initial] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js.ini deleted file mode 100644 index b017ad5a13f..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.initial.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowColor.initial.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html.ini deleted file mode 100644 index 98623b3e1e7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowColor.invalid.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowColor.invalid] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js.ini deleted file mode 100644 index 069be9d72d0..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowColor.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html.ini deleted file mode 100644 index f31b78dc2ef..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowColor.valid.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowColor.valid] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js.ini deleted file mode 100644 index 25695c5060c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowColor.valid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowColor.valid.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html.ini deleted file mode 100644 index c243a612d2b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowOffset.initial.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowOffset.initial] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js.ini deleted file mode 100644 index 87f855a3640..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.initial.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowOffset.initial.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html.ini deleted file mode 100644 index 4616026a669..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowOffset.invalid.html] - [OffscreenCanvas test: 2d.shadow.attributes.shadowOffset.invalid] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js.ini deleted file mode 100644 index 15060ae1406..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.attributes.shadowOffset.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.shadow.attributes.shadowOffset.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini deleted file mode 100644 index b28e435ff8b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.repeat.html] - [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini deleted file mode 100644 index 7dec0caa9d7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/text/2d.text.draw.fontface.repeat.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.repeat.worker.html] - [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html.ini deleted file mode 100644 index d147a65ba33..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.fillStyle.html] - [save()/restore() works for fillStyle] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js.ini deleted file mode 100644 index 49be1d300f9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.fillStyle.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.fillStyle.worker.html] - [save()/restore() works for fillStyle] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html.ini deleted file mode 100644 index 2feb190d573..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.globalAlpha.html] - [save()/restore() works for globalAlpha] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js.ini deleted file mode 100644 index 1e9c3d10a23..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalAlpha.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.globalAlpha.worker.html] - [save()/restore() works for globalAlpha] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html.ini deleted file mode 100644 index 1a20a398a58..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.globalCompositeOperation.html] - [save()/restore() works for globalCompositeOperation] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js.ini deleted file mode 100644 index 12c9db80203..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.globalCompositeOperation.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.globalCompositeOperation.worker.html] - [save()/restore() works for globalCompositeOperation] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html.ini deleted file mode 100644 index bad5a6eecc4..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.lineCap.html] - [save()/restore() works for lineCap] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js.ini deleted file mode 100644 index fb138583f6c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineCap.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.lineCap.worker.html] - [save()/restore() works for lineCap] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html.ini deleted file mode 100644 index 3626cdd5be5..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.lineJoin.html] - [save()/restore() works for lineJoin] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js.ini deleted file mode 100644 index f69ebb248e0..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineJoin.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.lineJoin.worker.html] - [save()/restore() works for lineJoin] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html.ini deleted file mode 100644 index 25535d04433..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.lineWidth.html] - [save()/restore() works for lineWidth] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js.ini deleted file mode 100644 index 1ec4f1ff15b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.lineWidth.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.lineWidth.worker.html] - [save()/restore() works for lineWidth] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html.ini deleted file mode 100644 index e830c56b74a..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.miterLimit.html] - [save()/restore() works for miterLimit] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js.ini deleted file mode 100644 index 83e23c261c8..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.miterLimit.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.miterLimit.worker.html] - [save()/restore() works for miterLimit] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html.ini deleted file mode 100644 index 1aa0e4bfbbf..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowBlur.html] - [save()/restore() works for shadowBlur] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js.ini deleted file mode 100644 index 16ccfd4bba7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowBlur.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowBlur.worker.html] - [save()/restore() works for shadowBlur] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html.ini deleted file mode 100644 index 2271f2ea844..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowColor.html] - [save()/restore() works for shadowColor] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js.ini deleted file mode 100644 index 17102bd25f2..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowColor.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowColor.worker.html] - [save()/restore() works for shadowColor] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html.ini deleted file mode 100644 index 2b9eb819bd6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowOffsetX.html] - [save()/restore() works for shadowOffsetX] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js.ini deleted file mode 100644 index 210b010ad4e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetX.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowOffsetX.worker.html] - [save()/restore() works for shadowOffsetX] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html.ini deleted file mode 100644 index 3beb3b2d8f6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowOffsetY.html] - [save()/restore() works for shadowOffsetY] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js.ini deleted file mode 100644 index 390dd49490d..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.shadowOffsetY.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.shadowOffsetY.worker.html] - [save()/restore() works for shadowOffsetY] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html.ini deleted file mode 100644 index 760d686f72c..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.stack.html] - [save()/restore() can be nested as a stack] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js.ini deleted file mode 100644 index 9180fc9d155..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stack.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.stack.worker.html] - [save()/restore() can be nested as a stack] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html.ini deleted file mode 100644 index f8c0539bbc6..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.stackdepth.html] - [save()/restore() stack depth is not unreasonably limited] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js.ini deleted file mode 100644 index 2f1bf575960..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.stackdepth.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.stackdepth.worker.html] - [save()/restore() stack depth is not unreasonably limited] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html.ini deleted file mode 100644 index 9ae9fbe097b..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.strokeStyle.html] - [save()/restore() works for strokeStyle] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js.ini deleted file mode 100644 index a3a87bb8be9..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.strokeStyle.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.strokeStyle.worker.html] - [save()/restore() works for strokeStyle] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html.ini deleted file mode 100644 index aef17daa8ff..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.underflow.html] - [restore() with an empty stack has no effect] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js.ini deleted file mode 100644 index 6d32228d2e7..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-canvas-state/2d.state.saverestore.underflow.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.state.saverestore.underflow.worker.html] - [restore() with an empty stack has no effect] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.colour.html.ini b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.colour.html.ini deleted file mode 100644 index 0408c435219..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.colour.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[initial.colour.html] - [Initial state is transparent black] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js.ini deleted file mode 100644 index 5d282718e5e..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.colour.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[initial.colour.worker.html] - [Initial state is transparent black] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html.ini b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html.ini deleted file mode 100644 index a709122fe61..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.reset.path.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[initial.reset.path.html] - [Resetting the canvas state resets the current path] - expected: FAIL - diff --git a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js.ini deleted file mode 100644 index 660b0c5e4de..00000000000 --- a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/initial.reset.path.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[initial.reset.path.worker.html] - [Resetting the canvas state resets the current path] - expected: FAIL - diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini index 63d23f44de7..93c90041ccf 100644 --- a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini +++ b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini @@ -65,10 +65,3 @@ [The IDBTransaction interface object should be exposed.] expected: FAIL - - [The CanvasGradient interface object should be exposed.] - expected: FAIL - - [The CanvasPattern interface object should be exposed.] - expected: FAIL - diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index f12353058f9..12fbfd218c4 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -20314,7 +20314,7 @@ "support" ], "mozilla/interfaces.worker.js": [ - "a5f2e00f234ea66b80e8a9bd4dbbc5433926191f", + "d14b58eb87568f05c398ae6953d4a0c17943219b", "testharness" ], "mozilla/invalid-this.html": [ diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js b/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js index a5f2e00f234..d14b58eb875 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js @@ -8,6 +8,8 @@ importScripts("interfaces.js"); // IMPORTANT: Do not change the list below without review from a DOM peer! test_interfaces([ "Blob", + "CanvasGradient", + "CanvasPattern", "CloseEvent", "DOMMatrix", "DOMMatrixReadOnly", |