Code refactoring for renderers

Fix formatting issues, rearrange imports

Autoported commit.
Original commit hash: [78eb8c509]

Author: AnhelinaM

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/flex/FlexGapTest.cs

@@ -156,13 +156,11 @@ public virtual void GapNestedFlexContainerColumnTest() {
 
         [NUnit.Framework.Test]
         public virtual void GapAlignContentTest() {
-            // TODO DEVSIX-9473 Fix issues on page split
             ConvertToPdfAndCompare("gapAlignContent", SOURCE_FOLDER, DESTINATION_FOLDER);
         }
 
         [NUnit.Framework.Test]
         public virtual void GapAlignContentRowRevDirTest() {
-            // TODO DEVSIX-9473 Fix issues on page split
             ConvertToPdfAndCompare("gapAlignContentRowRevDir", SOURCE_FOLDER, DESTINATION_FOLDER);
         }
 
@@ -180,7 +178,6 @@ public virtual void GapAlignContentColumnRevDirTest() {
 
         [NUnit.Framework.Test]
         public virtual void GapAlignContentWrapRevTest() {
-            // TODO DEVSIX-9473 Fix issues on page split
             ConvertToPdfAndCompare("gapAlignContentWrapRev", SOURCE_FOLDER, DESTINATION_FOLDER);
         }
 
@@ -334,7 +331,6 @@ public virtual void ColGapRemTest() {
 
         [NUnit.Framework.Test]
         public virtual void ColGapAlignContentTest() {
-            // TODO DEVSIX-9473 Fix issues on page split
             ConvertToPdfAndCompare("colGapAlignContent", SOURCE_FOLDER, DESTINATION_FOLDER);
         }
 
@@ -442,7 +438,6 @@ public virtual void RowGapWrapTest() {
 
         [NUnit.Framework.Test]
         public virtual void RowGapAlignContentTest() {
-            // TODO DEVSIX-9473 Fix issues on page split
             ConvertToPdfAndCompare("rowGapAlignContent", SOURCE_FOLDER, DESTINATION_FOLDER);
         }
 

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/flex/PageSplitTest.cs

@@ -26,7 +26,6 @@ You should have received a copy of the GNU Affero General Public License
 namespace iText.Html2pdf.Css.Flex {
     [NUnit.Framework.Category("IntegrationTest")]
     public class PageSplitTest : ExtendedHtmlConversionITextTest {
-        // TODO DEVSIX-9473 Fix issues on page split
         private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
             .CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/flex/PageSplitTest/";
 

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/HtmlDocumentRenderer.cs

@@ -46,6 +46,11 @@ public class HtmlDocumentRenderer : DocumentRenderer {
         /// </remarks>
         private const bool TRIM_LAST_BLANK_PAGE = true;
 
+        private readonly HtmlBodyStylesApplierHandler htmlBodyHandler;
+
+        private readonly IDictionary<int, HtmlBodyStylesApplierHandler.PageStylesProperties> pageStylesPropertiesMap
+             = new Dictionary<int, HtmlBodyStylesApplierHandler.PageStylesProperties>();
+
         /// <summary>The page context processor for the first page.</summary>
         private PageContextProcessor firstPageProc;
 
@@ -66,13 +71,8 @@ public class HtmlDocumentRenderer : DocumentRenderer {
 
         private HtmlDocumentRenderer.PageMarginBoxesDrawingHandler marginBoxesHandler;
 
-        private HtmlBodyStylesApplierHandler htmlBodyHandler;
-
-        private IDictionary<int, HtmlBodyStylesApplierHandler.PageStylesProperties> pageStylesPropertiesMap = new 
-            Dictionary<int, HtmlBodyStylesApplierHandler.PageStylesProperties>();
-
         /// <summary>
-        /// The waiting element, an child element is kept waiting for the
+        /// The waiting element, a child element is kept waiting for the
         /// next element to process the "keep with previous" property.
         /// </summary>
         private IRenderer waitingElement;

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/RunningElement.cs

@@ -40,7 +40,7 @@ namespace iText.Html2pdf.Attach.Impl.Layout {
     /// from the normal flow. This element is designed to register where particular running element would have been placed.
     /// </remarks>
     public class RunningElement : Div {
-        private RunningElementContainer runningElementContainer;
+        private readonly RunningElementContainer runningElementContainer;
 
         /// <summary>
         /// Creates a new instance of
@@ -60,7 +60,7 @@ protected override IRenderer MakeNewRenderer() {
 //\cond DO_NOT_DOCUMENT
         /// <summary>It's an empty div so it's not expected to be ever split between areas.</summary>
         internal class RunningElementRenderer : DivRenderer {
-            private RunningElementContainer runningElementContainer;
+            private readonly RunningElementContainer runningElementContainer;
 
             private bool isFirstOnRootArea;
 

port-hash

@@ -1 +1 @@
-04d01556f88421769b55c39ffec402cfa0bc57ae
+78eb8c50918acb087e5c7975653860258d1ff2d0