Changeset 271688 in webkit

Timestamp:

Jan 21, 2021 1:51:11 AM (18 months ago)

Author:

commit-queue@webkit.org

Message:

Update font when resolving letter-spacing: calc(...) values
​https://bugs.webkit.org/show_bug.cgi?id=216659

Patch by Frederic Wang <​fwang@igalia.com> on 2021-01-21
Reviewed by Ryosuke Niwa.

Source/WebCore:

In bug 176215, maybeUpdateFontForLetterSpacing was added to ensure a font is available for
resolution of letter-spacing values that rely on relative font lengths. However, this does
not take into account the case when these lengths are part of a calc expression. In order to
keep things simple, this patch unconditionally updates the font when letter-spacing is a
calc expression.

Test: fast/css/letter-spacing-calc-with-font-relative-lengths-crash.html

• style/StyleBuilderCustom.h:

(WebCore::Style::maybeUpdateFontForLetterSpacing):

LayoutTests:

• fast/css/letter-spacing-calc-with-font-relative-lengths-crash-expected.txt: Added.
• fast/css/letter-spacing-calc-with-font-relative-lengths-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/letter-spacing-calc-with-font-relative-lengths-crash-expected.txt (added)
• LayoutTests/fast/css/letter-spacing-calc-with-font-relative-lengths-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleBuilderCustom.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-21  Frederic Wang  <fwang@igalia.com>
+
+        Update font when resolving letter-spacing: calc(...) values
+        https://bugs.webkit.org/show_bug.cgi?id=216659
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/css/letter-spacing-calc-with-font-relative-lengths-crash-expected.txt: Added.
+        * fast/css/letter-spacing-calc-with-font-relative-lengths-crash.html: Added.
+
 2021-01-20  Kenneth Russell  <kbr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-21  Frederic Wang  <fwang@igalia.com>
+
+        Update font when resolving letter-spacing: calc(...) values
+        https://bugs.webkit.org/show_bug.cgi?id=216659
+
+        Reviewed by Ryosuke Niwa.
+
+        In bug 176215, maybeUpdateFontForLetterSpacing was added to ensure a font is available for
+        resolution of letter-spacing values that rely on relative font lengths. However, this does
+        not take into account the case when these lengths are part of a calc expression. In order to
+        keep things simple, this patch unconditionally updates the font when letter-spacing is a
+        calc expression.
+
+        Test: fast/css/letter-spacing-calc-with-font-relative-lengths-crash.html
+
+        * style/StyleBuilderCustom.h:
+        (WebCore::Style::maybeUpdateFontForLetterSpacing):
+
 2021-01-20  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/style/StyleBuilderCustom.h

@@ -655 +655 @@
     // to only do work if the font is actually dirty.
 
-    if (is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).isFontRelativeLength())
-        builderState.updateFont();
+    if (is<CSSPrimitiveValue>(value)) {
+        auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+        if (primitiveValue.isFontRelativeLength() || primitiveValue.isCalculated())
+            builderState.updateFont();
+    }
 }