tor-browser

commit 35f00baf956d5be02ab0559c732edf325d385905
parent 8980dc11ee10839ee1290718c5476ff306507f03
Author: Ting-Yu Lin <tlin@mozilla.com>
Date:   Fri, 24 Oct 2025 16:19:47 +0000

Bug 1996146 Part 2 - Rename FrameChildListID::Bullet to FrameChildListID::Marker. r=layout-reviewers,dshin

This is a follow-up of Bug 205202.

Differential Revision: https://phabricator.services.mozilla.com/D269900

Diffstat:
M
layout/base/nsCSSFrameConstructor.cpp
 | 
3
+--
M
layout/generic/nsBlockFrame.cpp
 | 
4
++--
M
layout/generic/nsFrameList.cpp
 | 
4
++--
M
layout/generic/nsFrameList.h
 | 
2
+-

4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
@@ -9707,8 +9707,7 @@ void nsCSSFrameConstructor::ProcessChildren(
       for (auto* childFrame : aFrameList) {
         if (markerFrame == childFrame) {
           if (isOutsideMarker) {
-            // SetMarkerFrameForListItem will add childFrame to the
-            // FrameChildListID::Bullet
+            // SetMarkerFrameForListItem will add childFrame to the marker list.
             aFrameList.RemoveFrame(childFrame);
             auto* grandParent = listItem->GetParent()->GetParent();
             if (listItem->Style()->GetPseudoType() ==
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
@@ -725,7 +725,7 @@ const nsFrameList& nsBlockFrame::GetChildList(ChildListID aListID) const {
       const nsFrameList* list = GetPushedFloats();
       return list ? *list : nsFrameList::EmptyList();
     }
-    case FrameChildListID::Bullet: {
+    case FrameChildListID::Marker: {
       const nsFrameList* list = GetOutsideMarkerList();
       return list ? *list : nsFrameList::EmptyList();
     }
@@ -744,7 +744,7 @@ void nsBlockFrame::GetChildLists(nsTArray<ChildList>* aLists) const {
     list->AppendIfNonempty(aLists, FrameChildListID::OverflowOutOfFlow);
   }
   if (const nsFrameList* list = GetOutsideMarkerList()) {
-    list->AppendIfNonempty(aLists, FrameChildListID::Bullet);
+    list->AppendIfNonempty(aLists, FrameChildListID::Marker);
   }
   if (const nsFrameList* list = GetFloats()) {
     list->AppendIfNonempty(aLists, FrameChildListID::Float);
diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp
@@ -471,8 +471,8 @@ const char* ChildListName(FrameChildListID aListID) {
       return "OverflowOutOfFlowList";
     case FrameChildListID::Float:
       return "FloatList";
-    case FrameChildListID::Bullet:
-      return "BulletList";
+    case FrameChildListID::Marker:
+      return "MarkerList";
     case FrameChildListID::PushedFloats:
       return "PushedFloatsList";
     case FrameChildListID::Backdrop:
diff --git a/layout/generic/nsFrameList.h b/layout/generic/nsFrameList.h
@@ -43,7 +43,7 @@ enum class FrameChildListID {
   ExcessOverflowContainers,
   OverflowOutOfFlow,
   Float,
-  Bullet,
+  Marker,
   PushedFloats,
   Backdrop,
   // A special alias for FrameChildListID::Principal that suppress the reflow