Move oof-descendants to NGPhysicalFragmentBase

third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.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_fragment_builder.h"
 #include "core/layout/ng/ng_block_node.h"
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
@@ skipping 32 matching lines @@
   return *this;
 }
 
 NGFragmentBuilder& NGFragmentBuilder::AddChild(NGFragmentBase* child,
                                                NGLogicalOffset child_offset) {
   DCHECK_EQ(type_, NGPhysicalFragmentBase::kFragmentBox)
       << "Only box fragments can have children";
   children_.append(child->PhysicalFragment());
   offsets_.append(child_offset);
   // Collect child's out of flow descendants.
-  // TODO(atotic) All fragments can carry oof descendants.
-  // Therefore, oof descendants should move from NGPhysicalFragment to
-  // NGPhysicalFragmentBase
-  if (child->PhysicalFragment()->Type() ==
-      NGPhysicalFragmentBase::kFragmentBox) {
-    const NGPhysicalFragment* physical_child =
-        static_cast<const NGPhysicalFragment*>(&*child->PhysicalFragment());
-    const Vector<NGStaticPosition>& oof_positions =
-        physical_child->OutOfFlowPositions();
-    size_t oof_index = 0;
-    for (auto& oof_node : physical_child->OutOfFlowDescendants()) {
-      NGStaticPosition oof_position = oof_positions[oof_index++];
-      out_of_flow_descendant_candidates_.add(oof_node);
-      out_of_flow_candidate_placements_.append(
-          OutOfFlowPlacement{child_offset, oof_position});
-    }
+  const NGPhysicalFragmentBase* physical_fragment = child->PhysicalFragment();
+  const Vector<NGStaticPosition>& oof_positions =
+      physical_fragment->OutOfFlowPositions();
+  size_t oof_index = 0;
+  for (auto& oof_node : physical_fragment->OutOfFlowDescendants()) {
+    NGStaticPosition oof_position = oof_positions[oof_index++];
+    out_of_flow_descendant_candidates_.add(oof_node);
+    out_of_flow_candidate_placements_.append(
+        OutOfFlowPlacement{child_offset, oof_position});
   }
   return *this;
 }
 
 NGFragmentBuilder& NGFragmentBuilder::AddOutOfFlowChildCandidate(
     NGBlockNode* child,
     NGLogicalOffset child_offset) {
   out_of_flow_descendant_candidates_.add(child);
   NGStaticPosition child_position =
       NGStaticPosition::Create(writing_mode_, direction_, NGPhysicalOffset());
@@ skipping 74 matching lines @@
       out_of_flow_descendants_, out_of_flow_positions_, margin_strut_);
 }
 
 DEFINE_TRACE(NGFragmentBuilder) {
   visitor->trace(children_);
   visitor->trace(out_of_flow_descendant_candidates_);
   visitor->trace(out_of_flow_descendants_);
 }
 
 }  // namespace blink