Define ctx.ellipse separately from polyfilling Path2D.

Also use a real SVGMatrix for unit tests.

.gitignore

@@ -0,0 +1 @@
+node_modules/

canvas.js

@@ -9,6 +9,17 @@
  * A polyfill for HTML Canvas features, including
  * Path2D support.
  */
+if (CanvasRenderingContext2D.prototype.ellipse == undefined) {
+  CanvasRenderingContext2D.prototype.ellipse = function(x, y, radiusX, radiusY, rotation, startAngle, endAngle, antiClockwise) {
+    this.save();
+    this.translate(x, y);
+    this.rotate(rotation);
+    this.scale(radiusX, radiusY);
+    this.arc(0, 0, 1, startAngle, endAngle, antiClockwise);
+    this.restore();
+  }
+}
+
 if (typeof Path2D !== 'function') {
   (function() {
 
@@ -2100,16 +2111,6 @@ if (typeof Path2D !== 'function') {
 
     // TODO(jcgregorio) test for arcTo and implement via something.
 
-    if (CanvasRenderingContext2D.prototype.ellipse == undefined) {
-      CanvasRenderingContext2D.prototype.ellipse = function(x, y, radiusX, radiusY, rotation, startAngle, endAngle, antiClockwise) {
-        this.save();
-        this.translate(x, y);
-        this.rotate(rotation);
-        this.scale(radiusX, radiusY);
-        this.arc(0, 0, 1, startAngle, endAngle, antiClockwise);
-        this.restore();
-      }
-    }
 
     // Path methods that map simply to the CanvasRenderingContext2D.
     var simple_mapping = [

canvasv5.js

@@ -9,6 +9,17 @@
  * A polyfill for HTML Canvas features, including
  * Path2D support.
  */
+if (CanvasRenderingContext2D.prototype.ellipse == undefined) {
+  CanvasRenderingContext2D.prototype.ellipse = function(x, y, radiusX, radiusY, rotation, startAngle, endAngle, antiClockwise) {
+    this.save();
+    this.translate(x, y);
+    this.rotate(rotation);
+    this.scale(radiusX, radiusY);
+    this.arc(0, 0, 1, startAngle, endAngle, antiClockwise);
+    this.restore();
+  }
+}
+
 if (typeof Path2D !== 'function') {
   (function() {
 
@@ -35,16 +46,6 @@ if (typeof Path2D !== 'function') {
 
     // TODO(jcgregorio) test for arcTo and implement via something.
 
-    if (CanvasRenderingContext2D.prototype.ellipse == undefined) {
-      CanvasRenderingContext2D.prototype.ellipse = function(x, y, radiusX, radiusY, rotation, startAngle, endAngle, antiClockwise) {
-        this.save();
-        this.translate(x, y);
-        this.rotate(rotation);
-        this.scale(radiusX, radiusY);
-        this.arc(0, 0, 1, startAngle, endAngle, antiClockwise);
-        this.restore();
-      }
-    }
 
     // Path methods that map simply to the CanvasRenderingContext2D.
     var simple_mapping = [
@@ -171,3 +172,4 @@ if (typeof Path2D !== 'function') {
     Path2D = Path_;
   })();
 }
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvas-5-polyfill",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Polyfill for HTML 5 Canvas features.",
   "main": "canvas.js",
   "directories": {

test/addpath.js

@@ -18,14 +18,13 @@ describe('AddPath Test Suite.',
       var toadd = new Path2D();
       toadd.rect(0, 0, 100, 100);
 
-      tr = {
-        a: 0,
-        b: 1,
-        c: 2,
-        d: 3,
-        e: 4,
-        f: 5
-      };
+      var tr = document.createElementNS("http://www.w3.org/2000/svg", "svg").createSVGMatrix();
+      tr.a = 0;
+      tr.b = 1;
+      tr.c = 2;
+      tr.d = 3;
+      tr.e = 4;
+      tr.f = 5;
       path.addPath(toadd, tr);
       assert.equal(path.ops_.length, 4);
       assert.equal(path.ops_[0].type, 'save');