auto merge of #5302 : mmatyas/servo/canvas_stroke, r=jdm

This is the servo side patch of servo/rust-azure#149.

2 files changed, 5 insertions, 1 deletions

diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 37108922fc5..6a3689e1459 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -311,6 +311,10 @@ impl<'a> CanvasRenderingContext2DMethods for JSRef<'a, CanvasRenderingContext2D>
         self.renderer.send(CanvasMsg::Fill).unwrap();
     }
 
+    fn Stroke(self) {
+        self.renderer.send(CanvasMsg::Stroke).unwrap();
+    }
+
     // https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-drawimage
     fn DrawImage(self, image: HTMLCanvasElementOrCanvasRenderingContext2D,
                  dx: f64, dy: f64) -> Fallible<()> {
diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index 6d686307f46..a3d40dc7c52 100644
--- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -82,7 +82,7 @@ interface CanvasRenderingContext2D {
   void beginPath();
   void fill(optional CanvasWindingRule fillRule = "nonzero");
   //void fill(Path2D path, optional CanvasWindingRule fillRule = "nonzero");
-  //void stroke();
+  void stroke();
   //void stroke(Path2D path);
   //void drawSystemFocusRing(Element element);
   //void drawSystemFocusRing(Path2D path, Element element);