Lists: Render marker text closer to list items.

third_party/WebKit/Source/core/layout/LayoutListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 1103 matching lines @@
         break;
     case ListStyleCategory::Symbol:
         m_text = listMarkerText(style()->listStyleType(), 0); // value is ignored for these types
         break;
     case ListStyleCategory::Language:
         m_text = listMarkerText(style()->listStyleType(), m_listItem->value());
         break;
     }
 }
 
+LayoutUnit LayoutListMarker::getWidthOfTextWithSuffix() const
+{
+    if (m_text.isEmpty())
+        return 0;
+    const Font& font = style()->font();
+    LayoutUnit itemWidth = font.width(m_text);
+    // TODO(wkorman): Look into constructing a text run for both text and suffix
+    // and painting them together.
+    UChar suffix[2] = { listMarkerSuffix(style()->listStyleType(), m_listItem->value()), ' ' };
+    TextRun run = constructTextRun(font, suffix, 2, styleRef(), style()->direction());
+    LayoutUnit suffixSpaceWidth = font.width(run);
+    return itemWidth + suffixSpaceWidth;
+}
+
 void LayoutListMarker::computePreferredLogicalWidths()
 {
     ASSERT(preferredLogicalWidthsDirty());
     updateContent();
 
     if (isImage()) {
         LayoutSize imageSize = m_image->imageSize(this, style()->effectiveZoom());
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = style()->isHorizontalWritingMode() ? imageSize.width() : imageSize.height();
         clearPreferredLogicalWidthsDirty();
         updateMargins();
         return;
     }
 
     const Font& font = style()->font();
 
     LayoutUnit logicalWidth = 0;
     switch (listStyleCategory()) {
     case ListStyleCategory::None:
         break;
     case ListStyleCategory::Symbol:
         logicalWidth = (font.fontMetrics().ascent() * 2 / 3 + 1) / 2 + 2;
         break;
     case ListStyleCategory::Language:
-        if (m_text.isEmpty()) {
-            logicalWidth = 0;
-        } else {
-            LayoutUnit itemWidth = font.width(m_text);
-            UChar suffixSpace[2] = { listMarkerSuffix(style()->listStyleType(), m_listItem->value()), ' ' };
-            LayoutUnit suffixSpaceWidth = font.width(constructTextRun(font, suffixSpace, 2, styleRef(), style()->direction()));
-            logicalWidth = itemWidth + suffixSpaceWidth;
-        }
+        logicalWidth = getWidthOfTextWithSuffix();
         break;
     }
 
     m_minPreferredLogicalWidth = logicalWidth;
     m_maxPreferredLogicalWidth = logicalWidth;
 
     clearPreferredLogicalWidthsDirty();
 
     updateMargins();
 }
@@ skipping 18 matching lines @@
                 break;
             }
         }
     } else {
         if (style()->isLeftToRightDirection()) {
             if (isImage()) {
                 marginStart = -minPreferredLogicalWidth() - cMarkerPadding;
             } else {
                 int offset = fontMetrics.ascent() * 2 / 3;
                 switch (listStyleCategory()) {
+                case ListStyleCategory::None:
+                    break;
                 case ListStyleCategory::Symbol:
                     marginStart = -offset - cMarkerPadding - 1;
                     break;
-                case ListStyleCategory::None:
-                    break;
                 default:
-                    marginStart = m_text.isEmpty() ? LayoutUnit() : -minPreferredLogicalWidth() - offset / 2;
+                    marginStart = m_text.isEmpty() ? LayoutUnit() : -minPreferredLogicalWidth();
                 }
             }
             marginEnd = -marginStart - minPreferredLogicalWidth();
         } else {
             if (isImage()) {
                 marginEnd = cMarkerPadding;
             } else {
                 int offset = fontMetrics.ascent() * 2 / 3;
                 switch (listStyleCategory()) {
+                case ListStyleCategory::None:
+                    break;
                 case ListStyleCategory::Symbol:
                     marginEnd = offset + cMarkerPadding + 1 - minPreferredLogicalWidth();
                     break;
-                case ListStyleCategory::None:
-                    break;
                 default:
-                    marginEnd = m_text.isEmpty() ? 0 : offset / 2;
+                    marginEnd = 0;
                 }
             }
             marginStart = -marginEnd - minPreferredLogicalWidth();
         }
 
     }
 
     mutableStyleRef().setMarginStart(Length(marginStart, Fixed));
     mutableStyleRef().setMarginEnd(Length(marginEnd, Fixed));
 }
@@ skipping 95 matching lines @@
     switch (listStyleCategory()) {
     case ListStyleCategory::None:
         return IntRect();
     case ListStyleCategory::Symbol: {
         // TODO(wkorman): Review and clean up/document the calculations below.
         // http://crbug.com/543193
         const FontMetrics& fontMetrics = style()->fontMetrics();
         int ascent = fontMetrics.ascent();
         int bulletWidth = (ascent * 2 / 3 + 1) / 2;
         relativeRect = IntRect(1, 3 * (ascent - ascent * 2 / 3) / 2, bulletWidth, bulletWidth);
+        }
         break;
-    }
     case ListStyleCategory::Language:
-        if (m_text.isEmpty())
-            return IntRect();
-        const Font& font = style()->font();
-        int itemWidth = font.width(m_text);
-        UChar suffixSpace[2] = { listMarkerSuffix(style()->listStyleType(), m_listItem->value()), ' ' };
-        int suffixSpaceWidth = font.width(constructTextRun(font, suffixSpace, 2, styleRef(), style()->direction()));
-        relativeRect = IntRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height());
+        relativeRect = IntRect(0, 0, getWidthOfTextWithSuffix(), style()->font().fontMetrics().height());
+        break;
     }
 
     if (!style()->isHorizontalWritingMode()) {
         relativeRect = relativeRect.transposedRect();
         relativeRect.setX(size().width() - relativeRect.x() - relativeRect.width());
     }
 
     return relativeRect;
 }
 
@@ skipping 31 matching lines @@
     if (style()) {
         // Reuse the current margins. Otherwise resetting the margins to initial values
         // would trigger unnecessary layout.
         newStyle->setMarginStart(style()->marginStart());
         newStyle->setMarginEnd(style()->marginRight());
     }
     setStyle(newStyle.release());
 }
 
 } // namespace blink