[LayoutNG] Don't pass parent NGFragmentBuilder into NGLineBuilder.

BUG=636993

Review-Url: https://codereview.chromium.org/2750213002
Cr-Commit-Position: refs/heads/master@{#457822}

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

@@ -458,14 +458,9 @@ RefPtr<NGLayoutResult> NGBlockLayoutAlgorithm::Layout() {
 
     RefPtr<NGConstraintSpace> child_space =
         CreateConstraintSpaceForChild(child);
+    RefPtr<NGLayoutResult> layout_result =
+        child->Layout(child_space.get(), child_break_token);
 
-    RefPtr<NGLayoutResult> layout_result;
-    if (child->Type() == NGLayoutInputNode::kLegacyInline) {
-      layout_result = toNGInlineNode(child)->Layout(
-          child_space.get(), &builder_, child_break_token);
-    } else {
-      layout_result = child->Layout(child_space.get(), child_break_token);
-    }
     FinishChildLayout(child, child_space.get(), layout_result);
 
     entry = child_iterator.NextChild();

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

@@ -263,17 +263,11 @@ void NGInlineNode::ShapeText() {
   }
 }
 
-RefPtr<NGLayoutResult> NGInlineNode::Layout(NGConstraintSpace*, NGBreakToken*) {
-  ASSERT_NOT_REACHED();
-  return nullptr;
-}
-
 RefPtr<NGLayoutResult> NGInlineNode::Layout(NGConstraintSpace* constraint_space,
-                                            NGFragmentBuilder* parent_builder,
-                                            NGBreakToken* break_token) {
+                                            NGBreakToken*) {
   // TODO(kojii): Invalidate PrepareLayout() more efficiently.
   InvalidatePrepareLayout();
-  NGLineBuilder line_builder(this, constraint_space, parent_builder);
+  NGLineBuilder line_builder(this, constraint_space);
   Layout(&line_builder);
   RefPtr<NGLayoutResult> result = line_builder.CreateFragments();
   line_builder.CopyFragmentDataToLayoutBlockFlow();
@@ -301,7 +295,7 @@ MinMaxContentSize NGInlineNode::ComputeMinMaxContentSize() {
           .SetTextDirection(BlockStyle()->direction())
           .SetAvailableSize({LayoutUnit(), NGSizeIndefinite})
           .ToConstraintSpace(writing_mode);
-  NGLineBuilder line_builder(this, constraint_space.get(), nullptr);
+  NGLineBuilder line_builder(this, constraint_space.get());
   Layout(&line_builder);
   MinMaxContentSize sizes;
   sizes.min_content = line_builder.MaxInlineSize();

third_party/WebKit/Source/core/layout/ng/ng_inline_node.h

@@ -25,7 +25,6 @@ class LayoutObject;
 class LayoutUnit;
 struct MinMaxContentSize;
 class NGConstraintSpace;
-class NGFragmentBuilder;
 class NGLayoutInlineItem;
 class NGLayoutInlineItemRange;
 class NGLayoutInlineItemsBuilder;
@@ -44,9 +43,6 @@ class CORE_EXPORT NGInlineNode : public NGLayoutInputNode {
   NGLayoutInputNode* NextSibling() override;
 
   RefPtr<NGLayoutResult> Layout(NGConstraintSpace*, NGBreakToken*) override;
-  RefPtr<NGLayoutResult> Layout(NGConstraintSpace*,
-                                NGFragmentBuilder*,
-                                NGBreakToken*);
   LayoutObject* GetLayoutObject() override;
 
   // Computes the value of min-content and max-content for this anonymous block

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

@@ -89,7 +89,7 @@ class NGInlineNodeTest : public RenderingTest {
     RefPtr<NGConstraintSpace> constraint_space =
         NGConstraintSpaceBuilder(kHorizontalTopBottom)
             .ToConstraintSpace(kHorizontalTopBottom);
-    NGLineBuilder line_builder(node, constraint_space.get(), nullptr);
+    NGLineBuilder line_builder(node, constraint_space.get());
 
     NGTextLayoutAlgorithm algorithm(node);
     algorithm.LayoutInline(&line_builder);

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

@@ -22,11 +22,9 @@
 namespace blink {
 
 NGLineBuilder::NGLineBuilder(NGInlineNode* inline_box,
-                             NGConstraintSpace* constraint_space,
-                             NGFragmentBuilder* containing_block_builder)
+                             NGConstraintSpace* constraint_space)
     : inline_box_(inline_box),
       constraint_space_(constraint_space),
-      containing_block_builder_(containing_block_builder),
       container_builder_(NGPhysicalFragment::kFragmentBox, inline_box_),
       container_layout_result_(nullptr),
       is_horizontal_writing_mode_(
@@ -309,13 +307,17 @@ void NGLineBuilder::PlaceItems(
     } else {
       LayoutObject* layout_object = item.GetLayoutObject();
       if (layout_object->isOutOfFlowPositioned()) {
-        if (containing_block_builder_) {
-          // Absolute positioning blockifies the box's display type.
-          // https://drafts.csswg.org/css-display/#transformations
-          containing_block_builder_->AddOutOfFlowChildCandidate(
-              new NGBlockNode(layout_object),
-              NGLogicalOffset(line_box_data.inline_size, content_size_));
-        }
+        // Absolute positioning blockifies the box's display type.
+        // https://drafts.csswg.org/css-display/#transformations
+        //
+        // TODO(layout-dev): Report the correct static position for the out of
+        // flow descendant. We can't do this here yet as it doesn't know the
+        // size of the line box.
+        container_builder_.AddOutOfFlowDescendant(
+            new NGBlockNode(layout_object),
+            NGStaticPosition::Create(ConstraintSpace().WritingMode(),
+                                     ConstraintSpace().Direction(),
+                                     NGPhysicalOffset()));
         continue;
       } else if (layout_object->isFloating()) {
         // TODO(kojii): Implement float.

third_party/WebKit/Source/core/layout/ng/ng_line_builder.h

@@ -31,7 +31,7 @@ class CORE_EXPORT NGLineBuilder final {
   STACK_ALLOCATED();
 
  public:
-  NGLineBuilder(NGInlineNode*, NGConstraintSpace*, NGFragmentBuilder*);
+  NGLineBuilder(NGInlineNode*, NGConstraintSpace*);
 
   const NGConstraintSpace& ConstraintSpace() const {
     return *constraint_space_;
@@ -159,7 +159,6 @@ class CORE_EXPORT NGLineBuilder final {
 
   Persistent<NGInlineNode> inline_box_;
   NGConstraintSpace* constraint_space_;  // Not owned as STACK_ALLOCATED.
-  NGFragmentBuilder* containing_block_builder_;
   Vector<RefPtr<NGLayoutResult>, 32> layout_results_;
   Vector<LineBoxData, 32> line_box_data_list_;
   unsigned start_index_ = 0;