Changeset 230412 in webkit

Timestamp:

Apr 9, 2018 5:59:18 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r229867 - [Simple line layout] Text with letter spacing is not positioned properly.
​https://bugs.webkit.org/show_bug.cgi?id=183079
<rdar://problem/38762569>

Reviewed by Antti Koivisto.

Source/WebCore:

We need to recompute RenderText::m_canUseSimplifiedTextMeasuring when the font cascade changes
since we might not be able to use the fast path anymore.

Test: fast/text/simple-line-layout-dynamic-letter-word-spacing.html

• rendering/RenderText.cpp:

(WebCore::RenderText::styleDidChange):

LayoutTests:

• fast/text/simple-line-layout-dynamic-letter-word-spacing-expected.html: Added.
• fast/text/simple-line-layout-dynamic-letter-word-spacing.html: Added.

Location:

releases/WebKitGTK/webkit-2.20

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-dynamic-letter-word-spacing-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-dynamic-letter-word-spacing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderText.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-22  Zalan Bujtas  <zalan@apple.com>
+
+        [Simple line layout] Text with letter spacing is not positioned properly.
+        https://bugs.webkit.org/show_bug.cgi?id=183079
+        <rdar://problem/38762569>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/simple-line-layout-dynamic-letter-word-spacing-expected.html: Added.
+        * fast/text/simple-line-layout-dynamic-letter-word-spacing.html: Added.
+
 2018-03-22  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-22  Zalan Bujtas  <zalan@apple.com>
+
+        [Simple line layout] Text with letter spacing is not positioned properly.
+        https://bugs.webkit.org/show_bug.cgi?id=183079
+        <rdar://problem/38762569>
+
+        Reviewed by Antti Koivisto.
+
+        We need to recompute RenderText::m_canUseSimplifiedTextMeasuring when the font cascade changes
+        since we might not be able to use the fast path anymore.
+
+        Test: fast/text/simple-line-layout-dynamic-letter-word-spacing.html
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::styleDidChange):
+
 2018-03-22  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.cpp

@@ -264 +264 @@
         m_useBackslashAsYenSymbol = computeUseBackslashAsYenSymbol();
         needsResetText = m_useBackslashAsYenSymbol;
-        // It should really be computed in the c'tor, but during construction we don't have parent yet -and RenderText style == parent()->style()
-        m_canUseSimplifiedTextMeasuring = computeCanUseSimplifiedTextMeasuring();
     } else if (oldStyle->fontCascade().useBackslashAsYenSymbol() != newStyle.fontCascade().useBackslashAsYenSymbol()) {
         m_useBackslashAsYenSymbol = computeUseBackslashAsYenSymbol();
         needsResetText = true;
     }
+
+    if (!oldStyle || oldStyle->fontCascade() != newStyle.fontCascade())
+        m_canUseSimplifiedTextMeasuring = computeCanUseSimplifiedTextMeasuring();
 
     ETextTransform oldTransform = oldStyle ? oldStyle->textTransform() : TTNONE;