redo BATIK-1319

Author: XenoAmess

batik-bridge/src/main/java/org/apache/batik/bridge/BridgeContext.java

@@ -270,6 +270,28 @@ public class BridgeContext implements ErrorConstants, CSSContext {
      */
     protected float animationLimitingAmount;
 
+    protected int useElementBridgeCalculationLimit = DEFAULT_USE_ELEMENT_CALCULATION_BRIDGE_LIMIT;
+
+    public static final int DEFAULT_USE_ELEMENT_CALCULATION_BRIDGE_LIMIT = 1024;
+
+    public int getUseElementBridgeCalculationLimit() {
+        return useElementBridgeCalculationLimit;
+    }
+
+    public void setUseElementBridgeCalculationLimit(int useElementBridgeCalculationLimit) {
+        this.useElementBridgeCalculationLimit = useElementBridgeCalculationLimit;
+    }
+
+    public boolean stopAfterConsumeUseElementBridgeCalculationLimit() {
+        int useElementBridgeCalculationLimit = this.getUseElementBridgeCalculationLimit();
+        if (useElementBridgeCalculationLimit <= 0) {
+            return true;
+        }
+        --useElementBridgeCalculationLimit;
+        this.setUseElementBridgeCalculationLimit(useElementBridgeCalculationLimit);
+        return false;
+    }
+
     /**
      * By default we share a unique instance of InterpreterPool.
      */

batik-bridge/src/main/java/org/apache/batik/bridge/SVGUseElementBridge.java

@@ -22,8 +22,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.batik.anim.dom.AbstractSVGAnimatedLength;
 import org.apache.batik.anim.dom.AnimatedLiveAttributeValue;
@@ -54,8 +52,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class SVGUseElementBridge extends AbstractGraphicsNodeBridge {
 
-    private List<String> visited = new ArrayList<>();
-
     /**
      * Used to handle mutation of the referenced content. This is
      * only used in dynamic context and only for reference to local
@@ -117,14 +113,14 @@ public GraphicsNode createGraphicsNode(BridgeContext ctx, Element e) {
      */
     public CompositeGraphicsNode buildCompositeGraphicsNode
             (BridgeContext ctx, Element e, CompositeGraphicsNode gn) {
+
+        if (ctx.stopAfterConsumeUseElementBridgeCalculationLimit()) {
+            return null;
+        }
+
         // get the referenced element
         SVGOMUseElement ue = (SVGOMUseElement) e;
         String uri = ue.getHref().getAnimVal();
-        String id = uri + ";" + ue.getStyle().getCssText();
-        if (visited.contains(id)) {
-            return null;
-        }
-        visited.add(id);
         if (uri.length() == 0) {
             throw new BridgeException(ctx, e, ERR_ATTRIBUTE_MISSING,
                                       new Object[] {"xlink:href"});
@@ -168,6 +164,9 @@ public GraphicsNode createGraphicsNode(BridgeContext ctx, Element e) {
             for (Node n = localRefElement.getFirstChild();
                  n != null;
                  n = localRefElement.getFirstChild()) {
+                if (ctx.stopAfterConsumeUseElementBridgeCalculationLimit()) {
+                    return null;
+                }
                 svgElement.appendChild(n);
             }
             localRefElement = svgElement;

batik-test-old/src/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java

@@ -420,6 +420,12 @@ protected void configure(SVGConverter c){
                 "test-references/samples/manyuse.png"); // reference
         addTest(t);
         t.setId("manyuse");
+
+        t = new ConverterOutputTest("samples/3points.svg",  // File to convert
+                "test-reports/3points.png", // Output
+                "test-references/samples/3points.png"); // reference
+        addTest(t);
+        t.setId("3points");
     }
 }