Browse Source

Merge pull request #8006 from timvandermeij/mozFillRule

Remove usage of `mozFillRule`
Jonas Jenwald 8 years ago committed by GitHub
parent
commit
3f320f0b11
  1. 16
      src/display/canvas.js
  2. 8
      test/features/tests.js

16
src/display/canvas.js

@ -1229,13 +1229,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() { @@ -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() { @@ -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();
}

8
test/features/tests.js

@ -372,13 +372,7 @@ var tests = [ @@ -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 &&

Loading…
Cancel
Save