Changeset 282015 in webkit

Timestamp:

Sep 3, 2021 1:03:18 PM (11 months ago)

Author:

mmaxfield@apple.com

Message:

FontFaceSet.status needs to react to style changes
​https://bugs.webkit.org/show_bug.cgi?id=229839

Reviewed by Sam Weinig.

Source/WebCore:

When content says "document.fonts.status", the ".status" part needs to
update style instead of the "document.fonts" part. This is because it's
totally legal for content to say:

var f = document.fonts;
Modify style here
... f.status ... <=== This needs to reflect the style changes.

Test: fast/text/FontFaceSet-status-after-style-update.html

• css/FontFaceSet.cpp:

(WebCore::FontFaceSet::status const):

LayoutTests:

This is not a WPT test because it requires internals.invalidateFontCache().

• fast/text/FontFaceSet-status-after-style-update-expected.txt: Added.
• fast/text/FontFaceSet-status-after-style-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/FontFaceSet-status-after-style-update-expected.txt (added)
• LayoutTests/fast/text/FontFaceSet-status-after-style-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/FontFaceSet.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        FontFaceSet.status needs to react to style changes
+        https://bugs.webkit.org/show_bug.cgi?id=229839
+
+        Reviewed by Sam Weinig.
+
+        This is not a WPT test because it requires internals.invalidateFontCache().
+
+        * fast/text/FontFaceSet-status-after-style-update-expected.txt: Added.
+        * fast/text/FontFaceSet-status-after-style-update.html: Added.
+
 2021-09-03  Ziran Sun  <zsun@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        FontFaceSet.status needs to react to style changes
+        https://bugs.webkit.org/show_bug.cgi?id=229839
+
+        Reviewed by Sam Weinig.
+
+        When content says "document.fonts.status", the ".status" part needs to
+        update style instead of the "document.fonts" part. This is because it's
+        totally legal for content to say:
+
+        var f = document.fonts;
+        // Modify style here
+        ... f.status ... <=== This needs to reflect the style changes.
+
+        Test: fast/text/FontFaceSet-status-after-style-update.html
+
+        * css/FontFaceSet.cpp:
+        (WebCore::FontFaceSet::status const):
+
 2021-09-03  Ziran Sun  <zsun@igalia.com>
 

trunk/Source/WebCore/css/FontFaceSet.cpp

@@ -194 +194 @@
 auto FontFaceSet::status() const -> LoadStatus
 {
-    switch (m_backing->status()) {
+    Ref protect = m_backing;
+    protect->updateStyleIfNeeded();
+
+    switch (protect->status()) {
     case CSSFontFaceSet::Status::Loading:
         return LoadStatus::Loading;