Merge pull request mozilla#8006 from timvandermeij/mozFillRule

Remove usage of `mozFillRule`
movsb · Jan 30, 2017 · 89e9d2f · 89e9d2f
2 parents 414a813 + e7da1a2
commit 89e9d2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/src/display/canvas.js b/src/display/canvas.js
@@ -1229,13 +1229,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       }
 
       if (this.pendingEOFill) {
-        if (ctx.mozFillRule !== undefined) {
-          ctx.mozFillRule = 'evenodd';
-          ctx.fill();
-          ctx.mozFillRule = 'nonzero';
-        } else {
-          ctx.fill('evenodd');
-        }
+        ctx.fill('evenodd');
         this.pendingEOFill = false;
       } else {
         ctx.fill();
@@ -2273,13 +2267,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       var ctx = this.ctx;
       if (this.pendingClip) {
         if (this.pendingClip === EO_CLIP) {
-          if (ctx.mozFillRule !== undefined) {
-            ctx.mozFillRule = 'evenodd';
-            ctx.clip();
-            ctx.mozFillRule = 'nonzero';
-          } else {
-            ctx.clip('evenodd');
-          }
+          ctx.clip('evenodd');
         } else {
           ctx.clip();
         }

diff --git a/test/features/tests.js b/test/features/tests.js
@@ -372,13 +372,7 @@ var tests = [
       var ctx = canvas.getContext('2d');
       ctx.rect(1, 1, 50, 50);
       ctx.rect(5, 5, 41, 41);
-
-      if ('mozFillRule' in ctx) {
-        ctx.mozFillRule = 'evenodd';
-        ctx.fill();
-      } else {
-        ctx.fill('evenodd');
-      }
+      ctx.fill('evenodd');
 
       var data = ctx.getImageData(0, 0, 50, 50).data;
       var isEvenOddFill = data[20 * 4 + 20 * 200 + 3] == 0 &&