[css-pseudo] Use list item computed style when resolving marker margins

The list-style-type and list-style-image properties can affect the kind
of list marker that we have, including its margin. However, what matters
are the values on the originating list item, not on the ::marker itself.

Right now the difference doesn't matter, since ::marker doesn't accept
these properties, and thus must be inherited. But in the future we might
remove the restrictions and accept arbitrary properties in ::marker.

This patch uses the proper ComputedStyle when resolving margins.

Bug: 457718
Change-Id: I41aafb4b0b5778f637af6d74c0f50146a3698be8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2263834Reviewed-by: Koji Ishii <kojii@chromium.org>
Reviewed-by: Rune Lillesveen <futhark@chromium.org>
Commit-Queue: Oriol Brufau <obrufau@igalia.com>
Cr-Commit-Position: refs/heads/master@{#784433}

third_party/blink/renderer/core/css/resolver/style_adjuster.cc

@@ -239,8 +239,7 @@ static void AdjustStyleForMarker(ComputedStyle& style,
        !parent_style.IsInsideListElement());
 
   if (is_inside) {
-    auto margins = ListMarker::InlineMarginsForInside(
-        style, parent_style.GeneratesMarkerImage());
+    auto margins = ListMarker::InlineMarginsForInside(style, parent_style);
     style.SetMarginStart(Length::Fixed(margins.first));
     style.SetMarginEnd(Length::Fixed(margins.second));
   } else {

third_party/blink/renderer/core/layout/layout_list_marker.cc

@@ -260,12 +260,13 @@ void LayoutListMarker::UpdateMargins(LayoutUnit marker_inline_size) {
   LayoutUnit margin_start;
   LayoutUnit margin_end;
   const ComputedStyle& style = StyleRef();
+  const ComputedStyle& list_item_style = ListItem()->StyleRef();
   if (IsInside()) {
     std::tie(margin_start, margin_end) =
-        ListMarker::InlineMarginsForInside(style, IsImage());
+        ListMarker::InlineMarginsForInside(style, list_item_style);
   } else {
     std::tie(margin_start, margin_end) = ListMarker::InlineMarginsForOutside(
-        style, IsImage(), marker_inline_size);
+        style, list_item_style, marker_inline_size);
   }
 
   SetMarginStart(margin_start);

third_party/blink/renderer/core/layout/list_marker.cc

@@ -274,16 +274,16 @@ LayoutUnit ListMarker::WidthOfSymbol(const ComputedStyle& style) {
 }
 
 std::pair<LayoutUnit, LayoutUnit> ListMarker::InlineMarginsForInside(
-    const ComputedStyle& style,
-    bool is_image) {
-  if (!style.ContentBehavesAsNormal())
+    const ComputedStyle& marker_style,
+    const ComputedStyle& list_item_style) {
+  if (!marker_style.ContentBehavesAsNormal())
     return {};
-  if (is_image)
+  if (list_item_style.GeneratesMarkerImage())
     return {LayoutUnit(), LayoutUnit(kCMarkerPaddingPx)};
-  switch (GetListStyleCategory(style.ListStyleType())) {
+  switch (GetListStyleCategory(list_item_style.ListStyleType())) {
     case ListStyleCategory::kSymbol:
       return {LayoutUnit(-1),
-              LayoutUnit(kCUAMarkerMarginEm * style.ComputedFontSize())};
+              LayoutUnit(kCUAMarkerMarginEm * marker_style.ComputedFontSize())};
     default:
       break;
   }
@@ -291,22 +291,22 @@ std::pair<LayoutUnit, LayoutUnit> ListMarker::InlineMarginsForInside(
 }
 
 std::pair<LayoutUnit, LayoutUnit> ListMarker::InlineMarginsForOutside(
-    const ComputedStyle& style,
-    bool is_image,
+    const ComputedStyle& marker_style,
+    const ComputedStyle& list_item_style,
     LayoutUnit marker_inline_size) {
   LayoutUnit margin_start;
   LayoutUnit margin_end;
-  if (!style.ContentBehavesAsNormal()) {
+  if (!marker_style.ContentBehavesAsNormal()) {
     margin_start = -marker_inline_size;
-  } else if (is_image) {
+  } else if (list_item_style.GeneratesMarkerImage()) {
     margin_start = -marker_inline_size - kCMarkerPaddingPx;
     margin_end = LayoutUnit(kCMarkerPaddingPx);
   } else {
-    switch (GetListStyleCategory(style.ListStyleType())) {
+    switch (GetListStyleCategory(list_item_style.ListStyleType())) {
       case ListStyleCategory::kNone:
         break;
       case ListStyleCategory::kSymbol: {
-        const SimpleFontData* font_data = style.GetFont().PrimaryFont();
+        const SimpleFontData* font_data = marker_style.GetFont().PrimaryFont();
         DCHECK(font_data);
         if (!font_data)
           return {};

third_party/blink/renderer/core/layout/list_marker.h

@@ -50,11 +50,11 @@ class CORE_EXPORT ListMarker {
 
   // Compute inline margins for 'list-style-position: inside' and 'outside'.
   static std::pair<LayoutUnit, LayoutUnit> InlineMarginsForInside(
-      const ComputedStyle&,
-      bool is_image);
+      const ComputedStyle& marker_style,
+      const ComputedStyle& list_item_style);
   static std::pair<LayoutUnit, LayoutUnit> InlineMarginsForOutside(
-      const ComputedStyle&,
-      bool is_image,
+      const ComputedStyle& marker_style,
+      const ComputedStyle& list_item_style,
       LayoutUnit marker_inline_size);
 
   static LayoutRect RelativeSymbolMarkerRect(const ComputedStyle&, LayoutUnit);

third_party/blink/renderer/core/layout/ng/list/ng_unpositioned_list_marker.cc

@@ -22,12 +22,6 @@ NGUnpositionedListMarker::NGUnpositionedListMarker(const NGBlockNode& node)
     : NGUnpositionedListMarker(
           ToLayoutNGOutsideListMarker(node.GetLayoutBox())) {}
 
-// Returns true if this is an image marker.
-bool NGUnpositionedListMarker::IsImage() const {
-  DCHECK(marker_layout_object_);
-  return marker_layout_object_->Marker().IsMarkerImage(*marker_layout_object_);
-}
-
 // Compute the inline offset of the marker, relative to the list item.
 // The marker is relative to the border box of the list item and has nothing
 // to do with the content offset.
@@ -35,8 +29,11 @@ bool NGUnpositionedListMarker::IsImage() const {
 LayoutUnit NGUnpositionedListMarker::InlineOffset(
     const LayoutUnit marker_inline_size) const {
   DCHECK(marker_layout_object_);
+  LayoutObject* list_item =
+      marker_layout_object_->Marker().ListItem(*marker_layout_object_);
   auto margins = ListMarker::InlineMarginsForOutside(
-      marker_layout_object_->StyleRef(), IsImage(), marker_inline_size);
+      marker_layout_object_->StyleRef(), list_item->StyleRef(),
+      marker_inline_size);
   return margins.first;
 }
 

third_party/blink/renderer/core/layout/ng/list/ng_unpositioned_list_marker.h

@@ -99,8 +99,6 @@ class CORE_EXPORT NGUnpositionedListMarker final {
 #endif
 
  private:
-  bool IsImage() const;
-
   LayoutUnit ComputeIntrudedFloatOffset(const NGConstraintSpace&,
                                         const NGBoxFragmentBuilder*,
                                         const NGBoxStrut&,