Respect the clearance while positioning pending floats.

third_party/WebKit/Source/core/layout/ng/ng_space_utils.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/ng/ng_space_utils.h"
 
 #include "core/layout/ng/ng_block_node.h"
 #include "core/layout/ng/ng_exclusion.h"
 #include "core/layout/ng/ng_layout_input_node.h"
 #include "core/layout/ng/ng_writing_mode.h"
@@ skipping 48 matching lines @@
     return true;
 
   if (parent_style.GetWritingMode() != style.GetWritingMode())
     return true;
 
   return false;
 }
 
 WTF::Optional<LayoutUnit> GetClearanceOffset(
     const std::shared_ptr<NGExclusions>& exclusions,
-    const ComputedStyle& style) {
+    EClear clear_type) {
   const NGExclusion* right_exclusion = exclusions->last_right_float;
   const NGExclusion* left_exclusion = exclusions->last_left_float;
 
   WTF::Optional<LayoutUnit> left_offset;
   if (left_exclusion) {
     left_offset = left_exclusion->rect.BlockEndOffset();
   }
   WTF::Optional<LayoutUnit> right_offset;
   if (right_exclusion) {
     right_offset = right_exclusion->rect.BlockEndOffset();
   }
 
-  switch (style.Clear()) {
+  switch (clear_type) {
     case EClear::kNone:
       return WTF::nullopt;  // nothing to do here.
     case EClear::kLeft:
       return left_offset;
     case EClear::kRight:
       return right_offset;
     case EClear::kBoth:
       return OptionalMax<LayoutUnit>(left_offset, right_offset);
     default:
       NOTREACHED();
   }
   return WTF::nullopt;
 }
 
 bool ShouldShrinkToFit(const ComputedStyle& parent_style,
                        const ComputedStyle& style) {
   // Whether the child and the containing block are parallel to each other.
   // Example: vertical-rl and vertical-lr
   bool is_in_parallel_flow = IsParallelWritingMode(
       FromPlatformWritingMode(parent_style.GetWritingMode()),
       FromPlatformWritingMode(style.GetWritingMode()));
 
   return style.Display() == EDisplay::kInlineBlock || style.IsFloating() ||
          !is_in_parallel_flow;
 }
 
+void AdjustToClearance(const WTF::Optional<LayoutUnit>& clearance_offset,
+                       NGLogicalOffset* offset) {
+  DCHECK(offset);
+  if (clearance_offset) {
+    offset->block_offset =
+        std::max(clearance_offset.value(), offset->block_offset);
+  }
+}
+
 }  // namespace blink