mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #8542 from Rob--W/svg-clipping

Browse source 
Move svg:clipPath generation from clip to endPath
This commit is contained in:
Tim van der Meij 2017-06-22 23:48:06 +02:00 • committed by GitHub
commit c6ee05f7e5
4 changed files with 59 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/display/svg.js
View file

@ -361,6 +361,7 @@ SVGGraphics = (function SVGGraphicsClosure() {
this.extraStack = [];
this.commonObjs = commonObjs;
this.objs = objs;
this.pendingClip = null;
this.pendingEOFill = false;
this.embedFonts = false;
@ -389,6 +390,7 @@ SVGGraphics = (function SVGGraphicsClosure() {
this.transformMatrix = this.transformStack.pop();
this.current = this.extraStack.pop();
this.pendingClip = null;
this.tgrp = null;
},
@ -894,9 +896,10 @@ SVGGraphics = (function SVGGraphicsClosure() {
current.setCurrentPoint(x, y);
},
endPath: function SVGGraphics_endPath() {},
clip: function SVGGraphics_clip(type) {
endPath: function SVGGraphics_endPath() {
if (!this.pendingClip) {
return;
}
var current = this.current;
// Add current path to clipping path
var clipId = 'clippath' + clipCount;
@ -905,17 +908,18 @@ SVGGraphics = (function SVGGraphicsClosure() {
clipPath.setAttributeNS(null, 'id', clipId);
clipPath.setAttributeNS(null, 'transform', pm(this.transformMatrix));
var clipElement = current.element.cloneNode();
if (type === 'evenodd') {
if (this.pendingClip === 'evenodd') {
clipElement.setAttributeNS(null, 'clip-rule', 'evenodd');
} else {
clipElement.setAttributeNS(null, 'clip-rule', 'nonzero');
}
this.pendingClip = null;
clipPath.appendChild(clipElement);
this.defs.appendChild(clipPath);
if (current.activeClipUrl) {
// The previous clipping group content can go out of order -- resetting
// cached clipGroup's.
// cached clipGroups.
current.clipGroup = null;
this.extraStack.forEach(function (prev) {
prev.clipGroup = null;
@ -926,6 +930,10 @@ SVGGraphics = (function SVGGraphicsClosure() {
this.tgrp = null;
},
clip: function SVGGraphics_clip(type) {
this.pendingClip = type;
},
closePath: function SVGGraphics_closePath() {
var current = this.current;
var d = current.path.getAttributeNS(null, 'd');