From e6a3c16e9a4913d20e19039123103d5113114375 Mon Sep 17 00:00:00 2001 From: Alberto Corona Date: Tue, 20 Oct 2015 19:23:29 -0500 Subject: [PATCH] Enable Pattern variant of CanvasFillOrStrokeStyle Closes #7608 --- components/script/dom/canvasrenderingcontext2d.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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), - // Pattern(JS), // https://github.com/servo/servo/pull/6157 + Pattern(JS), } // 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)) + } } }