Changeset 192564 in webkit

Timestamp:

Nov 17, 2015 7:00:43 PM (8 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Add letter-spacing support.
​https://bugs.webkit.org/show_bug.cgi?id=151362

Reviewed by Antti Koivisto.

This enables us to use simple line layout on letter-spacing content.
(fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied)

Source/WebCore:

Test: fast/text/simple-line-letterspacing.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseForStyle):

• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::paintFlow): RenderLineBoxList tests vertical intersection only.

• rendering/SimpleLineLayoutTextFragmentIterator.cpp:

(WebCore::SimpleLineLayout::TextFragmentIterator::runWidth):

LayoutTests:

• fast/text/simple-line-letterspacing-expected.html: Added.
• fast/text/simple-line-letterspacing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-letterspacing-expected.html (added)
• LayoutTests/fast/text/simple-line-letterspacing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-11-17  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add letter-spacing support.
+        https://bugs.webkit.org/show_bug.cgi?id=151362
+
+        Reviewed by Antti Koivisto.
+
+        This enables us to use simple line layout on letter-spacing content.
+        (fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied)
+
+        * fast/text/simple-line-letterspacing-expected.html: Added.
+        * fast/text/simple-line-letterspacing.html: Added.
+
 2015-11-17  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-17  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add letter-spacing support.
+        https://bugs.webkit.org/show_bug.cgi?id=151362
+
+        Reviewed by Antti Koivisto.
+
+        This enables us to use simple line layout on letter-spacing content.
+        (fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied)
+
+        Test: fast/text/simple-line-letterspacing.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseForStyle):
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::paintFlow): RenderLineBoxList tests vertical intersection only. 
+        * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+        (WebCore::SimpleLineLayout::TextFragmentIterator::runWidth):
+
 2015-11-17  Per Arne Vollan  <peavo@outlook.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -123 +123 @@
     if (!style.textIndent().isZero())
         return false;
-    if (!style.wordSpacing().isZero() || style.letterSpacing())
+    if (!style.wordSpacing().isZero())
         return false;
     if (!style.isLeftToRightDirection())

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -87 +87 @@
     float deviceScaleFactor = flow.document().deviceScaleFactor();
     for (const auto& run : resolver.rangeForRect(paintRect)) {
+        if (run.start() == run.end())
+            continue;
+
         FloatRect rect = run.rect();
         rect.inflate(strokeOverflow);
-        if (!rect.intersects(paintRect) || run.start() == run.end())
+        if (paintRect.y() > rect.maxY() || paintRect.maxY() < rect.y())
             continue;
+
         TextRun textRun(run.text());
         textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());

trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp

@@ -209 +209 @@
     if (measureWithEndSpace)
         width -= m_style.spaceWidth;
-    return width;
-}
-
-}
-}
+    return std::max<float>(0, width);
+}
+
+}
+}