[LayoutNG] Change anonymous LayoutBlockFlow to LayoutNGBlockFlow

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.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_layout_algorithm.h"
 
 #include "core/layout/ng/inline/ng_inline_node.h"
 #include "core/layout/ng/ng_absolute_utils.h"
 #include "core/layout/ng/ng_block_child_iterator.h"
 #include "core/layout/ng/ng_constraint_space.h"
@@ skipping 329 matching lines @@
     // Append the current margin strut with child's block start margin.
     // Non empty border/padding, and new FC use cases are handled inside of the
     // child's layout.
     if (!IsNewFormattingContextForBlockLevelChild(Style(), *child))
       curr_margin_strut_.Append(curr_child_margins_.block_start);
   }
 
   bool is_legacy_block =
       child->IsBlock() && !ToNGBlockNode(child)->CanUseNewLayout();
 
-  // Should collapse margins if inline or legacy block
-  if (child->IsInline() || is_legacy_block) {
+  // TODO(crbug.com/716930): We should also collapse margins below once we
+  // remove LayoutInline splitting.
+
+  // Should collapse margins if our child is a legacy block.
+  if (is_legacy_block) {
     curr_bfc_offset_.block_offset += curr_margin_strut_.Sum();
     MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_,
                                  &container_builder_);
     PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_,
                           MutableConstraintSpace());
     curr_margin_strut_ = {};
   }
   child_bfc_offset.block_offset = curr_bfc_offset_.block_offset;
   return child_bfc_offset;
 }
@@ skipping 194 matching lines @@
 RefPtr<NGConstraintSpace> NGBlockLayoutAlgorithm::CreateConstraintSpaceForChild(
     const NGLogicalOffset& child_bfc_offset,
     NGLayoutInputNode* child) {
   DCHECK(child);
 
   const ComputedStyle& child_style = child->Style();
   bool is_new_bfc = IsNewFormattingContextForBlockLevelChild(Style(), *child);
   space_builder_.SetIsNewFormattingContext(is_new_bfc)
       .SetBfcOffset(child_bfc_offset);
 
+  // Float's margins are not included in child's space because:
+  // 1) Floats do not participate in margins collapsing.
+  // 2) Floats margins are used separately to calculate floating exclusions.
+  space_builder_.SetMarginStrut(child->IsFloating() ? NGMarginStrut()
+                                                    : curr_margin_strut_);
+
   if (child->IsInline()) {
     // TODO(kojii): Setup space_builder_ appropriately for inline child.
     space_builder_.SetClearanceOffset(ConstraintSpace().ClearanceOffset());
     return space_builder_.ToConstraintSpace(
         FromPlatformWritingMode(Style().GetWritingMode()));
   }
 
   space_builder_
       .SetClearanceOffset(
           GetClearanceOffset(constraint_space_->Exclusions(), child_style))
       .SetIsShrinkToFit(ShouldShrinkToFit(Style(), child_style))
       .SetTextDirection(child_style.Direction());
 
-  // Float's margins are not included in child's space because:
-  // 1) Floats do not participate in margins collapsing.
-  // 2) Floats margins are used separately to calculate floating exclusions.
-  space_builder_.SetMarginStrut(child->IsFloating() ? NGMarginStrut()
-                                                    : curr_margin_strut_);
-
   LayoutUnit space_available;
   if (constraint_space_->HasBlockFragmentation()) {
     space_available = ConstraintSpace().FragmentainerSpaceAvailable();
     // If a block establishes a new formatting context we must know our
     // position in the formatting context, and are able to adjust the
     // fragmentation line.
     if (is_new_bfc) {
       space_available -= child_bfc_offset.block_offset;
     }
   }
   space_builder_.SetFragmentainerSpaceAvailable(space_available);
 
   return space_builder_.ToConstraintSpace(
       FromPlatformWritingMode(child_style.GetWritingMode()));
 }
 }  // namespace blink