Merge pull request #9673 from janpe2/svg-clip

SVG clip intersections and operators
mozilla · Apr 22, 2018 · c5c06bf · c5c06bf
2 parents 2dc4af5 + fe2cf2f
commit c5c06bf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/display/svg.js b/src/display/svg.js
@@ -995,6 +995,8 @@ SVGGraphics = (function SVGGraphicsClosure() {
         this.extraStack.forEach(function (prev) {
           prev.clipGroup = null;
         });
+        // Intersect with the previous clipping path.
+        clipPath.setAttributeNS(null, 'clip-path', current.activeClipUrl);
       }
       current.activeClipUrl = 'url(#' + clipId + ')';
 
@@ -1069,6 +1071,7 @@ SVGGraphics = (function SVGGraphicsClosure() {
       if (current.element) {
         current.element.setAttributeNS(null, 'fill', current.fillColor);
         current.element.setAttributeNS(null, 'fill-opacity', current.fillAlpha);
+        this.endPath();
       }
     },
 
@@ -1092,6 +1095,8 @@ SVGGraphics = (function SVGGraphicsClosure() {
                                        pf(current.dashPhase) + 'px');
 
         current.element.setAttributeNS(null, 'fill', 'none');
+
+        this.endPath();
       }
     },