Only do postdraw for non-grouping elements

DEVSIX-2067

Author: Benoit Lagae

svg/src/main/java/com/itextpdf/svg/css/impl/SvgAttributeInheritance.java

@@ -66,7 +66,10 @@ public class SvgAttributeInheritance implements IStyleInheritance {
             SvgConstants.Attributes.STROKE,
 
             //Fill
-            SvgConstants.Attributes.FILL
+            SvgConstants.Attributes.FILL,
+
+            //clip-rule
+            SvgConstants.Attributes.CLIP_RULE
 
     ));
 

svg/src/main/java/com/itextpdf/svg/renderers/impl/AbstractBranchSvgNodeRenderer.java

@@ -291,6 +291,8 @@ protected final void deepCopyChildren(AbstractBranchSvgNodeRenderer deepCopy) {
         }
     }
 
+    @Override void postDraw(SvgDrawContext context) {}
+
     @Override
     public abstract ISvgNodeRenderer createDeepCopy();
 

svg/src/main/java/com/itextpdf/svg/renderers/impl/AbstractSvgNodeRenderer.java

@@ -254,7 +254,6 @@ void postDraw(SvgDrawContext context) {
 
             // fill-rule
             if (partOfClipPath) {
-                currentCanvas.closePath();
                 if (SvgConstants.Values.FILL_RULE_EVEN_ODD.equalsIgnoreCase(this.getAttribute(SvgConstants.Attributes.CLIP_RULE))) {
                     currentCanvas.eoClip();
                 } else {
@@ -281,7 +280,7 @@ void postDraw(SvgDrawContext context) {
                 } else if (doStroke) {
                     currentCanvas.stroke();
                 }
-                currentCanvas.closePath();
+                currentCanvas.closePath(); // TODO: see if this is necessary DEVSIX-2583
             }
         }
     }

svg/src/main/java/com/itextpdf/svg/renderers/impl/ClipPathSvgNodeRenderer.java

@@ -66,8 +66,7 @@ public ISvgNodeRenderer createDeepCopy() {
         return copy;
     }
 
-    void preDraw(SvgDrawContext context) {}
-    void postDraw(SvgDrawContext context) {}
+    @Override void preDraw(SvgDrawContext context) {}
 
     @Override
     protected void doDraw(SvgDrawContext context) {

svg/src/main/java/com/itextpdf/svg/renderers/impl/UseSvgNodeRenderer.java

@@ -123,6 +123,8 @@ protected void doDraw(SvgDrawContext context) {
         }
     }
 
+    @Override void postDraw(SvgDrawContext context) {}
+
     /**
      * The reference value will contain a hashtag character. This method will filter that value.
      *

svg/src/test/java/com/itextpdf/svg/renderers/impl/ClipPathSvgNodeRendererLowLevelIntegrationTest.java

@@ -67,7 +67,7 @@ public void testRectClipPathRenderer() {
         clipRenderer.addChild(rectRenderer);
         clipRenderer.draw(sdc);
 
-        Assert.assertEquals("q\n% rect\n0 0 300 300 re\nh\nW\nn\nQ\n", new String(cv.getContentStream().getBytes()));
+        Assert.assertEquals("q\n% rect\n0 0 300 300 re\nW\nn\nQ\n", new String(cv.getContentStream().getBytes()));
     }
 
     @Test
@@ -81,7 +81,7 @@ public void testRectClipPathEoRendererNoChange() {
         clipRenderer.addChild(rectRenderer);
         clipRenderer.draw(sdc);
 
-        Assert.assertEquals("q\n% rect\n0 0 300 300 re\nh\nW\nn\nQ\n", new String(cv.getContentStream().getBytes()));
+        Assert.assertEquals("q\n% rect\n0 0 300 300 re\nW\nn\nQ\n", new String(cv.getContentStream().getBytes()));
     }
 
     @Test
@@ -95,7 +95,7 @@ public void testRectEoClipPathRenderer() {
         clipRenderer.addChild(rectRenderer);
         clipRenderer.draw(sdc);
 
-        Assert.assertEquals("q\n% rect\n0 0 300 300 re\nh\nW*\nn\nQ\n", new String(cv.getContentStream().getBytes()));
+        Assert.assertEquals("q\n% rect\n0 0 300 300 re\nW*\nn\nQ\n", new String(cv.getContentStream().getBytes()));
     }
 
     @Test
@@ -118,7 +118,6 @@ public void testAppliedClipPathRenderer() {
         String expected =  "q\n" +
                 "% rect\n" +
                 "0 0 60 60 re\n" +
-                "h\n" +
                 "W\n" +
                 "n\n" +
                 "0 0 0 rg\n" +
@@ -159,7 +158,6 @@ public void testAppliedGroupClipPathRenderer() {
                 "q\n" +
                 "% rect\n" +
                 "0 0 60 60 re\n" +
-                "h\n" +
                 "W\n" +
                 "n\n" +
                 "% ellipse\n" +
@@ -171,9 +169,7 @@ public void testAppliedGroupClipPathRenderer() {
                 "f\n" +
                 "h\n" +
                 "Q\n" +
-                "Q\n" +
-                "f\n" +
-                "h\n";
+                "Q\n";
         Assert.assertEquals(expected, new String(cv.getContentStream().getBytes()));
     }
 
@@ -209,7 +205,6 @@ public void testEoAppliedGroupClipPathRenderer() {
                 "q\n" +
                 "% rect\n" +
                 "0 0 60 60 re\n" +
-                "h\n" +
                 "W*\n" +
                 "n\n" +
                 "% ellipse\n" +
@@ -224,7 +219,6 @@ public void testEoAppliedGroupClipPathRenderer() {
                 "q\n" +
                 "% rect\n" +
                 "0 0 60 60 re\n" +
-                "h\n" +
                 "W\n" +
                 "n\n" +
                 "% ellipse\n" +
@@ -236,9 +230,7 @@ public void testEoAppliedGroupClipPathRenderer() {
                 "f\n" +
                 "h\n" +
                 "Q\n" +
-                "Q\n" +
-                "f\n" +
-                "h\n";
+                "Q\n";
         Assert.assertEquals(expected, new String(cv.getContentStream().getBytes()));
     }
 }