[LayoutNG] Remove the state machine from ng_out_of_flow_layout_part.

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

Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
index ef259608b6a7629e153cdb1c81ab18ab62122dbc..3eb547b78ef7665228de3ae991e4413d88d426f3 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
@@ -4,6 +4,7 @@
 
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 
+#include "core/layout/ng/ng_absolute_utils.h"
 #include "core/layout/ng/ng_box_fragment.h"
 #include "core/layout/ng/ng_break_token.h"
 #include "core/layout/ng/ng_constraint_space.h"
@@ -374,30 +375,27 @@ void NGBlockLayoutAlgorithm::FinishCurrentChildLayout(NGFragment* fragment) {
 }
 
 bool NGBlockLayoutAlgorithm::LayoutOutOfFlowChild() {
-  if (!current_child_) {
-    if (out_of_flow_candidates_.isEmpty()) {
-      out_of_flow_layout_ = nullptr;
-      out_of_flow_candidate_positions_.clear();
-      return true;
-    }
-    current_child_ = out_of_flow_candidates_.first();
-    out_of_flow_candidates_.removeFirst();
-    NGStaticPosition position = out_of_flow_candidate_positions_
-        [out_of_flow_candidate_positions_index_++];
-
-    if (!out_of_flow_layout_->StartLayout(current_child_, position)) {
-      builder_->AddOutOfFlowDescendant(current_child_, position);
-      current_child_ = nullptr;
-      return false;
-    }
+  if (out_of_flow_candidates_.isEmpty()) {
+    out_of_flow_layout_ = nullptr;
+    out_of_flow_candidate_positions_.clear();
+    return true;
   }
-  NGFragment* fragment;
-  NGLogicalOffset offset;
-  if (out_of_flow_layout_->Layout(&fragment, &offset) == kNewFragment) {
+  current_child_ = out_of_flow_candidates_.first();
+  out_of_flow_candidates_.removeFirst();
+  NGStaticPosition static_position = out_of_flow_candidate_positions_
+      [out_of_flow_candidate_positions_index_++];

[atotic, 2017/01/18 20:02:16]

out_of_flow_candidate_positions_index_ should be a local variable now, the
entire iteration happens here.

Looking at the rest of the code, you can move entire "Out of flow setup" from
kStatePrepareForChildLayout into LayoutOutOfFlowChild().

I assume you were planning on doing this later, when redoing
NGBlockLAyoutAlgorithm.

[ikilpatrick, 2017/01/18 21:32:19]

I'll fix this in a follow up so not to make this patch too large.

+
+  if (IsContainerForAbsoluteChild(Style(), *current_child_->Style())) {
+    NGFragment* fragment;
+    NGLogicalOffset offset;
+    out_of_flow_layout_->Layout(*current_child_, static_position, &fragment,
+                                &offset);
     // TODO(atotic) Need to adjust size of overflow rect per spec.
     builder_->AddChild(fragment, offset);
-    current_child_ = nullptr;
+  } else {
+    builder_->AddOutOfFlowDescendant(current_child_, static_position);
   }
+
   return false;
 }