Don't store bools in NGLayoutResult::RareData().

There's plenty of room in NGLayoutResult::Bitfields.

Change-Id: If0138c4385acde5b0cc4762876c941d854decf48
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3132980
Commit-Queue: Ian Kilpatrick <[email protected]>
Reviewed-by: Ian Kilpatrick <[email protected]>
Cr-Commit-Position: refs/heads/main@{#916813}

Author: mstensho

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

@@ -84,7 +84,7 @@ NGLayoutResult::NGLayoutResult(
       rare_data->minimal_space_shortage = builder->minimal_space_shortage_;
     }
 
-    rare_data->has_violating_break =
+    bitfields_.has_violating_break =
         builder->HasViolatingDescendantBreak() ||
         (builder->DidBreakSelf() &&
          builder->break_appeal_ < kBreakAppealPerfect);
@@ -244,8 +244,7 @@ NGLayoutResult::NGLayoutResult(
 
   if (builder->column_spanner_) {
     EnsureRareData()->column_spanner = builder->column_spanner_;
-    EnsureRareData()->is_empty_spanner_parent =
-        builder->is_empty_spanner_parent_;
+    bitfields_.is_empty_spanner_parent = builder->is_empty_spanner_parent_;
   }
 
   if (HasRareData()) {

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

@@ -112,8 +112,16 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
     return HasRareData() ? rare_data_->column_spanner : NGBlockNode(nullptr);
   }
 
+  // True if this result is the parent of a column spanner and is empty (i.e.
+  // has no children). This is used to determine whether the column spanner
+  // margins should collapse. Note that |is_empty_spanner_parent| may be false
+  // even if this column spanner parent is actually empty. This can happen in
+  // the case where the spanner parent has no children but has not broken
+  // previously - in which case, we shouldn't collapse the spanner margins since
+  // we do not want to collapse margins with a column spanner outside of this
+  // parent.
   bool IsEmptySpannerParent() const {
-    return HasRareData() && rare_data_->is_empty_spanner_parent;
+    return bitfields_.is_empty_spanner_parent;
   }
 
   const NGEarlyBreak* GetEarlyBreak() const {
@@ -219,9 +227,7 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
   // by break-{after,before,inside}:avoid or orphans / widows, or if we had to
   // break at an invalid breakpoint (e.g. before/after the first/last
   // child). This is used for column balancing.
-  bool HasViolatingBreak() const {
-    return HasRareData() && rare_data_->has_violating_break;
-  }
+  bool HasViolatingBreak() const { return bitfields_.has_violating_break; }
 
   SerializedScriptValue* CustomLayoutData() const {
     return HasRareData() ? rare_data_->custom_layout_data.get() : nullptr;
@@ -449,7 +455,6 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
           line_box_bfc_block_offset(rare_data.line_box_bfc_block_offset),
           annotation_overflow(rare_data.annotation_overflow),
           block_end_annotation_space(rare_data.block_end_annotation_space),
-          has_violating_break(rare_data.has_violating_break),
           lines_until_clamp(rare_data.lines_until_clamp),
           table_column_count_(rare_data.table_column_count_),
           math_layout_data_(rare_data.math_layout_data_) {
@@ -485,16 +490,6 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
     absl::optional<LayoutUnit> line_box_bfc_block_offset;
     LayoutUnit annotation_overflow;
     LayoutUnit block_end_annotation_space;
-    bool has_violating_break = false;
-    // True if this result is the parent of a column spanner and is empty (i.e.
-    // has no children). This is used to determine whether the column spanner
-    // margins should collapse. Note that |is_empty_spanner_parent| may be false
-    // even if this column spanner parent is actually empty. This can happen in
-    // the case where the spanner parent has no children but has not broken
-    // previously - in which case, we shouldn't collapse the spanner margins
-    // since we do not want to collapse margins with a column spanner outside of
-    // this parent.
-    bool is_empty_spanner_parent = false;
     int lines_until_clamp = 0;
     wtf_size_t table_column_count_ = 0;
     std::unique_ptr<const NGGridData> grid_layout_data_;
@@ -551,6 +546,8 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
     unsigned is_bfc_block_offset_nullopt : 1;
 
     unsigned has_forced_break : 1;
+    unsigned has_violating_break : 1;
+    unsigned is_empty_spanner_parent : 1;
 
     unsigned is_self_collapsing : 1;
     unsigned is_pushed_by_floats : 1;