Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8006 from timvandermeij/mozFillRule

Browse Source 
Remove usage of `mozFillRule`
This commit is contained in:
Jonas Jenwald 2017-01-30 10:35:29 +01:00 committed by GitHub
commit 3f320f0b11
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/display/canvas.js
View File

@ -1229,13 +1229,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
} }
if (this.pendingEOFill) { 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; this.pendingEOFill = false;
} else { } else {
ctx.fill(); ctx.fill();
@ -2273,13 +2267,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var ctx = this.ctx; var ctx = this.ctx;
if (this.pendingClip) { if (this.pendingClip) {
if (this.pendingClip === EO_CLIP) { 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 { } else {
ctx.clip(); ctx.clip();
} }

6
test/features/tests.js
View File

@ -372,13 +372,7 @@ var tests = [
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
ctx.rect(1, 1, 50, 50); ctx.rect(1, 1, 50, 50);
ctx.rect(5, 5, 41, 41); 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 data = ctx.getImageData(0, 0, 50, 50).data;
var isEvenOddFill = data[20 * 4 + 20 * 200 + 3] == 0 && var isEvenOddFill = data[20 * 4 + 20 * 200 + 3] == 0 &&