[LayoutNG] Abort a layout once the BFC offset is resolved.

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

 // Copyright 2016 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_block_node.h"
 
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/LayoutMultiColumnFlowThread.h"
 #include "core/layout/LayoutMultiColumnSet.h"
@@ skipping 117 matching lines @@
 RefPtr<NGLayoutResult> NGBlockNode::Layout(NGConstraintSpace* constraint_space,
                                            NGBreakToken* break_token) {
   // Use the old layout code and synthesize a fragment.
   if (!CanUseNewLayout()) {
     return RunOldLayout(*constraint_space);
   }
 
   RefPtr<NGLayoutResult> layout_result =
       LayoutWithAlgorithm(Style(), *this, constraint_space, break_token);
 
-  CopyFragmentDataToLayoutBox(*constraint_space, layout_result.Get());
+  if (layout_result->Status() == NGLayoutResult::kSuccess &&
+      layout_result->UnpositionedFloats().IsEmpty())
+    CopyFragmentDataToLayoutBox(*constraint_space, layout_result.Get());
+
   return layout_result;
 }
 
 MinMaxContentSize NGBlockNode::ComputeMinMaxContentSize() {
   MinMaxContentSize sizes;
   if (!CanUseNewLayout()) {
     // TODO(layout-ng): This could be somewhat optimized by directly calling
     // computeIntrinsicLogicalWidths, but that function is currently private.
     // Consider doing that if this becomes a performance issue.
     LayoutUnit border_and_padding = box_->BorderAndPaddingLogicalWidth();
@@ skipping 127 matching lines @@
     ToLayoutBlockFlow(box_)->RemoveFloatingObjects();
   }
   for (const NGPositionedFloat& positioned_float :
        physical_fragment->PositionedFloats())
     FloatingObjectPositionedUpdated(positioned_float, box_);
 
   for (const auto& child_fragment : physical_fragment->Children()) {
     if (child_fragment->IsPlaced())
       FragmentPositionUpdated(ToNGPhysicalBoxFragment(*child_fragment));
 
-    for (const NGPositionedFloat& positioned_float :
-         ToNGPhysicalBoxFragment(child_fragment.Get())->PositionedFloats()) {
-      FloatingObjectPositionedUpdated(
-          positioned_float, ToLayoutBox(child_fragment->GetLayoutObject()));
+    if (child_fragment->GetLayoutObject()->IsLayoutBlockFlow())
+      ToLayoutBlockFlow(child_fragment->GetLayoutObject())
+          ->AddOverflowFromFloats();
+
+    if (child_fragment->GetLayoutObject() == box_) {

[eae, 2017/07/10 23:27:49]

When would this be false?

[ikilpatrick, 2017/07/11 17:20:41]

So this is actually for the _child_, i.e.

NGBoxFragment (NGBlockNode - box_) 
  NGBoxFragment (NGInlineNode - child_fragent->box_)
    NGLineBoxFragment

This isn't ideal at the moment, we may want to change the inline/block split to
simplify this. 

+      for (const NGPositionedFloat& positioned_float :
+           ToNGPhysicalBoxFragment(child_fragment.Get())->PositionedFloats()) {
+        FloatingObjectPositionedUpdated(
+            positioned_float, ToLayoutBox(child_fragment->GetLayoutObject()));
+      }
     }
   }
 
   if (box_->IsLayoutBlock()) {
     ToLayoutBlock(box_)->LayoutPositionedObjects(true);
     NGWritingMode writing_mode =
         FromPlatformWritingMode(Style().GetWritingMode());
     NGBoxFragment fragment(writing_mode, physical_fragment);
     ToLayoutBlock(box_)->ComputeOverflow(fragment.OverflowSize().block_size -
                                          border_scrollbar_padding.block_end);
   }
 
   box_->UpdateAfterLayout();
   box_->ClearNeedsLayout();
 
   if (box_->IsLayoutBlockFlow()) {
-    ToLayoutBlockFlow(box_)->UpdateIsSelfCollapsing();
+    LayoutBlockFlow* block_flow = ToLayoutBlockFlow(box_);
+    block_flow->UpdateIsSelfCollapsing();
+
+    if (block_flow->CreatesNewFormattingContext())
+      block_flow->AddOverflowFromFloats();
   }
 }
 
 RefPtr<NGLayoutResult> NGBlockNode::RunOldLayout(
     const NGConstraintSpace& constraint_space) {
   NGLogicalSize available_size = constraint_space.PercentageResolutionSize();
   LayoutObject* containing_block = box_->ContainingBlock();
   NGWritingMode writing_mode =
       FromPlatformWritingMode(Style().GetWritingMode());
   bool parallel_writing_mode;
@@ skipping 53 matching lines @@
 
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(box_->IsOutOfFlowPositioned());
   DCHECK(box_->Layer());
   box_->Layer()->SetStaticBlockPosition(offset.block_offset);
   box_->Layer()->SetStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink