[Subpixel] Subpixelize RenderListMarker

https://bugs.webkit.org/show_bug.cgi?id=142093

Reviewed by Zalan Bujtas.

Source/WebCore:

Use floats instead of ints.

Test: fast/lists/rtl-marker.html

* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint):
(WebCore::RenderListMarker::updateContent):
(WebCore::RenderListMarker::getRelativeMarkerRect):
* rendering/RenderListMarker.h:

LayoutTests:

* platform/mac/TestExpectations: Unskip fast/lists/rtl-marker.html

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index de063f17d4322267fd57d9ec9c888e2d1981893a..de935b673d582e2867eaeff9ac97267dec8c53c6 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-27  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Subpixel] Subpixelize RenderListMarker
+        https://bugs.webkit.org/show_bug.cgi?id=142093
+
+        Reviewed by Zalan Bujtas.
+
+        * platform/mac/TestExpectations: Unskip fast/lists/rtl-marker.html
+
 2015-02-27  Alexey Proskuryakov  <ap@apple.com>
 
         Test gardening, unmark now passing tests.

diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 2fb9ce88050afcc0226b1edae1690a4fef8dfab3..67c0285211a019f5cec1fdd701b33a3203ceab4f 100644 (file)
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1224,7 +1224,6 @@ webkit.org/b/139968 fast/css3-text/css3-text-decoration/no-gap-between-two-round
 webkit.org/b/139968 fast/css3-text/css3-text-decoration/text-decoration-skip/text-decoration-skip-ink-inherit.html [ ImageOnlyFailure ]
 webkit.org/b/139968 fast/inline/hidpi-pixel-gap-between-adjacent-selection-inlines.html [ ImageOnlyFailure ]
 webkit.org/b/139968 fast/inline/hidpi-select-inline-on-subpixel-position.html [ ImageOnlyFailure ]
-webkit.org/b/139968 fast/lists/rtl-marker.html [ ImageOnlyFailure ]
 webkit.org/b/139968 fast/multicol/cell-shrinkback.html [ ImageOnlyFailure ]
 webkit.org/b/139968 fast/multicol/newmulticol/breaks-3-columns-3.html [ ImageOnlyFailure ]
 webkit.org/b/139968 fast/regions/last-region-border-radius.html [ ImageOnlyFailure ]

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5d60b060cc5a700504cccfb7841d56c0b8f5e651..cb34117b2c96236e29ea7797479a8426674eec7c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2015-02-27  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Subpixel] Subpixelize RenderListMarker
+        https://bugs.webkit.org/show_bug.cgi?id=142093
+
+        Reviewed by Zalan Bujtas.
+
+        Use floats instead of ints.
+
+        Test: fast/lists/rtl-marker.html
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::paint):
+        (WebCore::RenderListMarker::updateContent):
+        (WebCore::RenderListMarker::getRelativeMarkerRect):
+        * rendering/RenderListMarker.h:
+
 2015-02-27  Timothy Horton  <timothy_horton@apple.com>
 
         <attachment> should be selected immediately upon click, and be drag/copyable upon click

diff --git a/Source/WebCore/rendering/RenderListMarker.cpp b/Source/WebCore/rendering/RenderListMarker.cpp
index f746f45b02c6acc82736f0d27b1ae7cbcc095c46..ad42e825798045635f236a60d41019a229cab161 100644 (file)
--- a/Source/WebCore/rendering/RenderListMarker.cpp
+++ b/Source/WebCore/rendering/RenderListMarker.cpp
@@ -1186,13 +1186,13 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse
     overflowRect.moveBy(boxOrigin);
     overflowRect.inflate(maximalOutlineSize(paintInfo.phase));
 
-    if (!paintInfo.rect.intersects(snappedIntRect(overflowRect)))
+    if (!paintInfo.rect.intersects(overflowRect))
         return;
 
     LayoutRect box(boxOrigin, size());
     
-    IntRect marker = getRelativeMarkerRect();
-    marker.moveBy(roundedIntPoint(boxOrigin));
+    FloatRect marker = getRelativeMarkerRect();
+    marker.moveBy(boxOrigin);
 
     GraphicsContext* context = paintInfo.context;
 
@@ -1319,47 +1319,51 @@ void RenderListMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffse
 
     GraphicsContextStateSaver stateSaver(*context, false);
     if (!style().isHorizontalWritingMode()) {
-        marker.moveBy(roundedIntPoint(-boxOrigin));
+        marker.moveBy(-boxOrigin);
         marker = marker.transposedRect();
-        marker.moveBy(IntPoint(roundToInt(box.x()), roundToInt(box.y() - logicalHeight())));
+        marker.moveBy(FloatPoint(box.x(), box.y() - logicalHeight()));
         stateSaver.save();
         context->translate(marker.x(), marker.maxY());
         context->rotate(static_cast<float>(deg2rad(90.)));
         context->translate(-marker.x(), -marker.maxY());
     }
 
