[layoutng] Split NGLayoutResult out of NGPhysicalFragment

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/LayoutBlockFlow.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 #include "core/layout/ng/ng_box_fragment.h"
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
 #include "core/layout/ng/ng_fragment_builder.h"
 #include "core/layout/ng/ng_inline_node.h"
+#include "core/layout/ng/ng_layout_result.h"
 #include "core/layout/ng/ng_length_utils.h"
 #include "core/layout/ng/ng_writing_mode.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
 namespace {
 
 // Copies data back to the legacy layout tree for a given child fragment.
-void FragmentPositionUpdated(const NGPhysicalBoxFragment& box_fragment) {
-  LayoutBox* layout_box = toLayoutBox(box_fragment.GetLayoutObject());
+void FragmentPositionUpdated(const NGPhysicalFragment& fragment) {
+  LayoutBox* layout_box = toLayoutBox(fragment.GetLayoutObject());
   if (!layout_box)
     return;
 
   DCHECK(layout_box->parent()) << "Should be called on children only.";
 
-  layout_box->setX(box_fragment.LeftOffset());
-  layout_box->setY(box_fragment.TopOffset());
+  layout_box->setX(fragment.LeftOffset());
+  layout_box->setY(fragment.TopOffset());
 }
 
 // Similar to FragmentPositionUpdated but for floats.
 // - Updates layout object's geometric information.
 // - Creates legacy FloatingObject and attached it to the provided parent.
 void FloatingObjectPositionedUpdated(NGFloatingObject* ng_floating_object,
                                      LayoutBox* parent) {
   NGPhysicalBoxFragment* box_fragment =
       toNGPhysicalBoxFragment(ng_floating_object->fragment.get());
   FragmentPositionUpdated(*box_fragment);
@@ skipping 23 matching lines @@
       layout_box_(nullptr),
       style_(style) {
   DCHECK(style_);
 }
 
 // Need an explicit destructor in the .cc file, or the MSWIN compiler will
 // produce an error when attempting to generate a default one, if the .h file is
 // included from a compilation unit that lacks the ComputedStyle definition.
 NGBlockNode::~NGBlockNode() {}
 
-RefPtr<NGPhysicalFragment> NGBlockNode::Layout(
+RefPtr<NGLayoutResult> NGBlockNode::Layout(
     NGConstraintSpace* constraint_space) {
   // Use the old layout code and synthesize a fragment.
   if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
-    fragment_ = RunOldLayout(*constraint_space);
-    return fragment_;
+    layout_result_ = RunOldLayout(*constraint_space);
+    return layout_result_;
   }
 
-  RefPtr<NGPhysicalFragment> fragment =
+  layout_result_ =
       NGBlockLayoutAlgorithm(this, constraint_space, CurrentBreakToken())
           .Layout();
 
-  fragment_ = toNGPhysicalBoxFragment(fragment.get());
   CopyFragmentDataToLayoutBox(*constraint_space);
-  return fragment_;
+  return layout_result_;
 }
 
 MinAndMaxContentSizes NGBlockNode::ComputeMinAndMaxContentSizes() {
   MinAndMaxContentSizes sizes;
   if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
     // 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 borderAndPadding = layout_box_->borderAndPaddingLogicalWidth();
@@ skipping 15 matching lines @@
           .ToConstraintSpace(FromPlatformWritingMode(Style().getWritingMode()));
 
   // TODO(cbiesinger): For orthogonal children, we need to always synthesize.
   NGBlockLayoutAlgorithm minmax_algorithm(this, constraint_space);
   Optional<MinAndMaxContentSizes> maybe_sizes =
       minmax_algorithm.ComputeMinAndMaxContentSizes();
   if (maybe_sizes.has_value())
     return *maybe_sizes;
 
   // Have to synthesize this value.
-  RefPtr<NGPhysicalFragment> physical_fragment = Layout(constraint_space);
+  RefPtr<NGLayoutResult> layout_result = Layout(constraint_space);
+  NGPhysicalFragment* physical_fragment =
+      layout_result->PhysicalFragment().get();
   NGBoxFragment min_fragment(FromPlatformWritingMode(Style().getWritingMode()),
-                             toNGPhysicalBoxFragment(physical_fragment.get()));
+                             toNGPhysicalBoxFragment(physical_fragment));
   sizes.min_content = min_fragment.InlineOverflow();
 
   // Now, redo with infinite space for max_content
   constraint_space =
       NGConstraintSpaceBuilder(
           FromPlatformWritingMode(Style().getWritingMode()))
           .SetTextDirection(Style().direction())
           .SetAvailableSize({LayoutUnit::max(), LayoutUnit()})
           .SetPercentageResolutionSize({LayoutUnit(), LayoutUnit()})
           .ToConstraintSpace(FromPlatformWritingMode(Style().getWritingMode()));
 
-  physical_fragment = Layout(constraint_space);
+  layout_result = Layout(constraint_space);
+  physical_fragment = layout_result->PhysicalFragment().get();
   NGBoxFragment max_fragment(FromPlatformWritingMode(Style().getWritingMode()),
-                             toNGPhysicalBoxFragment(physical_fragment.get()));
+                             toNGPhysicalBoxFragment(physical_fragment));
   sizes.max_content = max_fragment.InlineOverflow();
   return sizes;
 }
 
 const ComputedStyle& NGBlockNode::Style() const {
   if (style_)
     return *style_.get();
   DCHECK(layout_box_);
   return layout_box_->styleRef();
 }
@@ skipping 32 matching lines @@
 
 void NGBlockNode::SetNextSibling(NGLayoutInputNode* sibling) {
   next_sibling_ = sibling;
 }
 
 void NGBlockNode::SetFirstChild(NGLayoutInputNode* child) {
   first_child_ = child;
 }
 
 NGBreakToken* NGBlockNode::CurrentBreakToken() const {
-  return fragment_ ? fragment_->BreakToken() : nullptr;
+  return layout_result_ ? layout_result_->PhysicalFragment()->BreakToken()
+                        : nullptr;
 }
 
 DEFINE_TRACE(NGBlockNode) {
   visitor->trace(next_sibling_);
   visitor->trace(first_child_);
   NGLayoutInputNode::trace(visitor);
 }
 
 bool NGBlockNode::CanUseNewLayout() {
   if (!layout_box_)
@@ skipping 20 matching lines @@
 
   return false;
 }
 
 void NGBlockNode::CopyFragmentDataToLayoutBox(
     const NGConstraintSpace& constraint_space) {
   // We may not have a layout_box_ during unit tests.
   if (!layout_box_)
     return;
 
-  layout_box_->setWidth(fragment_->Width());
-  layout_box_->setHeight(fragment_->Height());
+  NGPhysicalBoxFragment* fragment =
+      toNGPhysicalBoxFragment(layout_result_->PhysicalFragment().get());
+
+  layout_box_->setWidth(fragment->Width());
+  layout_box_->setHeight(fragment->Height());
   NGBoxStrut border_and_padding =
       ComputeBorders(Style()) + ComputePadding(constraint_space, Style());
   LayoutUnit intrinsic_logical_height =
       layout_box_->style()->isHorizontalWritingMode()
-          ? fragment_->HeightOverflow()
-          : fragment_->WidthOverflow();
+          ? fragment->HeightOverflow()
+          : fragment->WidthOverflow();
   intrinsic_logical_height -= border_and_padding.BlockSum();
   layout_box_->setIntrinsicContentLogicalHeight(intrinsic_logical_height);
 
   // We may still have unpositioned floats when we reach the root box.
   if (!layout_box_->parent()) {
-    for (const auto& floating_object : fragment_->PositionedFloats()) {
+    for (const auto& floating_object : fragment->PositionedFloats()) {
       FloatingObjectPositionedUpdated(floating_object, layout_box_);
     }
   }
 
   // TODO(layout-dev): Currently we are not actually performing layout on
   // inline children. For now just clear the needsLayout bit so that we can
   // run unittests.
   if (HasInlineChildren()) {
     for (InlineWalker walker(
              LineLayoutBlockFlow(toLayoutBlockFlow(layout_box_)));
          !walker.atEnd(); walker.advance()) {
       LayoutObject* o = LineLayoutAPIShim::layoutObjectFrom(walker.current());
       o->clearNeedsLayout();
     }
 
     // Ensure the position of the children are copied across to the
     // LayoutObject tree.
   } else {
-    for (const auto& child_fragment : fragment_->Children()) {
+    for (const auto& child_fragment : fragment->Children()) {
       if (child_fragment->IsPlaced())
         FragmentPositionUpdated(toNGPhysicalBoxFragment(*child_fragment));
 
-      for (const auto& floating_object : child_fragment->PositionedFloats()) {
+      for (const auto& floating_object :
+           toNGPhysicalBoxFragment(child_fragment.get())->PositionedFloats()) {
         FloatingObjectPositionedUpdated(
             floating_object, toLayoutBox(child_fragment->GetLayoutObject()));
       }
     }
   }
 
   if (layout_box_->isLayoutBlock())
     toLayoutBlock(layout_box_)->layoutPositionedObjects(true);
   layout_box_->clearNeedsLayout();
   if (layout_box_->isLayoutBlockFlow()) {
     toLayoutBlockFlow(layout_box_)->updateIsSelfCollapsing();
   }
 }
 
-RefPtr<NGPhysicalBoxFragment> NGBlockNode::RunOldLayout(
+RefPtr<NGLayoutResult> NGBlockNode::RunOldLayout(
     const NGConstraintSpace& constraint_space) {
   NGLogicalSize available_size = constraint_space.PercentageResolutionSize();
   LayoutObject* containing_block = layout_box_->containingBlock();
   bool parallel_writing_mode;
   if (!containing_block) {
     parallel_writing_mode = true;
   } else {
     parallel_writing_mode = IsParallelWritingMode(
         FromPlatformWritingMode(containing_block->styleRef().getWritingMode()),
         FromPlatformWritingMode(Style().getWritingMode()));
@@ skipping 50 matching lines @@
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_);
   DCHECK(layout_box_->isOutOfFlowPositioned());
   DCHECK(layout_box_->layer());
   layout_box_->layer()->setStaticBlockPosition(offset.block_offset);
   layout_box_->layer()->setStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink