multiple fixes: code review, margin collapse issues during float elements splitting and some other minor issues.

DEVSIX-1267

Autoported commit.
Original commit hash: [832c0587e]

Author: pavel-morozov-duallab

itext.tests/itext.layout.tests/itext/layout/FloatTest.cs

@@ -259,7 +259,6 @@ public virtual void FloatingImageInCell() {
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)]
         public virtual void FloatingImageToNextPage() {
             String cmpFileName = sourceFolder + "cmp_floatingImageToNextPage.pdf";
             String outFile = destinationFolder + "floatingImageToNextPage.pdf";

itext.tests/itext.layout.tests/resources/itext/layout/FloatTest/cmp_floatingImageToNextPage.pdf

@@ -326,6 +326,14 @@ internal static bool IsRendererFloating(IRenderer renderer, FloatPropertyValue?
                 );
         }
 
+        internal static bool IsFloatAffectedByClear(FloatPropertyValue? floatPropertyValue, ClearPropertyValue? clearPropertyValue
+            ) {
+            return !(clearPropertyValue == null || clearPropertyValue.Equals(ClearPropertyValue.NONE)) && (clearPropertyValue
+                .Equals(ClearPropertyValue.BOTH) || (floatPropertyValue.Equals(FloatPropertyValue.LEFT) && clearPropertyValue
+                .Equals(ClearPropertyValue.LEFT)) || (floatPropertyValue.Equals(FloatPropertyValue.RIGHT) && clearPropertyValue
+                .Equals(ClearPropertyValue.RIGHT)));
+        }
+
         private static void AdjustBoxForFloatRight(Rectangle layoutBox, float blockWidth) {
             layoutBox.SetX(layoutBox.GetRight() - blockWidth);
             layoutBox.SetWidth(blockWidth);

itext/itext.layout/itext/layout/renderer/BlockRenderer.cs

@@ -210,6 +210,7 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                     isPlacingForced = true;
                 }
                 else {
+                    occupiedArea.GetBBox().SetHeight(initialOccupiedAreaBBox.GetHeight());
                     return new MinMaxWidthLayoutResult(LayoutResult.NOTHING, occupiedArea, null, this, this);
                 }
             }

itext/itext.layout/itext/layout/renderer/FloatingHelper.cs

@@ -79,7 +79,7 @@ public override void AddChild(IRenderer renderer) {
             int numberOfPositionedChildRenderers = positionedRenderers.Count;
             base.AddChild(renderer);
             IList<IRenderer> addedRenderers = new List<IRenderer>(1);
-            if (currentArea != null && currentArea.GetPageNumber() > 1) {
+            if (currentArea != null && currentArea.IsEmptyArea()) {
                 addedRenderers.AddAll(waitingRenderers);
                 waitingRenderers.Clear();
             }
@@ -111,13 +111,13 @@ public override void AddChild(IRenderer renderer) {
                 if (marginsCollapsingEnabled && currentArea != null && renderer != null) {
                     childMarginsInfo = marginsCollapseHandler.StartChildMarginsHandling(renderer, currentArea.GetBBox());
                 }
-                FloatPropertyValue? floatPropertyValue = renderer.GetProperty(Property.FLOAT);
-                bool rendererIsFloat = floatPropertyValue != null && !floatPropertyValue.Equals(FloatPropertyValue.NONE);
+                bool rendererIsFloat = FloatingHelper.IsRendererFloating(renderer);
                 while (currentArea != null && renderer != null && (result = renderer.SetParent(this).Layout(new LayoutContext
                     (currentArea.Clone(), childMarginsInfo, floatRendererAreas))).GetStatus() != LayoutResult.FULL) {
                     if (result.GetStatus() == LayoutResult.PARTIAL) {
                         if (rendererIsFloat) {
                             waitingRenderers.Add(result.GetOverflowRenderer());
+                            floatRendererAreas.Add(renderer.GetOccupiedArea().GetBBox());
                         }
                         else {
                             if (result.GetOverflowRenderer() is ImageRenderer) {
@@ -139,14 +139,21 @@ public override void AddChild(IRenderer renderer) {
                     else {
                         if (result.GetStatus() == LayoutResult.NOTHING) {
                             if (result.GetOverflowRenderer() is ImageRenderer) {
-                                if (currentArea.GetBBox().GetHeight() < ((ImageRenderer)result.GetOverflowRenderer()).imageHeight && !currentArea
-                                    .IsEmptyArea()) {
+                                if (currentArea.GetBBox().GetHeight() < ((ImageRenderer)result.GetOverflowRenderer()).GetOccupiedArea().GetBBox
+                                    ().GetHeight() && !currentArea.IsEmptyArea() && !rendererIsFloat) {
                                     UpdateCurrentAndInitialArea(result);
                                 }
-                                ((ImageRenderer)result.GetOverflowRenderer()).AutoScale(currentArea);
-                                result.GetOverflowRenderer().SetProperty(Property.FORCED_PLACEMENT, true);
-                                ILogger logger = LoggerFactory.GetLogger(typeof(RootRenderer));
-                                logger.Warn(MessageFormatUtil.Format(iText.IO.LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, ""));
+                                else {
+                                    if (rendererIsFloat) {
+                                        waitingRenderers.Add(result.GetOverflowRenderer());
+                                    }
+                                    else {
+                                        ((ImageRenderer)result.GetOverflowRenderer()).AutoScale(currentArea);
+                                        result.GetOverflowRenderer().SetProperty(Property.FORCED_PLACEMENT, true);
+                                        ILogger logger = LoggerFactory.GetLogger(typeof(RootRenderer));
+                                        logger.Warn(MessageFormatUtil.Format(iText.IO.LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, ""));
+                                    }
+                                }
                             }
                             else {
                                 if (currentArea.IsEmptyArea() && result.GetAreaBreak() == null) {
@@ -198,9 +205,9 @@ public override void AddChild(IRenderer renderer) {
                             }
                         }
                     }
-                    if (rendererIsFloat && result.GetStatus() != LayoutResult.NOTHING) {
+                    if (rendererIsFloat && (result.GetStatus() != LayoutResult.NOTHING || renderer is ImageRenderer)) {
                         renderer = null;
-                        continue;
+                        break;
                     }
                     if (!waitingRenderers.IsEmpty()) {
                         renderer = waitingRenderers.JRemoveAt(0);
@@ -292,6 +299,16 @@ public virtual void Flush() {
         /// and when no consequent element has been added. This method addresses such situations.
         /// </summary>
         public virtual void Close() {
+            IList<IRenderer> waitingFloatRenderers = new List<IRenderer>(waitingRenderers);
+            while (!waitingFloatRenderers.IsEmpty()) {
+                marginsCollapseHandler = new MarginsCollapseHandler(this, null);
+                waitingRenderers.Clear();
+                UpdateCurrentAndInitialArea(null);
+                foreach (IRenderer renderer in waitingFloatRenderers) {
+                    AddChild(renderer);
+                }
+                waitingFloatRenderers = new List<IRenderer>(waitingRenderers);
+            }
             if (keepWithNextHangingRenderer != null) {
                 keepWithNextHangingRenderer.SetProperty(Property.KEEP_WITH_NEXT, false);
                 IRenderer rendererToBeAdded = keepWithNextHangingRenderer;

itext/itext.layout/itext/layout/renderer/ImageRenderer.cs

@@ -1 +1 @@
-29a58d612b5237ca554268163a60c11a34c82651
+832c0587ed1207573c2c22b3898b84bf713101cc