Improve <object> and <img> svg support

DEVSIX-8829

Author: Dmitry Radchuk

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/ImgTagWorker.java

@@ -76,15 +76,8 @@ public ImgTagWorker(IElementNode element, ProcessorContext context) {
                 image = new HtmlImage((PdfImageXObject) imageXObject);
             } else if (imageXObject instanceof SvgImageXObject) {
                 SvgImageXObject svgImageXObject = (SvgImageXObject) imageXObject;
-                // TODO DEVSIX-8829 remove relative sized SVG generating after adding support in object element
-                if (svgImageXObject.isRelativeSized()) {
-                    svgImageXObject.updateBBox(null, null);
-                    if (context.getPdfDocument() != null) {
-                        svgImageXObject.generate(context.getPdfDocument());
-                    }
-                    svgImageXObject.setRelativeSized(false);
-                }
                 image = new SvgImage(svgImageXObject);
+                svgImageXObject.setIsCreatedByImg(true);
             } else if (imageXObject instanceof PdfFormXObject) {
                 image = new HtmlImage((PdfFormXObject) imageXObject);
             } else {

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/ObjectTagWorker.java

@@ -119,15 +119,8 @@ private boolean isSvgImage(String typeAttribute) {
     public void processEnd(IElementNode element, ProcessorContext context) {
         // Create Image object
         if (res != null) {
-            SvgImageXObject svgImageXObject = processUtil.createXObjectFromProcessingResult(res, context);
-            // TODO DEVSIX-8829 remove relative sized SVG generating after adding support in object element
-            if (svgImageXObject.isRelativeSized()) {
-                svgImageXObject.updateBBox(null, null);
-                if (context.getPdfDocument() != null) {
-                    svgImageXObject.generate(context.getPdfDocument());
-                }
-                svgImageXObject.setRelativeSized(false);
-            }
+            SvgImageXObject svgImageXObject = processUtil.createXObjectFromProcessingResult(res, context, false);
+            svgImageXObject.setIsCreatedByObject(true);
             image = new SvgImage(svgImageXObject);
             AccessiblePropHelper.trySetLangAttribute(image, element);
         }

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/SvgTagWorker.java

@@ -72,7 +72,7 @@ public SvgTagWorker(IElementNode element, ProcessorContext context) {
     public void processEnd(IElementNode element, ProcessorContext context) {
         if (processingResult != null) {
             SvgImageXObject svgImageXObject = new SvgProcessingUtil(context.getResourceResolver())
-                    .createXObjectFromProcessingResult(processingResult, context);
+                    .createXObjectFromProcessingResult(processingResult, context, true);
             svgImage = new SvgImage(svgImageXObject);
 
             AccessiblePropHelper.trySetLangAttribute(svgImage, element);

src/main/java/com/itextpdf/html2pdf/css/apply/util/BackgroundApplierUtil.java

@@ -570,7 +570,7 @@ protected float[] resolveWidthAndHeight(Float width, Float height, float areaWid
                 svgRootRenderer.setAttribute(Attributes.WIDTH, null);
                 svgRootRenderer.setAttribute(Attributes.HEIGHT, null);
             }
-            svgImageXObject.updateBBox(finalWidth, finalHeight);
+            svgImageXObject.updateBBox((float) finalWidth, (float) finalHeight);
             svgImageXObject.generate(null);
 
             return new float[] {(float) finalWidth, (float) finalHeight};

src/main/java/com/itextpdf/html2pdf/resolver/resource/HtmlResourceResolver.java

@@ -149,6 +149,6 @@ private static PdfFormXObject processAsSvg(InputStream stream, ProcessorContext
         }
         ISvgProcessorResult res = SvgConverter.parseAndProcess(stream, svgConverterProperties);
         SvgProcessingUtil processingUtil = new SvgProcessingUtil(context.getResourceResolver());
-        return processingUtil.createXObjectFromProcessingResult(res, context);
+        return processingUtil.createXObjectFromProcessingResult(res, context, true);
     }
 }

src/main/java/com/itextpdf/html2pdf/util/SvgProcessingUtil.java

@@ -110,10 +110,13 @@ public PdfFormXObject createXObjectFromProcessingResult(ISvgProcessorResult resu
      *
      * @param result  processing result containing the SVG information
      * @param context html2pdf processor context
+     * @param generateAbsolutelySizedSvg if true and context has pdf document and svg is not relative sized, it will be immediately
+     *                 generated, otherwise no generation will be performed
      *
      * @return new {@link SvgImageXObject} instance
      */
-    public SvgImageXObject createXObjectFromProcessingResult(ISvgProcessorResult result, ProcessorContext context) {
+    public SvgImageXObject createXObjectFromProcessingResult(ISvgProcessorResult result, ProcessorContext context,
+                                                             boolean generateAbsolutelySizedSvg) {
         float em = context.getCssContext().getCurrentFontSize();
         SvgDrawContext svgContext = new SvgDrawContext(resourceResolver, result.getFontProvider());
         svgContext.getCssContext().setRootFontSize(context.getCssContext().getRootFontSize());
@@ -123,7 +126,7 @@ public SvgImageXObject createXObjectFromProcessingResult(ISvgProcessorResult res
         } else {
             Rectangle bbox = SvgCssUtils.extractWidthAndHeight(result.getRootRenderer(), em, svgContext);
             SvgImageXObject svgImageXObject = new SvgImageXObject(bbox, result, resourceResolver);
-            if (context.getPdfDocument() != null) {
+            if (context.getPdfDocument() != null && generateAbsolutelySizedSvg) {
                 svgImageXObject.generate(context.getPdfDocument());
             }
             return svgImageXObject;

src/test/java/com/itextpdf/html2pdf/css/BackgroundSvgImageTest.java

@@ -598,6 +598,11 @@ public void contain_fixed_height_percent_widthTest() throws IOException, Interru
         convertToPdfAndCompare("contain_fixed_height_percent_width", SOURCE_FOLDER, DESTINATION_FOLDER);
     }
 
+    @Test
+    public void contain_fixed_height_percent_same_svg_widthTest() throws IOException, InterruptedException {
+        convertToPdfAndCompare("contain_fixed_height_percent_width_same_svg", SOURCE_FOLDER, DESTINATION_FOLDER);
+    }
+
     @Test
     public void contain_fixed_height_percent_width_prRatio_noneTest() throws IOException, InterruptedException {
         convertToPdfAndCompare("contain_fixed_height_percent_width_prRatio_none", SOURCE_FOLDER, DESTINATION_FOLDER);