-    IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style().fontMetrics().ascent());
+    FloatPoint textOrigin = FloatPoint(marker.x(), marker.y() + style().fontMetrics().ascent());
+    textOrigin = roundPointToDevicePixels(LayoutPoint(textOrigin), document().deviceScaleFactor(), style().isLeftToRightDirection());
 
     if (type == Asterisks || type == Footnotes)
         context->drawText(font, textRun, textOrigin);
     else {
+        const UChar suffix = listMarkerSuffix(type, m_listItem.value());
+
         // Text is not arbitrary. We can judge whether it's RTL from the first character,
         // and we only need to handle the direction U_RIGHT_TO_LEFT for now.
         bool textNeedsReversing = u_charDirection(m_text[0]) == U_RIGHT_TO_LEFT;
-        String reversedText;
+        String toDraw;
         if (textNeedsReversing) {
             unsigned length = m_text.length();
             StringBuilder buffer;
-            buffer.reserveCapacity(length);
+            buffer.reserveCapacity(length + 2);
+            if (!style().isLeftToRightDirection()) {
+                buffer.append(space);
+                buffer.append(suffix);
+            }
             for (unsigned i = 0; i < length; ++i)
                 buffer.append(m_text[length - i - 1]);
-            reversedText = buffer.toString();
-            textRun.setText(StringView(reversedText));
-        }
-
-        const UChar suffix = listMarkerSuffix(type, m_listItem.value());
-        if (style().isLeftToRightDirection()) {
-            int width = font.width(textRun);
-            context->drawText(font, textRun, textOrigin);
-            UChar suffixSpace[2] = { suffix, ' ' };
-            context->drawText(font, RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()), textOrigin + IntSize(width, 0));
+            if (style().isLeftToRightDirection()) {
+                buffer.append(suffix);
+                buffer.append(space);
+            }
+            toDraw = buffer.toString();
         } else {
-            UChar spaceSuffix[2] = { ' ', suffix };
-            TextRun spaceSuffixRun = RenderBlock::constructTextRun(this, font, spaceSuffix, 2, style());
-            int width = font.width(spaceSuffixRun);
-            context->drawText(font, spaceSuffixRun, textOrigin);
-            context->drawText(font, textRun, textOrigin + IntSize(width, 0));
+            if (style().isLeftToRightDirection())
+                toDraw = m_text + String(&suffix, 1) + String(&space, 1);
+            else
+                toDraw = String(&space, 1) + String(&suffix, 1) + m_text;
         }
+        textRun.setText(StringView(toDraw));
+
+        context->drawText(font, textRun, textOrigin);
     }
 }
 
@@ -1421,7 +1425,7 @@ void RenderListMarker::updateContent()
         // FIXME: This is a somewhat arbitrary width.  Generated images for markers really won't become particularly useful
         // until we support the CSS3 marker pseudoclass to allow control over the width and height of the marker box.
         int bulletWidth = style().fontMetrics().ascent() / 2;
-        m_image->setContainerSizeForRenderer(this, IntSize(bulletWidth, bulletWidth), style().effectiveZoom());
+        m_image->setContainerSizeForRenderer(this, FloatSize(bulletWidth, bulletWidth), style().effectiveZoom());
         return;
     }
 
@@ -1747,19 +1751,19 @@ bool RenderListMarker::isInside() const
     return m_listItem.notInList() || style().listStylePosition() == INSIDE;
 }
 
-IntRect RenderListMarker::getRelativeMarkerRect()
+FloatRect RenderListMarker::getRelativeMarkerRect()
 {
     if (isImage())
-        return IntRect(0, 0, m_image->imageSize(this, style().effectiveZoom()).width(), m_image->imageSize(this, style().effectiveZoom()).height());
+        return FloatRect(0, 0, m_image->imageSize(this, style().effectiveZoom()).width(), m_image->imageSize(this, style().effectiveZoom()).height());
     
-    IntRect relativeRect;
+    FloatRect relativeRect;
     EListStyleType type = style().listStyleType();
     switch (type) {
         case Asterisks:
         case Footnotes: {
             const FontCascade& font = style().fontCascade();
             TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
-            relativeRect = IntRect(0, 0, font.width(run), font.fontMetrics().height());
+            relativeRect = FloatRect(0, 0, font.width(run), font.fontMetrics().height());
             break;
         }
         case Disc:
@@ -1769,11 +1773,11 @@ IntRect RenderListMarker::getRelativeMarkerRect()
             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);
+            relativeRect = FloatRect(1, 3 * (ascent - ascent * 2 / 3) / 2, bulletWidth, bulletWidth);
             break;
         }
         case NoneListStyle:
-            return IntRect();
+            return FloatRect();
         case Afar:
         case Amharic:
         case AmharicAbegede:
@@ -1850,13 +1854,13 @@ IntRect RenderListMarker::getRelativeMarkerRect()
         case UpperRoman:
         case Urdu:
             if (m_text.isEmpty())
-                return IntRect();
+                return FloatRect();
             const FontCascade& font = style().fontCascade();
             TextRun run = RenderBlock::constructTextRun(this, font, m_text, style(), TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion, DefaultTextRunFlags);
-            int itemWidth = font.width(run);
+            float itemWidth = font.width(run);
             UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
-            int suffixSpaceWidth = font.width(RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()));
-            relativeRect = IntRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height());
+            float suffixSpaceWidth = font.width(RenderBlock::constructTextRun(this, font, suffixSpace, 2, style()));
+            relativeRect = FloatRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height());
     }
 
     if (!style().isHorizontalWritingMode()) {

diff --git a/Source/WebCore/rendering/RenderListMarker.h b/Source/WebCore/rendering/RenderListMarker.h
index c34c5f254bf0577832a000259691a5c6e46d979f..993fe7101a0bbabe5d18a8ff927238b60476d584 100644 (file)
--- a/Source/WebCore/rendering/RenderListMarker.h
+++ b/Source/WebCore/rendering/RenderListMarker.h
@@ -77,7 +77,7 @@ private:
 
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
-    IntRect getRelativeMarkerRect();
+    FloatRect getRelativeMarkerRect();
     LayoutRect localSelectionRect();
 
     String m_text;