Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9130 - iszak:issue-9081, r=nox

Browse source 
Fixes https://github.com/servo/servo/issues/9081

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9130)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-03 06:27:54 +05:30
commit 1ac330837f
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -949,6 +949,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
self.ipc_renderer.send(msg).unwrap(); self.ipc_renderer.send(msg).unwrap();
}, },
StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(pattern) => { StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(pattern) => {
self.state.borrow_mut().stroke_style =
CanvasFillOrStrokeStyle::Pattern(JS::from_ref(pattern.r()));
let msg = CanvasMsg::Canvas2d( let msg = CanvasMsg::Canvas2d(
Canvas2dMsg::SetStrokeStyle(pattern.to_fill_or_stroke_style())); Canvas2dMsg::SetStrokeStyle(pattern.to_fill_or_stroke_style()));
self.ipc_renderer.send(msg).unwrap(); self.ipc_renderer.send(msg).unwrap();
@ -996,6 +998,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
self.ipc_renderer.send(msg).unwrap(); self.ipc_renderer.send(msg).unwrap();
} }
StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(pattern) => { StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(pattern) => {
self.state.borrow_mut().fill_style =
CanvasFillOrStrokeStyle::Pattern(JS::from_rooted(&pattern));
let msg = CanvasMsg::Canvas2d( let msg = CanvasMsg::Canvas2d(
Canvas2dMsg::SetFillStyle(pattern.to_fill_or_stroke_style())); Canvas2dMsg::SetFillStyle(pattern.to_fill_or_stroke_style()));
self.ipc_renderer.send(msg).unwrap(); self.ipc_renderer.send(msg).unwrap();

6
tests/wpt/mozilla/meta/mozilla/canvas/fill_and_stroke_getters_setters.html.ini
View file

@ -1,6 +0,0 @@
[fill_and_stroke_getters_setters.html]
type: testharness
[strokeStyle roundtrips with \[object CanvasPattern\]]
expected: FAIL
[fillStyle roundtrips with \[object CanvasPattern\]]
expected: FAIL