Fix google.com rendering: UpdatePosition for descendants

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.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_layout_algorithm.h"
 
 #include "core/layout/ng/ng_absolute_utils.h"
 #include "core/layout/ng/ng_block_break_token.h"
 #include "core/layout/ng/ng_box_fragment.h"
 #include "core/layout/ng/ng_column_mapper.h"
@@ skipping 296 matching lines @@
       break;
   }
 
   content_size_ += border_and_padding_.block_end;
 
   // Recompute the block-axis size now that we know our content size.
   block_size =
       ComputeBlockSizeForFragment(ConstraintSpace(), Style(), content_size_);
   builder_->SetBlockSize(block_size);
 
-  // Out of flow setup.
-  out_of_flow_layout_ = new NGOutOfFlowLayoutPart(&Style(), builder_->Size());
-  builder_->GetAndClearOutOfFlowDescendantCandidates(
-      &out_of_flow_candidates_, &out_of_flow_candidate_positions_);
-  out_of_flow_candidate_positions_index_ = 0;
-  current_child_ = nullptr;
-
-  while (!LayoutOutOfFlowChild())
-    continue;
+  HeapLinkedHashSet<WeakMember<NGBlockNode>> positioned_out_of_flow_children =
+      LayoutOutOfFlowChildren();
 
   builder_->SetInlineOverflow(max_inline_size_).SetBlockOverflow(content_size_);
 
   if (ConstraintSpace().HasBlockFragmentation())
     FinalizeForFragmentation();
 
   *fragment_out = builder_->ToBoxFragment();
+
+  for (auto& node : positioned_out_of_flow_children)
+    node->PositionUpdated();
+
   return kNewFragment;
 }
 
 void NGBlockLayoutAlgorithm::FinishCurrentChildLayout(NGFragment* fragment) {
   NGBoxStrut child_margins = ComputeMargins(
       *space_for_current_child_, CurrentChildStyle(),
       constraint_space_->WritingMode(), constraint_space_->Direction());
 
   NGLogicalOffset fragment_offset;
   if (CurrentChildStyle().isFloating()) {
     fragment_offset = PositionFloatFragment(*fragment, child_margins);
   } else {
     ApplyAutoMargins(*space_for_current_child_, CurrentChildStyle(), *fragment,
                      &child_margins);
     fragment_offset = PositionFragment(*fragment, child_margins);
   }
   if (fragmentainer_mapper_)
     fragmentainer_mapper_->ToVisualOffset(fragment_offset);
   else
     fragment_offset.block_offset -= PreviousBreakOffset();
   builder_->AddChild(fragment, fragment_offset);
 }
 
-bool NGBlockLayoutAlgorithm::LayoutOutOfFlowChild() {
-  if (out_of_flow_candidates_.isEmpty()) {
-    out_of_flow_layout_ = nullptr;
-    out_of_flow_candidate_positions_.clear();
-    return true;
+HeapLinkedHashSet<WeakMember<NGBlockNode>>
+NGBlockLayoutAlgorithm::LayoutOutOfFlowChildren() {
+  HeapLinkedHashSet<WeakMember<NGBlockNode>> out_of_flow_candidates;
+  Vector<NGStaticPosition> out_of_flow_candidate_positions;
+  builder_->GetAndClearOutOfFlowDescendantCandidates(
+      &out_of_flow_candidates, &out_of_flow_candidate_positions);
+
+  Member<NGOutOfFlowLayoutPart> out_of_flow_layout =
+      new NGOutOfFlowLayoutPart(&Style(), builder_->Size());
+  HeapLinkedHashSet<WeakMember<NGBlockNode>> positioned_children;
+  size_t candidate_positions_index = 0;
+
+  for (auto& child : out_of_flow_candidates) {
+    NGStaticPosition static_position =
+        out_of_flow_candidate_positions[candidate_positions_index++];
+
+    if (IsContainingBlockForAbsoluteChild(Style(), *child->Style())) {
+      NGFragment* fragment;
+      NGLogicalOffset offset;
+      out_of_flow_layout->Layout(*child, static_position, &fragment, &offset);
+      // TODO(atotic) Need to adjust size of overflow rect per spec.
+      positioned_children.add(child);
+      builder_->AddChild(fragment, offset);
+    } else {
+      builder_->AddOutOfFlowDescendant(child, static_position);
+    }
   }
-  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_++];
-
-  if (IsContainingBlockForAbsoluteChild(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);
-  } else {
-    builder_->AddOutOfFlowDescendant(current_child_, static_position);
-  }
-
-  return false;
+  return positioned_children;
 }
 
 bool NGBlockLayoutAlgorithm::ProceedToNextUnfinishedSibling(
     NGPhysicalFragment* child_fragment) {
   DCHECK(current_child_);
   NGBlockNode* finished_child = current_child_;
   current_child_ = current_child_->NextSibling();
   if (!ConstraintSpace().HasBlockFragmentation() && !fragmentainer_mapper_)
     return true;
   // If we're resuming layout after a fragmentainer break, we need to skip
@@ skipping 283 matching lines @@
 
 DEFINE_TRACE(NGBlockLayoutAlgorithm) {
   NGLayoutAlgorithm::trace(visitor);
   visitor->trace(first_child_);
   visitor->trace(constraint_space_);
   visitor->trace(break_token_);
   visitor->trace(builder_);
   visitor->trace(space_builder_);
   visitor->trace(space_for_current_child_);
   visitor->trace(current_child_);
-  visitor->trace(out_of_flow_layout_);
-  visitor->trace(out_of_flow_candidates_);
   visitor->trace(fragmentainer_mapper_);
 }
 
 }  // namespace blink