[LayoutNG] Move bfc_offset_, end_margin_sturt_ to NGLayoutResult

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

Index: third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc
index 368e8725944d76aa943a29926a9e34ffa82ee2ee..21e540fa8a4e42647e3c3bb956ad660a1e3ff791 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_out_of_flow_layout_part.cc
@@ -65,35 +65,28 @@ NGOutOfFlowLayoutPart::NGOutOfFlowLayoutPart(
 }
 
 void NGOutOfFlowLayoutPart::Run() {
-  Vector<NGBlockNode> out_of_flow_candidates;
-  Vector<NGStaticPosition> out_of_flow_candidate_positions;
+  Vector<NGOutOfFlowPositionedDescendant> descendant_candidates;
   container_builder_->GetAndClearOutOfFlowDescendantCandidates(
-      &out_of_flow_candidates, &out_of_flow_candidate_positions);
-
-  while (out_of_flow_candidates.size() > 0) {
-    size_t position_index = 0;
-
-    for (auto& descendant : out_of_flow_candidates) {
-      NGStaticPosition static_position =
-          out_of_flow_candidate_positions[position_index++];
+      &descendant_candidates);
 
+  while (descendant_candidates.size() > 0) {
+    for (auto& candidate : descendant_candidates) {
       if (IsContainingBlockForAbsoluteDescendant(container_style_,
-                                                 descendant.Style())) {
+                                                 candidate.node.Style())) {
         NGLogicalOffset offset;
-        RefPtr<NGLayoutResult> result =
-            LayoutDescendant(descendant, static_position, &offset);
+        RefPtr<NGLayoutResult> result = LayoutDescendant(
+            candidate.node, candidate.static_position, &offset);
         // TODO(atotic) Need to adjust size of overflow rect per spec.
         container_builder_->AddChild(std::move(result), offset);
       } else {
-        container_builder_->AddOutOfFlowDescendant(descendant, static_position);
+        container_builder_->AddOutOfFlowDescendant(candidate);
       }
     }
     // Sweep any descendants that might have been added.
     // This happens when an absolute container has a fixed child.
-    out_of_flow_candidates.clear();
-    out_of_flow_candidate_positions.clear();
+    descendant_candidates.clear();
     container_builder_->GetAndClearOutOfFlowDescendantCandidates(
-        &out_of_flow_candidates, &out_of_flow_candidate_positions);
+        &descendant_candidates);
   }
 }
 
@@ -101,6 +94,8 @@ RefPtr<NGLayoutResult> NGOutOfFlowLayoutPart::LayoutDescendant(
     NGBlockNode descendant,
     NGStaticPosition static_position,
     NGLogicalOffset* offset) {
+  DCHECK(descendant);
+
   // Adjust the static_position origin. The static_position coordinate origin is
   // relative to the container's border box, ng_absolute_utils expects it to be
   // relative to the container's padding box.