#336 - A better fix for #328 that allows broken replaced elements.

Such as images.
danfickle · Mar 17, 2019 · fb2b800 · fb2b800
1 parent fef8e73
commit fb2b800
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/BoxBuilder.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/layout/BoxBuilder.java
@@ -119,7 +119,7 @@ public static BlockBox createRootBox(LayoutContext c, Document document) {
 
     public static void createChildren(LayoutContext c, BlockBox parent) {
         if (parent.shouldBeReplaced()) {
-            parent.setChildrenContentType(BlockBox.CONTENT_INLINE);
+            parent.setChildrenContentType(BlockBox.CONTENT_EMPTY);
             return;
         }
 

diff --git a/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/BlockBox.java b/openhtmltopdf-core/src/main/java/com/openhtmltopdf/render/BlockBox.java
@@ -2186,8 +2186,9 @@ public boolean isContainsInlineContent(LayoutContext c) {
     public boolean checkPageContext(LayoutContext c) {
         if (! getStyle().isIdent(CSSName.PAGE, IdentValue.AUTO)) {
             String pageName = getStyle().getStringProperty(CSSName.PAGE);
-            if ( (! pageName.equals(c.getPageName())) && isInDocumentFlow() &&
-                    isContainsInlineContent(c)) {
+            if (!pageName.equals(c.getPageName()) && 
+                isInDocumentFlow() &&
+                (shouldBeReplaced() || isContainsInlineContent(c))) {
                 c.setPendingPageName(pageName);
                 return true;
             }

diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/broken-img-in-inline-block.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/broken-img-in-inline-block.pdf
diff --git a/openhtmltopdf-examples/src/main/resources/visualtest/expected/broken-img-in-table-cell.pdf b/openhtmltopdf-examples/src/main/resources/visualtest/expected/broken-img-in-table-cell.pdf
diff --git a/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java b/...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
@@ -705,7 +705,6 @@ public void testSvgInWrapperWithNamedPage() throws IOException {
      * than crashing with a NPE. See issue 336.
      */
     @Test
-    @Ignore
     public void testBrokenImgInTableCell() throws IOException {
         assertTrue(vt.runTest("broken-img-in-table-cell"));
     }
@@ -715,7 +714,6 @@ public void testBrokenImgInTableCell() throws IOException {
      * does not crash. See issue 336.
      */
     @Test
-    @Ignore
     public void testBrokenImgInInlineBlock() throws IOException {
         assertTrue(vt.runTest("broken-img-in-inline-block"));
     }