Skip to content

Commit 822b4d7

Browse files
author
Samuel Huylebroeck
committed
Fix style inheritance change not applied
RND-880
1 parent 34b08cd commit 822b4d7

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ This file is part of the iText (R) project.
6969
import com.itextpdf.styledxmlparser.css.resolve.CssDefaults;
7070
import com.itextpdf.styledxmlparser.css.resolve.CssInheritance;
7171
import com.itextpdf.styledxmlparser.css.resolve.CssPropertyMerger;
72+
import com.itextpdf.styledxmlparser.css.resolve.IStyleInheritance;
7273
import com.itextpdf.styledxmlparser.css.resolve.shorthand.IShorthandResolver;
7374
import com.itextpdf.styledxmlparser.css.resolve.shorthand.ShorthandResolverFactory;
7475
import com.itextpdf.styledxmlparser.css.util.CssUtils;
@@ -107,6 +108,11 @@ public class DefaultCssResolver implements ICssResolver {
107108
*/
108109
private MediaDeviceDescription deviceDescription;
109110

111+
/**
112+
* Css inheritance checker
113+
*/
114+
private IStyleInheritance cssInheritance = new CssInheritance();
115+
110116
/**
111117
* The list of fonts.
112118
*/
@@ -403,7 +409,7 @@ private CssStyleSheet wrapStyleSheetInMediaQueryIfNecessary(IElementNode headChi
403409
*/
404410
private void mergeParentCssDeclaration(Map<String, String> styles, String cssProperty, String parentPropValue, Map<String, String> parentStyles) {
405411
String childPropValue = styles.get(cssProperty);
406-
if ((childPropValue == null && CssInheritance.isInheritable(cssProperty)) || CssConstants.INHERIT.equals(childPropValue)) {
412+
if ((childPropValue == null && cssInheritance.isInheritable(cssProperty)) || CssConstants.INHERIT.equals(childPropValue)) {
407413
if (valueIsOfMeasurement(parentPropValue, CssConstants.EM) || valueIsOfMeasurement(parentPropValue, CssConstants.EX) ||
408414
valueIsOfMeasurement(parentPropValue, CssConstants.PERCENTAGE) && fontSizeDependentPercentage.contains(cssProperty)) {
409415
float absoluteParentFontSize = CssUtils.parseAbsoluteLength(parentStyles.get(CssConstants.FONT_SIZE));

src/test/java/com/itextpdf/html2pdf/element/SvgTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ public void InlineSvgTest() throws IOException, InterruptedException {
3737
}
3838

3939
@Test
40-
@LogMessages(messages = {@LogMessage(messageTemplate = com.itextpdf.styledxmlparser.LogMessageConstant.ERROR_PARSING_COULD_NOT_MAP_NODE)})
40+
@LogMessages(messages = {
41+
@LogMessage(messageTemplate = com.itextpdf.styledxmlparser.LogMessageConstant.ERROR_PARSING_COULD_NOT_MAP_NODE),
42+
@LogMessage(messageTemplate = LogMessageConstant.ERROR_RESOLVING_PARENT_STYLES,count=4),
43+
})
4144
public void externalImageSuccessTest() throws IOException, InterruptedException {
4245
String name = "external_img";
4346
HtmlConverter.convertToPdf(new File(sourceFolder + name + ".html"), new File(destinationFolder + name+".pdf"));
@@ -58,7 +61,10 @@ public void externalImageNonExistentRefTest() throws IOException, InterruptedExc
5861
}
5962

6063
@Test
61-
@LogMessages(messages = {@LogMessage(messageTemplate = com.itextpdf.styledxmlparser.LogMessageConstant.ERROR_PARSING_COULD_NOT_MAP_NODE)})
64+
@LogMessages(messages = {
65+
@LogMessage(messageTemplate = com.itextpdf.styledxmlparser.LogMessageConstant.ERROR_PARSING_COULD_NOT_MAP_NODE),
66+
@LogMessage(messageTemplate = LogMessageConstant.ERROR_RESOLVING_PARENT_STYLES,count=4),
67+
})
6268
public void externalObjectSuccessTest() throws IOException, InterruptedException {
6369
String name = "external_object";
6470
HtmlConverter.convertToPdf(new File(sourceFolder + name + ".html"), new File(destinationFolder + name+".pdf"));

0 commit comments

Comments
 (0)