Skip to content

Commit a7e4a9f

Browse files
author
Alexander Pliushchou
committed
Remove cssGridEnabled property
DEVSIX-8335
1 parent 19461e0 commit a7e4a9f

File tree

105 files changed

+285
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+285
-257
lines changed

src/main/java/com/itextpdf/html2pdf/ConverterProperties.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,6 @@ public class ConverterProperties {
109109
*/
110110
private boolean continuousContainerEnabled;
111111

112-
/**
113-
* enables css grid processing for all elements.
114-
*/
115-
//TODO DEVSIX-8335 remove this property
116-
private boolean cssGridEnabled = false;
117-
118112
/**
119113
* Output intent for final destination device.
120114
*/
@@ -151,7 +145,6 @@ public ConverterProperties(ConverterProperties other) {
151145
this.limitOfLayouts = other.limitOfLayouts;
152146
this.immediateFlush = other.immediateFlush;
153147
this.continuousContainerEnabled = other.continuousContainerEnabled;
154-
this.cssGridEnabled = other.cssGridEnabled;
155148
}
156149

157150
/**
@@ -532,16 +525,6 @@ public boolean isContinuousContainerEnabled() {
532525
return continuousContainerEnabled;
533526
}
534527

535-
/**
536-
* check if css grid support is enabled.
537-
*
538-
* @return true if enabled, false otherwise
539-
*/
540-
//TODO DEVSIX-8335
541-
public boolean isCssGridEnabled() {
542-
return cssGridEnabled;
543-
}
544-
545528
/**
546529
* Sets continuous container support.
547530
*
@@ -552,16 +535,4 @@ public ConverterProperties setContinuousContainerEnabled(boolean value) {
552535
continuousContainerEnabled = value;
553536
return this;
554537
}
555-
556-
//TODO DEVSIX-8335 remove this method
557-
/**
558-
* Sets css grid support.
559-
*
560-
* @param value true to enable css grid support, false otherwise
561-
* @return the {@link ConverterProperties} instance
562-
*/
563-
public ConverterProperties setCssGridEnabled(boolean value) {
564-
cssGridEnabled = value;
565-
return this;
566-
}
567538
}

src/main/java/com/itextpdf/html2pdf/attach/ProcessorContext.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,6 @@ public class ProcessorContext {
155155
*/
156156
private boolean continuousContainerEnabled;
157157

158-
/**
159-
* enables css grid processing for all elements.
160-
*/
161-
//TODO DEVSIX-8335 remove this property
162-
private boolean cssGridEnabled = false;
163-
164158
/**
165159
* Instantiates a new {@link ProcessorContext} instance.
166160
*
@@ -215,7 +209,6 @@ public ProcessorContext(ConverterProperties converterProperties) {
215209
pdfAConformanceLevelFromProperties = converterProperties.getConformanceLevel();
216210
processingInlineSvg = false;
217211
continuousContainerEnabled = converterProperties.isContinuousContainerEnabled();
218-
cssGridEnabled = converterProperties.isCssGridEnabled();
219212
}
220213

221214
/**
@@ -524,14 +517,4 @@ public void endProcessingInlineSvg(){
524517
public boolean isContinuousContainerEnabled() {
525518
return continuousContainerEnabled;
526519
}
527-
528-
/**
529-
* check if css grid support is enabled.
530-
*
531-
* @return true if enabled, false otherwise
532-
*/
533-
//TODO DEVSIX-8335 remove this method
534-
public boolean isCssGridEnabled() {
535-
return cssGridEnabled;
536-
}
537520
}

src/main/java/com/itextpdf/html2pdf/attach/impl/DefaultTagWorkerMapping.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ class DefaultTagWorkerMapping {
205205
(lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
206206
workerMapping.putMapping(TagConstants.SPAN, CssConstants.FLEX,
207207
(lhs, rhs) -> new DisplayFlexTagWorker(lhs, rhs));
208-
//TODO DEVSIX-8335 remove check for css grid enabled logic
209208
workerMapping.putMapping(TagConstants.DIV, CssConstants.GRID,
210-
(lhs, rhs) -> rhs.isCssGridEnabled() ? new DisplayGridTagWorker(lhs, rhs) : new DivTagWorker(lhs, rhs));
209+
(lhs, rhs) -> new DisplayGridTagWorker(lhs, rhs));
211210

212211
// pseudo elements mapping
213212
String beforePseudoElemName = CssPseudoElementUtil.createPseudoElementTagName(CssConstants.BEFORE);

src/test/java/com/itextpdf/html2pdf/css/grid/GridAreaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,6 @@ public void templateAreasStartEndTest() throws IOException, InterruptedException
155155
private void runTest(String testName) throws IOException, InterruptedException {
156156
convertToPdfAndCompare(testName,
157157
SOURCE_FOLDER, DESTINATION_FOLDER, false,
158-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
158+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
159159
}
160160
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridGapTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,6 @@ public void smallValuesGapTest() throws IOException, InterruptedException {
179179

180180
private void runTest(String testName) throws IOException, InterruptedException {
181181
convertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false,
182-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
182+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
183183
}
184184
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridItemPlacementTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,6 @@ public void noTemplate2Test() throws IOException, InterruptedException {
185185

186186
private void runTest(String testName) throws IOException, InterruptedException {
187187
convertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false,
188-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
188+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
189189
}
190190
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridLinenameTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ public void linenameAutoRepeatTest() throws IOException, InterruptedException {
9999
private void runTest(String testName) throws IOException, InterruptedException {
100100
convertToPdfAndCompare(testName,
101101
SOURCE_FOLDER, DESTINATION_FOLDER, false,
102-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
102+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
103103
}
104104
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridRelativeValuesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,6 @@ public void minmaxWithSpan4Test() throws IOException, InterruptedException {
350350

351351
private void runTest(String testName) throws IOException, InterruptedException {
352352
convertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false,
353-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
353+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
354354
}
355355
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplateColumnTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,6 @@ public void templateColumnBasicTest2() throws IOException, InterruptedException
144144
private void runTest(String testName) throws IOException, InterruptedException {
145145
convertToPdfAndCompare(testName,
146146
SOURCE_FOLDER, DESTINATION_FOLDER, false,
147-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
147+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
148148
}
149149
}

src/test/java/com/itextpdf/html2pdf/css/grid/GridTemplateCombinedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ public void templateCombinedNoOtherPropertiesTest() throws IOException, Interrup
103103
private void runTest(String testName) throws IOException, InterruptedException {
104104
convertToPdfAndCompare(testName,
105105
SOURCE_FOLDER, DESTINATION_FOLDER, false,
106-
new ConverterProperties().setBaseUri(SOURCE_FOLDER).setCssGridEnabled(true));
106+
new ConverterProperties().setBaseUri(SOURCE_FOLDER));
107107
}
108108
}

0 commit comments

Comments
 (0)