Apply object tag height and width during conversion

vitali.prudnikovich · iText-CI · commit cdbc3dbdab5e · 2022-10-14T13:03:03.000Z
Autoported commit.
Original commit hash: [90e9e37ac]
diff --git a/itext.tests/itext.html2pdf.tests/itext/html2pdf/css/resolve/HtmlStylesToCssConverterIntegrationTest.cs b/itext.tests/itext.html2pdf.tests/itext/html2pdf/css/resolve/HtmlStylesToCssConverterIntegrationTest.cs
@@ -0,0 +1,23 @@
+using System;
+using iText.Html2pdf;
+
+namespace iText.Html2pdf.Css.Resolve {
+    [NUnit.Framework.Category("Integration test")]
+    public class HtmlStylesToCssConverterIntegrationTest : ExtendedHtmlConversionITextTest {
+        public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css" + "/HtmlStylesToCssConverterIntegrationTest/";
+
+        public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/html2pdf/css" + "/HtmlStylesToCssConverterIntegrationTest/";
+
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            CreateOrClearDestinationFolder(DESTINATION_FOLDER);
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void ObjectTagWidthAndHeightTest() {
+            ConvertToPdfAndCompare("objectTagWidthAndHeightTest", SOURCE_FOLDER, DESTINATION_FOLDER);
+        }
+    }
+}
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/cmp_objectTagWidthAndHeightTest.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/cmp_objectTagWidthAndHeightTest.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/external.svg b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/external.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 600" version="1.1">
+<path fill="red" stroke="blue" stroke-width="10"
+         d= "M 150,205  L179,291 L269,291 L197,345
+             L223,431 L150,380 L77,431 L103,345
+             L31,291 L121,291 z"/>
+<path fill="lime" stroke="blue" stroke-width="10"
+         d="M 400,205  L508,267.5 L508,392.5
+                    L400,455 L292,392.6 L292,267.5 z"/>
+</svg>
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/objectTagWidthAndHeightTest.html b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/HtmlStylesToCssConverterIntegrationTest/objectTagWidthAndHeightTest.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<p>External SVG image</p>
+<img lang="fr" src="external.svg"  alt="extérieur svg image" width="400" height="180"/>
+
+<p>
+	<object type="image/svg+xml" data="external.svg" lang="ru" width="400" height="180"></object>
+</p>
+</body>
+</html>
diff --git a/itext/itext.html2pdf/itext/html2pdf/css/resolve/HtmlStylesToCssConverter.cs b/itext/itext.html2pdf/itext/html2pdf/css/resolve/HtmlStylesToCssConverter.cs
@@ -478,7 +478,8 @@ private class WidthAttributeConverter : HtmlStylesToCssConverter.IAttributeConve
             public virtual bool IsSupportedForElement(String elementName) {
                 return TagConstants.HR.Equals(elementName) || TagConstants.IMG.Equals(elementName) || TagConstants.TABLE.Equals
                     (elementName) || TagConstants.TD.Equals(elementName) || TagConstants.TH.Equals(elementName) || TagConstants
-                    .COLGROUP.Equals(elementName) || TagConstants.COL.Equals(elementName);
+                    .COLGROUP.Equals(elementName) || TagConstants.COL.Equals(elementName) || TagConstants.OBJECT.Equals(elementName
+                    );
             }
 
             /* (non-Javadoc)
@@ -504,7 +505,8 @@ private class HeightAttributeConverter : HtmlStylesToCssConverter.IAttributeConv
             * @see com.itextpdf.html2pdf.css.resolve.HtmlStylesToCssConverter.IAttributeConverter#isSupportedForElement(java.lang.String)
             */
             public virtual bool IsSupportedForElement(String elementName) {
-                return TagConstants.IMG.Equals(elementName) || TagConstants.TD.Equals(elementName);
+                return TagConstants.IMG.Equals(elementName) || TagConstants.TD.Equals(elementName) || TagConstants.OBJECT.
+                    Equals(elementName);
             }
 
             /* (non-Javadoc)
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-ab7a8863cd8565ef062705686e241e6505c211d3
+90e9e37ac75e0238781460fd39807e4f1ac46cf8

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ab7a8863cd8565ef062705686e241e6505c211d3`
	`1`	`+90e9e37ac75e0238781460fd39807e4f1ac46cf8`