diff options
author | Alberto Corona <ac@albertocorona.com> | 2015-10-20 19:23:29 -0500 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2015-12-29 10:38:00 -0500 |
commit | e6a3c16e9a4913d20e19039123103d5113114375 (patch) | |
tree | 6629fcc49e4805c591b598b59c3051bc7d7b0c3e /components/script/dom/canvasrenderingcontext2d.rs | |
parent | c1cb9403a7bfa9720c653c333134b55fc214c746 (diff) | |
download | servo-e6a3c16e9a4913d20e19039123103d5113114375.tar.gz servo-e6a3c16e9a4913d20e19039123103d5113114375.zip |
Enable Pattern variant of CanvasFillOrStrokeStyle
Closes #7608
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
-rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 05a4b875852..4167bf9d4cd 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -50,10 +50,11 @@ use util::vec::byte_swap; #[must_root] #[derive(JSTraceable, Clone, HeapSizeOf)] +#[allow(dead_code)] enum CanvasFillOrStrokeStyle { Color(RGBA), Gradient(JS<CanvasGradient>), - // Pattern(JS<CanvasPattern>), // https://github.com/servo/servo/pull/6157 + Pattern(JS<CanvasPattern>), } // https://html.spec.whatwg.org/multipage/#canvasrenderingcontext2d @@ -922,6 +923,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { CanvasFillOrStrokeStyle::Gradient(ref gradient) => { StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(Root::from_ref(&*gradient)) }, + CanvasFillOrStrokeStyle::Pattern(ref pattern) => { + StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(Root::from_ref(&*pattern)) + } } } @@ -966,6 +970,9 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { CanvasFillOrStrokeStyle::Gradient(ref gradient) => { StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(Root::from_ref(&*gradient)) }, + CanvasFillOrStrokeStyle::Pattern(ref pattern) => { + StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(Root::from_ref(&*pattern)) + } } } |