Changeset 282016 in webkit

Timestamp:

Sep 3, 2021 1:08:00 PM (11 months ago)

Author:

mmaxfield@apple.com

Message:

FontFaceSet.check() needs to react to style changes
​https://bugs.webkit.org/show_bug.cgi?id=229844

Reviewed by Sam Weinig.

Source/WebCore:

When content says "document.fonts.check(...)", the ".check(...)" 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.check(...) ... <=== This needs to reflect the style changes.

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

• WebCore.xcodeproj/xcshareddata/xcschemes/WebCore.xcscheme:
• css/CSSFontFaceSet.cpp:

(WebCore::CSSFontFaceSet::check):

• css/FontFaceSet.cpp:

(WebCore::FontFaceSet::check):

LayoutTests:

This can't be a WPT test because it requires internals.invalidateFontCache().

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/FontFaceSet-check-after-style-update-expected.txt (added)
• LayoutTests/fast/text/FontFaceSet-check-after-style-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSFontFaceSet.cpp (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.check() needs to react to style changes
+        https://bugs.webkit.org/show_bug.cgi?id=229844
+
+        Reviewed by Sam Weinig.
+
+        This can't be a WPT test because it requires internals.invalidateFontCache().
+
+        * fast/text/FontFaceSet-check-after-style-update-expected.txt: Added.
+        * fast/text/FontFaceSet-check-after-style-update.html: Added.
+
 2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        FontFaceSet.check() needs to react to style changes
+        https://bugs.webkit.org/show_bug.cgi?id=229844
+
+        Reviewed by Sam Weinig.
+
+        When content says "document.fonts.check(...)", the ".check(...)" 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.check(...) ... <=== This needs to reflect the style changes.
+
+        Test: fast/text/FontFaceSet-check-after-style-update.html
+
+        * WebCore.xcodeproj/xcshareddata/xcschemes/WebCore.xcscheme:
+        * css/CSSFontFaceSet.cpp:
+        (WebCore::CSSFontFaceSet::check):
+        * css/FontFaceSet.cpp:
+        (WebCore::FontFaceSet::check):
+
 2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/css/CSSFontFaceSet.cpp

@@ -443 +443 @@
 
     for (auto& face : matchingFaces.releaseReturnValue()) {
-        if (face.get().status() == CSSFontFace::Status::Pending)
+        if (face.get().status() == CSSFontFace::Status::Pending
+            || face.get().status() == CSSFontFace::Status::Loading)
             return false;
     }

trunk/Source/WebCore/css/FontFaceSet.cpp

@@ -189 +189 @@
 ExceptionOr<bool> FontFaceSet::check(const String& family, const String& text)
 {
-    return m_backing->check(family, text);
+    Ref protect = m_backing;
+    protect->updateStyleIfNeeded();
+    return protect->check(family, text);
 }