Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Setting current color to black if canvas is not rendered in document

Browse source
This commit is contained in:
David Raifaizen 2016-04-16 12:13:13 -04:00
parent 69acd8e1cc
commit b5159dc7ff
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -486,11 +486,29 @@ impl CanvasRenderingContext2D {
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
// TODO: will need to check that the context bitmap mode is fixed
// once we implement CanvasProxy
let window = window_from_node(&*self.canvas);
let style = window.GetComputedStyle(&*self.canvas.upcast(), None);
self.parse_color(&style.GetPropertyValue(DOMString::from("color")))
let element_not_rendered =
!self.canvas.upcast::<Node>().is_in_doc() ||
style.GetPropertyValue(DOMString::from("display")) == "none";
if element_not_rendered {
Ok(RGBA {
red: 0.0,
green: 0.0,
blue: 0.0,
alpha: 1.0,
})
} else {
self.parse_color(&style.GetPropertyValue(DOMString::from("color")))
}
},
_ => Err(())
}

6
tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html.ini
View file

@ -1,6 +0,0 @@
[2d.fillStyle.parse.current.removed.html]
type: testharness
bug: https://github.com/servo/servo/issues/10601
[currentColor is solid black when the canvas element is not in a document]
expected: FAIL