Changeset 238860 in webkit

Timestamp:

Dec 4, 2018 10:50:52 AM (5 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r238838.

The layout test added with this change is failing on iOS.

Reverted changeset:

"Thick overlines and line-throughs grow in the wrong
direction"
​https://bugs.webkit.org/show_bug.cgi?id=192264
​https://trac.webkit.org/changeset/238838

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thicknes-overline-grow-direction-expected.html (deleted)
• LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thicknes-overline-grow-direction.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/TextDecorationPainter.cpp (modified) (1 diff)
• Source/WebCore/style/InlineTextBoxStyle.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-12-04  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r238838.
+
+        The layout test added with this change is failing on iOS.
+
+        Reverted changeset:
+
+        "Thick overlines and line-throughs grow in the wrong
+        direction"
+        https://bugs.webkit.org/show_bug.cgi?id=192264
+        https://trac.webkit.org/changeset/238838
+
 2018-12-04  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-04  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r238838.
+
+        The layout test added with this change is failing on iOS.
+
+        Reverted changeset:
+
+        "Thick overlines and line-throughs grow in the wrong
+        direction"
+        https://bugs.webkit.org/show_bug.cgi?id=192264
+        https://trac.webkit.org/changeset/238838
+
 2018-12-04  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/rendering/TextDecorationPainter.cpp

@@ -297 +297 @@
             float wavyOffset = m_styles.overlineStyle == TextDecorationStyle::Wavy ? m_wavyOffset : 0;
             FloatRect rect(localOrigin, FloatSize(m_width, textDecorationThickness));
-            float autoTextDecorationThickness = TextDecorationThickness::createWithAuto().resolve(m_lineStyle.computedFontSize(), fontMetrics);
-            rect.move(0, autoTextDecorationThickness - textDecorationThickness - wavyOffset);
+            rect.move(0, -wavyOffset);
             paintDecoration(TextDecoration::Overline, m_styles.overlineStyle, m_styles.overlineColor, rect);
         }
         if (m_decorations.contains(TextDecoration::LineThrough)) {
             FloatRect rect(localOrigin, FloatSize(m_width, textDecorationThickness));
-            float autoTextDecorationThickness = TextDecorationThickness::createWithAuto().resolve(m_lineStyle.computedFontSize(), fontMetrics);
-            auto center = 2 * fontMetrics.floatAscent() / 3 + autoTextDecorationThickness / 2;
-            rect.move(0, center - textDecorationThickness / 2);
+            rect.move(0, 2 * fontMetrics.floatAscent() / 3);
             paintDecoration(TextDecoration::LineThrough, m_styles.linethroughStyle, m_styles.linethroughColor, rect);
         }

trunk/Source/WebCore/style/InlineTextBoxStyle.cpp

@@ -126 +126 @@
 
     // These metrics must match where underlines get drawn.
-    // FIXME: Share the code in TextDecorationPainter::paintTextDecoration() so we can just query it for the painted geometry.
     if (decoration & TextDecoration::Underline) {
         // Compensate for the integral ceiling in GraphicsContext::computeLineBoundsAndAntialiasingModeForText()
@@ -142 +141 @@
     }
     if (decoration & TextDecoration::Overline) {
-        FloatRect rect(FloatPoint(), FloatSize(1, strokeThickness));
-        float autoTextDecorationThickness = TextDecorationThickness::createWithAuto().resolve(lineStyle.computedFontSize(), lineStyle.fontMetrics());
-        rect.move(0, autoTextDecorationThickness - strokeThickness - wavyOffset);
         if (decorationStyle == TextDecorationStyle::Wavy) {
-            FloatBoxExtent wavyExpansion;
-            wavyExpansion.setTop(wavyStrokeParameters.controlPointDistance);
-            wavyExpansion.setBottom(wavyStrokeParameters.controlPointDistance);
-            rect.expand(wavyExpansion);
+            extendIntToFloat(overflowResult.bottom, -wavyOffset + wavyStrokeParameters.controlPointDistance + strokeThickness - height);
+            extendIntToFloat(overflowResult.top, wavyOffset + wavyStrokeParameters.controlPointDistance + strokeThickness);
+        } else {
+            extendIntToFloat(overflowResult.bottom, strokeThickness - height);
+            // top is untouched
         }
-        extendIntToFloat(overflowResult.top, -rect.y());
-        extendIntToFloat(overflowResult.bottom, rect.maxY() - height);
     }
     if (decoration & TextDecoration::LineThrough) {
-        FloatRect rect(FloatPoint(), FloatSize(1, strokeThickness));
-        float autoTextDecorationThickness = TextDecorationThickness::createWithAuto().resolve(lineStyle.computedFontSize(), lineStyle.fontMetrics());
-        auto center = 2 * lineStyle.fontMetrics().floatAscent() / 3 + autoTextDecorationThickness / 2;
-        rect.move(0, center - strokeThickness / 2);
+        float baseline = lineStyle.fontMetrics().floatAscent();
         if (decorationStyle == TextDecorationStyle::Wavy) {
-            FloatBoxExtent wavyExpansion;
-            wavyExpansion.setTop(wavyStrokeParameters.controlPointDistance);
-            wavyExpansion.setBottom(wavyStrokeParameters.controlPointDistance);
-            rect.expand(wavyExpansion);
+            extendIntToFloat(overflowResult.bottom, 2 * baseline / 3 + wavyStrokeParameters.controlPointDistance + strokeThickness - height);
+            extendIntToFloat(overflowResult.top, -(2 * baseline / 3 - wavyStrokeParameters.controlPointDistance - strokeThickness));
+        } else {
+            extendIntToFloat(overflowResult.bottom, 2 * baseline / 3 + strokeThickness - height);
+            extendIntToFloat(overflowResult.top, -(2 * baseline / 3));
         }
-        extendIntToFloat(overflowResult.top, -rect.y());
-        extendIntToFloat(overflowResult.bottom, rect.maxY() - height);
     }
     return overflowResult;