Changeset 205519 in webkit

Timestamp:

Sep 6, 2016 4:12:15 PM (8 years ago)

Author:

mmaxfield@apple.com

Message:

Strikethrough positions are erroneously snapped twice
​https://bugs.webkit.org/show_bug.cgi?id=161647
<rdar://problem/11542470>

Reviewed by Zalan Bujtas.

Source/WebCore:

Because we're using an int for the position of the baseline, the math to calculate the
strikethrough position is snapped. Then, we snap it again inside GraphicsContext.

Test: fast/text/strikethrough-int.html

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paintDecoration):

• rendering/TextDecorationPainter.h:

(WebCore::TextDecorationPainter::setBaseline):

LayoutTests:

• fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html: Updated.
• fast/text/strikethrough-int-expected-mismatch.html: Added.
• fast/text/strikethrough-int.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html (modified) (1 diff)
• LayoutTests/fast/text/strikethrough-int-expected-mismatch.html (added)
• LayoutTests/fast/text/strikethrough-int.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/TextDecorationPainter.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Strikethrough positions are erroneously snapped twice
+        https://bugs.webkit.org/show_bug.cgi?id=161647
+        <rdar://problem/11542470>
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html: Updated.
+        * fast/text/strikethrough-int-expected-mismatch.html: Added.
+        * fast/text/strikethrough-int.html: Added.
+
 2016-09-06  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html

@@ -8 +8 @@
     position: absolute;
     left: 20px;
-    top: 33px;
+    top: 34px;
     width: 120px;
     height: 1px;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Strikethrough positions are erroneously snapped twice
+        https://bugs.webkit.org/show_bug.cgi?id=161647
+        <rdar://problem/11542470>
+
+        Reviewed by Zalan Bujtas.
+
+        Because we're using an int for the position of the baseline, the math to calculate the
+        strikethrough position is snapped. Then, we snap it again inside GraphicsContext.
+
+        Test: fast/text/strikethrough-int.html
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintDecoration):
+        * rendering/TextDecorationPainter.h:
+        (WebCore::TextDecorationPainter::setBaseline):
+
 2016-09-06  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -716 +716 @@
         mirrorRTLSegment(m_logicalWidth, direction(), start, width);
     }
-    
-    int baseline = lineStyle().fontMetrics().ascent();
+
     TextDecorationPainter decorationPainter(context, decoration, renderer(), isFirstLine());
     decorationPainter.setInlineTextBox(this);
     decorationPainter.setFont(font);
     decorationPainter.setWidth(width);
-    decorationPainter.setBaseline(baseline);
+    decorationPainter.setBaseline(lineStyle().fontMetrics().ascent());
     decorationPainter.setIsHorizontal(isHorizontal());
     decorationPainter.addTextShadow(shadow);

trunk/Source/WebCore/rendering/TextDecorationPainter.h

@@ -46 +46 @@
     void setIsHorizontal(bool isHorizontal) { m_isHorizontal = isHorizontal; }
     void setWidth(float width) { m_width = width; }
-    void setBaseline(int baseline) { m_baseline = baseline; }
+    void setBaseline(float baseline) { m_baseline = baseline; }
     void addTextShadow(const ShadowData* textShadow) { m_shadow = textShadow; }
 
@@ -57 +57 @@
     bool m_isPrinting { false };
     float m_width { 0 };
-    int m_baseline { 0 };
+    float m_baseline { 0 };
     FloatPoint m_boxOrigin;
     bool m_isHorizontal { true };