Refactor font-size resolution methods.

DEVSIX-2866

Author: ars18wrw

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/DimensionContainer.java

@@ -73,7 +73,7 @@ boolean isAutoDimension() {
     }
 
     float parseDimension(CssContextNode node, String content, float maxAvailableDimension, float additionalWidthFix) {
-        float fontSize = FontStyleApplierUtil.parseAbsoluteFontSize(node.getStyles().get(CssConstants.FONT_SIZE));
+        float fontSize = CssUtils.parseAbsoluteFontSize(node.getStyles().get(CssConstants.FONT_SIZE));
         UnitValue unitValue = CssUtils.parseLengthValueToPt(content, fontSize, 0);
         if (unitValue == null) {
             return 0;

src/main/java/com/itextpdf/html2pdf/css/CssConstants.java

@@ -250,10 +250,14 @@ public class CssConstants extends CommonCssConstants {
     public static final String UPPERCASE = "uppercase";
 
     // properties possible values
-    /** The Constant FONT_ABSOLUTE_SIZE_KEYWORDS. */
+    /**
+     *  The Constant FONT_ABSOLUTE_SIZE_KEYWORDS.
+     * @deprecated Use {@link CommonCssConstants#FONT_ABSOLUTE_SIZE_KEYWORDS} instead.
+     */
+    @Deprecated
     public static final Set<String> FONT_ABSOLUTE_SIZE_KEYWORDS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-            CssConstants.MEDIUM, CssConstants.XX_SMALL, CssConstants.X_SMALL, CssConstants.SMALL, CssConstants.LARGE,
-            CssConstants.X_LARGE, CssConstants.XX_LARGE
+            CommonCssConstants.MEDIUM, CommonCssConstants.XX_SMALL, CommonCssConstants.X_SMALL, CommonCssConstants.SMALL, CommonCssConstants.LARGE,
+            CommonCssConstants.X_LARGE, CommonCssConstants.XX_LARGE
     )));
 
     /** The Constant OVERFLOW_VALUES. */

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

@@ -243,7 +243,9 @@ public static void applyFontStyles(Map<String, String> cssProps, ProcessorContex
      *
      * @param fontSizeValue the font size value as a {@link String}
      * @return the font size value as a {@code float}
+     * @deprecated Use {@link CssUtils#parseAbsoluteFontSize(String)} instead.
      */
+    @Deprecated
     public static float parseAbsoluteFontSize(String fontSizeValue) {
         if (CssConstants.FONT_ABSOLUTE_SIZE_KEYWORDS.contains(fontSizeValue)) {
             switch (fontSizeValue) {
@@ -289,7 +291,9 @@ public static float parseAbsoluteFontSize(String fontSizeValue) {
      * @param relativeFontSizeValue the relative font size value as a {@link String}
      * @param baseValue the base value
      * @return the relative font size value as a {@code float}
+     * @deprecated Use {@link CssUtils#parseRelativeFontSize(String, float)} instead.
      */
+    @Deprecated
     public static float parseRelativeFontSize(final String relativeFontSizeValue, final float baseValue) {
         if (CssConstants.SMALLER.equals(relativeFontSizeValue)) {
             return (float)(baseValue / 1.2);

src/main/java/com/itextpdf/html2pdf/css/resolve/CssContext.java

@@ -49,14 +49,15 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.styledxmlparser.css.resolve.AbstractCssContext;
 import com.itextpdf.styledxmlparser.css.resolve.CssDefaults;
+import com.itextpdf.styledxmlparser.css.util.CssUtils;
 
 /**
  * Class that bundles all the CSS context properties.
  */
 public class CssContext extends AbstractCssContext {
 
     /** The root font size value in pt. */
-    private float rootFontSize = FontStyleApplierUtil.parseAbsoluteFontSize(CssDefaults.getDefaultValue(CssConstants.FONT_SIZE));
+    private float rootFontSize = CssUtils.parseAbsoluteFontSize(CssDefaults.getDefaultValue(CssConstants.FONT_SIZE));
 
     /** The counter manager. */
     private CssCounterManager counterManager = new CssCounterManager();
@@ -91,7 +92,7 @@ public void setRootFontSize(float fontSize) {
      * @param fontSizeStr the new root font size
      */
     public void setRootFontSize(String fontSizeStr) {
-        this.rootFontSize = FontStyleApplierUtil.parseAbsoluteFontSize(fontSizeStr);
+        this.rootFontSize = CssUtils.parseAbsoluteFontSize(fontSizeStr);
     }
 
     /**

src/main/java/com/itextpdf/html2pdf/css/resolve/DefaultCssResolver.java

@@ -206,16 +206,16 @@ private Map<String, String> resolveStyles(INode element, CssContext context) {
                 baseFontSize = context.getRootFontSize();
             } else {
                 if (parentFontSizeStr == null) {
-                    baseFontSize = FontStyleApplierUtil.parseAbsoluteFontSize(CssDefaults.getDefaultValue(CssConstants.FONT_SIZE));
+                    baseFontSize = CssUtils.parseAbsoluteFontSize(CssDefaults.getDefaultValue(CssConstants.FONT_SIZE));
                 } else {
                     baseFontSize = CssUtils.parseAbsoluteLength(parentFontSizeStr);
                 }
             }
-            float absoluteFontSize = FontStyleApplierUtil.parseRelativeFontSize(elementFontSize, baseFontSize);
+            float absoluteFontSize = CssUtils.parseRelativeFontSize(elementFontSize, baseFontSize);
             // Format to 4 decimal places to prevent differences between Java and C#
             elementStyles.put(CssConstants.FONT_SIZE, DecimalFormatUtil.formatNumber(absoluteFontSize, "0.####") + CssConstants.PT);
         } else {
-            elementStyles.put(CssConstants.FONT_SIZE, Float.toString(FontStyleApplierUtil.parseAbsoluteFontSize(elementFontSize)) + CssConstants.PT);
+            elementStyles.put(CssConstants.FONT_SIZE, Float.toString(CssUtils.parseAbsoluteFontSize(elementFontSize)) + CssConstants.PT);
         }
 
         // Update root font size