#649 Reinstate support for inherit in background props

With WIP test.
danfickle · Feb 14, 2021 · f821644 · f821644
1 parent a27b3a1
commit f821644
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/.../main/java/com/openhtmltopdf/css/parser/property/PrimitiveBackgroundPropertyBuilders.java b/.../main/java/com/openhtmltopdf/css/parser/property/PrimitiveBackgroundPropertyBuilders.java
@@ -41,7 +41,8 @@ public List<PropertyDeclaration> buildDeclarations(
                 if (val.getCssValueType() != CSSValue.CSS_INHERIT) {
                     res = Collections.singletonList(processValue(cssName, val));
                 } else {
-                    res = Collections.singletonList(val);
+                    return Collections.singletonList(
+                            new PropertyDeclaration(cssName, val, important, origin));
                 }
             } else {
                 res =

diff --git a/...df-examples/src/main/resources/visualtest/html/issue-649-multiple-bg-images-advanced.html b/...df-examples/src/main/resources/visualtest/html/issue-649-multiple-bg-images-advanced.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+<style>
+@page {
+  size: 400px 400px;
+  margin: 10px;
+}
+body {
+  margin: 10px;
+  max-width: 360px;
+}
+#one {
+  height: 300px;
+  background-image: url(../../demos/images/cc0-cat.png), url(../../demos/images/flyingsaucer.png), none;
+  background-repeat: no-repeat;
+  border: 1px solid blue;
+}
+#two {
+  height: 100px;
+  border: 1px solid red;
+  background-image: inherit;
+}
+
+</style>
+</head>
+<body>
+<div id="one">
+  <div id="two"></div>
+</div>
+
+</body>
+</html>
diff --git a/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
@@ -1383,6 +1383,15 @@ public void testIssue649MultipleBgImages() throws IOException {
         assertTrue(vt.runTest("issue-649-multiple-bg-images"));
     }
 
+    /**
+     * Tests that the other background-* properties allow multiple values.
+     */
+    @Test
+    @Ignore // WIP
+    public void testIssue649MultipleBgImagesAdvanced() throws IOException {
+        assertTrue(vt.runTest("issue-649-multiple-bg-images-advanced"));
+    }
+
     // TODO:
     // + Elements that appear just on generated overflow pages.
     // + content property (page counters, etc)