[LayoutNG] Make NG algorithms non-oilpan.

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_layout_algorithm.h"
 #include "core/layout/ng/ng_inline_node.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 {
 
@@ skipping 46 matching lines @@
       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() {}
 
 NGPhysicalFragment* NGBlockNode::Layout(NGConstraintSpace* constraint_space) {
-  // We can either use the new layout code to do the layout and then copy the
-  // resulting size to the LayoutObject, or use the old layout code and
-  // synthesize a fragment.
-  if (CanUseNewLayout()) {
-    NGLayoutAlgorithm* algorithm =
-        NGLayoutInputNode::AlgorithmForInputNode(this, constraint_space);
-    fragment_ = toNGPhysicalBoxFragment(algorithm->Layout());
-    CopyFragmentDataToLayoutBox(*constraint_space);
-  } else {
+  // Use the old layout code and synthesize a fragment.
+  if (!CanUseNewLayout()) {
     DCHECK(layout_box_);
     fragment_ = RunOldLayout(*constraint_space);
+    return fragment_;
   }
 
+  NGPhysicalFragment* fragment;
+
+  if (HasInlineChildren()) {
+    fragment =
+        NGInlineLayoutAlgorithm(GetLayoutObject(), &Style(),
+                                toNGInlineNode(FirstChild()), constraint_space)
+            .Layout();
+  } else {
+    fragment = NGBlockLayoutAlgorithm(GetLayoutObject(), &Style(),
+                                      toNGBlockNode(FirstChild()),
+                                      constraint_space, CurrentBreakToken())
+                   .Layout();
+  }
+
+  fragment_ = toNGPhysicalBoxFragment(fragment);
+  CopyFragmentDataToLayoutBox(*constraint_space);
   return fragment_;
 }
 
 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.
@@ skipping 227 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