(CANCELED) [LayoutNG] Use ChildrenInline() to determine if children are inline

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/LayoutMultiColumnFlowThread.h"
 #include "core/layout/LayoutMultiColumnSet.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
@@ skipping 204 matching lines @@
       }
     }
   }
   return next_sibling_;
 }
 
 LayoutObject* NGBlockNode::GetLayoutObject() {
   return layout_box_;
 }
 
-static bool ShouldHandleByInlineContext(LayoutObject* child) {
-  DCHECK(child);
-  // The spec isn't clear about whether floats/OOF should be in inline
-  // formatting context or in block formatting context.
-  // Prefer inline formatting context because 1) floats/OOF at the beginning
-  // and in the middle of inline should be handled in the same code, and 2)
-  // it matches to the LayoutObject tree.
-  for (; child; child = child->NextSibling()) {
-    if (child->IsInline())
-      return true;
-    if (child->IsFloating() || child->IsOutOfFlowPositioned())
-      continue;
-    return false;
-  }
-  // All children are either float or OOF.
-  // TODO(kojii): Should this be handled in block context or inline context?
-  // If we handle in inline, we can remove all code for floats/OOF from block
-  // layout, but it may change semantics and causes incorrectness?
-  return false;
-}
-
 NGLayoutInputNode* NGBlockNode::FirstChild() {
   if (!first_child_) {
     LayoutObject* child = layout_box_->SlowFirstChild();
     if (child) {
-      if (ShouldHandleByInlineContext(child)) {
+      if (layout_box_->ChildrenInline()) {
         first_child_ = new NGInlineNode(child, ToLayoutBlockFlow(layout_box_));
       } else {
         first_child_ = new NGBlockNode(child);
       }
     }
   }
   return first_child_;
 }
 
 DEFINE_TRACE(NGBlockNode) {
@@ skipping 126 matching lines @@
 
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_->IsOutOfFlowPositioned());
   DCHECK(layout_box_->Layer());
   layout_box_->Layer()->SetStaticBlockPosition(offset.block_offset);
   layout_box_->Layer()->SetStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink