[LayoutNG] Update the type of stored inner multicols with pending OOFs

Update the stored type of inner multicols with pending OOFs added in
CL:2612392 from NGBlockNode to LayoutBox*. This was requested as it
makes converting NGBlockNode to a GarbageCollected class easier.

Bug: 1079031
Change-Id: If2bf19de5774b7f003650b2c8f923cba4adfbe3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2630730
Commit-Queue: Alison Maher <almaher@microsoft.com>
Reviewed-by: Yuki Yamada <yukiy@chromium.org>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844189}

third_party/blink/renderer/core/layout/ng/ng_block_node.h

@@ -244,18 +244,6 @@ class CORE_EXPORT NGBlockNode : public NGLayoutInputNode {
       LayoutUnit percentage_resolution_inline_size) const;
 };
 
-// The NGBlockNode hash is based on its LayoutBox member.
-struct NGBlockNodeHash : PtrHash<const LayoutBox*> {
-  STATIC_ONLY(NGBlockNodeHash);
-  static unsigned GetHash(const NGBlockNode& key) {
-    return PtrHash<const LayoutBox>::GetHash(key.GetLayoutBox());
-  }
-  static bool Equal(const NGBlockNode& a, const NGBlockNode& b) {
-    return PtrHash<const LayoutBox>::Equal(a.GetLayoutBox(), b.GetLayoutBox());
-  }
-  static const bool safe_to_compare_to_empty_or_deleted = true;
-};
-
 template <>
 struct DowncastTraits<NGBlockNode> {
   static bool AllowFrom(const NGLayoutInputNode& node) {
@@ -265,31 +253,4 @@ struct DowncastTraits<NGBlockNode> {
 
 }  // namespace blink
 
-namespace WTF {
-
-template <>
-struct DefaultHash<blink::NGBlockNode> {
-  STATIC_ONLY(DefaultHash);
-  typedef blink::NGBlockNodeHash Hash;
-};
-
-template <>
-struct HashTraits<blink::NGBlockNode>
-    : public GenericHashTraits<blink::NGBlockNode> {
-  static const bool kEmptyValueIsZero = false;
-  static const bool kHasIsEmptyValueFunction = true;
-  static bool IsEmptyValue(const blink::NGBlockNode& value) {
-    return !value.GetLayoutBox();
-  }
-  static blink::NGBlockNode EmptyValue() { return nullptr; }
-  static void ConstructDeletedValue(blink::NGBlockNode& slot, bool) {
-    slot = blink::NGBlockNode(reinterpret_cast<blink::LayoutBox*>(-1));
-  }
-  static bool IsDeletedValue(const blink::NGBlockNode& value) {
-    return value.GetLayoutBox() == reinterpret_cast<blink::LayoutBox*>(-1);
-  }
-};
-
-}  // namespace WTF
-
 #endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_NG_BLOCK_NODE_H_

third_party/blink/renderer/core/layout/ng/ng_container_fragment_builder.cc

@@ -243,11 +243,11 @@ void NGContainerFragmentBuilder::SwapOutOfFlowPositionedCandidates(
 void NGContainerFragmentBuilder::AddMulticolWithPendingOOFs(
     const NGBlockNode& multicol) {
   DCHECK(To<LayoutBlockFlow>(multicol.GetLayoutBox())->MultiColumnFlowThread());
-  multicols_with_pending_oofs_.insert(multicol);
+  multicols_with_pending_oofs_.insert(multicol.GetLayoutBox());
 }
 
 void NGContainerFragmentBuilder::SwapMulticolsWithPendingOOFs(
-    HashSet<NGBlockNode>* multicols_with_pending_oofs) {
+    MulticolCollection* multicols_with_pending_oofs) {
   DCHECK(multicols_with_pending_oofs->IsEmpty());
   std::swap(multicols_with_pending_oofs_, *multicols_with_pending_oofs);
 }
@@ -297,8 +297,8 @@ void NGContainerFragmentBuilder::PropagateOOFPositionedInfo(
   if (box_fragment->HasMulticolsWithPendingOOFs()) {
     const auto& multicols_with_pending_oofs =
         box_fragment->MulticolsWithPendingOOFs();
-    for (const NGBlockNode& multicol : multicols_with_pending_oofs)
-      AddMulticolWithPendingOOFs(multicol);
+    for (LayoutBox* multicol : multicols_with_pending_oofs)
+      AddMulticolWithPendingOOFs(NGBlockNode(multicol));
   }
 
   // If we find a multicol with OOF positioned fragmentainer descendants,

third_party/blink/renderer/core/layout/ng/ng_container_fragment_builder.h

@@ -45,6 +45,7 @@ class CORE_EXPORT NGContainerFragmentBuilder : public NGFragmentBuilder {
     scoped_refptr<const NGPhysicalFragment> fragment;
   };
   typedef Vector<ChildWithOffset, 4> ChildrenVector;
+  using MulticolCollection = HashSet<LayoutBox*>;
 
   LayoutUnit BfcLineOffset() const { return bfc_line_offset_; }
   void SetBfcLineOffset(LayoutUnit bfc_line_offset) {
@@ -142,7 +143,7 @@ class CORE_EXPORT NGContainerFragmentBuilder : public NGFragmentBuilder {
       Vector<NGLogicalOutOfFlowPositionedNode>* descendants);
 
   void SwapMulticolsWithPendingOOFs(
-      HashSet<NGBlockNode>* multicols_with_pending_oofs);
+      MulticolCollection* multicols_with_pending_oofs);
 
   bool HasOutOfFlowPositionedCandidates() const {
     return !oof_positioned_candidates_.IsEmpty();
@@ -260,7 +261,7 @@ class CORE_EXPORT NGContainerFragmentBuilder : public NGFragmentBuilder {
       oof_positioned_fragmentainer_descendants_;
   Vector<NGLogicalOutOfFlowPositionedNode> oof_positioned_descendants_;
 
-  HashSet<NGBlockNode> multicols_with_pending_oofs_;
+  MulticolCollection multicols_with_pending_oofs_;
 
   NGUnpositionedListMarker unpositioned_list_marker_;
 

third_party/blink/renderer/core/layout/ng/ng_out_of_flow_layout_part.cc

@@ -145,12 +145,13 @@ void NGOutOfFlowLayoutPart::Run(const LayoutBox* only_layout) {
     }
 
     if (container_builder_->HasMulticolsWithPendingOOFs()) {
-      HashSet<NGBlockNode> multicols_with_pending_oofs;
+      NGContainerFragmentBuilder::MulticolCollection
+          multicols_with_pending_oofs;
       container_builder_->SwapMulticolsWithPendingOOFs(
           &multicols_with_pending_oofs);
       DCHECK(!multicols_with_pending_oofs.IsEmpty());
-      for (const NGBlockNode& multicol : multicols_with_pending_oofs)
-        LayoutOOFsInMulticol(multicol);
+      for (LayoutBox* multicol : multicols_with_pending_oofs)
+        LayoutOOFsInMulticol(NGBlockNode(multicol));
     }
   }
 

third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.h

@@ -34,6 +34,7 @@ class CORE_EXPORT NGPhysicalBoxFragment final
                                const base::Optional<PhysicalRect>
                                    updated_layout_overflow = base::nullopt);
 
+  using MulticolCollection = NGContainerFragmentBuilder::MulticolCollection;
   using PassKey = base::PassKey<NGPhysicalBoxFragment>;
   NGPhysicalBoxFragment(PassKey,
                         NGBoxFragmentBuilder* builder,
@@ -161,10 +162,10 @@ class CORE_EXPORT NGPhysicalBoxFragment final
     return !ComputeRareDataAddress()->multicols_with_pending_oofs.IsEmpty();
   }
 
-  HashSet<NGBlockNode> MulticolsWithPendingOOFs() const {
+  MulticolCollection MulticolsWithPendingOOFs() const {
     if (!has_rare_data_)
-      return HashSet<NGBlockNode>();
-    return const_cast<HashSet<NGBlockNode>&>(
+      return MulticolCollection();
+    return const_cast<MulticolCollection&>(
         ComputeRareDataAddress()->multicols_with_pending_oofs);
   }
 
@@ -319,7 +320,7 @@ class CORE_EXPORT NGPhysicalBoxFragment final
 
     Vector<NGPhysicalOutOfFlowPositionedNode>
         oof_positioned_fragmentainer_descendants;
-    HashSet<NGBlockNode> multicols_with_pending_oofs;
+    MulticolCollection multicols_with_pending_oofs;
     const std::unique_ptr<const NGMathMLPaintInfo> mathml_paint_info;
 
     // TablesNG rare data.