<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[282016] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/282016">282016</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2021-09-03 13:08:00 -0700 (Fri, 03 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSetcpp">trunk/Source/WebCore/css/CSSFontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceSetcpp">trunk/Source/WebCore/css/FontFaceSet.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextFontFaceSetcheckafterstyleupdateexpectedtxt">trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextFontFaceSetcheckafterstyleupdatehtml">trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (282015 => 282016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-09-03 20:03:18 UTC (rev 282015)
+++ trunk/LayoutTests/ChangeLog 2021-09-03 20:08:00 UTC (rev 282016)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><ins>+        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>
+
</ins><span class="cx">         FontFaceSet.status needs to react to style changes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=229839
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextFontFaceSetcheckafterstyleupdateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update-expected.txt (0 => 282016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update-expected.txt                            (rev 0)
+++ trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update-expected.txt       2021-09-03 20:08:00 UTC (rev 282016)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+This function makes sure document.fonts.check() is affected by style changes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS fonts.check('12px ThisIsNotARealFont') is true
+PASS fonts.check('12px WebFont') is false
+PASS fonts.check('12px WebFont') is false
+PASS fonts.check('12px WebFont') is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Author Date Id Rev URL
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasttextFontFaceSetcheckafterstyleupdatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update.html (0 => 282016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update.html                            (rev 0)
+++ trunk/LayoutTests/fast/text/FontFaceSet-check-after-style-update.html       2021-09-03 20:08:00 UTC (rev 282016)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head id="head">
+<style id="style">
+@font-face {
+    font-family: "WebFont";
+    src: url("../../resources/Ahem.ttf") format("truetype");
+}
+</style>
+<script src="../../resources/js-test.js"></script>
+<script>
+if (window.internals) {
+    internals.invalidateFontCache();
+    internals.clearMemoryCache();
+}
+</script>
+</head>
+<body>
+<script>
+description("This function makes sure document.fonts.check() is affected by style changes.");
+let fonts = document.fonts;
+shouldBeTrue("fonts.check('12px ThisIsNotARealFont')");
+shouldBeFalse("fonts.check('12px WebFont')");
+fonts.values().next().value.load();
+shouldBeFalse("fonts.check('12px WebFont')");
+document.getElementById("head").removeChild(document.getElementById("style"));
+// https://drafts.csswg.org/css-font-loading-3/#font-face-set-check
+// "if none of the specified fonts exist (for example, names are mis-spelled), the method also returns true"
+shouldBeTrue("fonts.check('12px WebFont')");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282015 => 282016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-03 20:03:18 UTC (rev 282015)
+++ trunk/Source/WebCore/ChangeLog      2021-09-03 20:08:00 UTC (rev 282016)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2021-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><ins>+        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>
+
</ins><span class="cx">         FontFaceSet.status needs to react to style changes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=229839
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (282015 => 282016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp      2021-09-03 20:03:18 UTC (rev 282015)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2021-09-03 20:08:00 UTC (rev 282016)
</span><span class="lines">@@ -442,7 +442,8 @@
</span><span class="cx">         return matchingFaces.releaseException();
</span><span class="cx"> 
</span><span class="cx">     for (auto& face : matchingFaces.releaseReturnValue()) {
</span><del>-        if (face.get().status() == CSSFontFace::Status::Pending)
</del><ins>+        if (face.get().status() == CSSFontFace::Status::Pending
+            || face.get().status() == CSSFontFace::Status::Loading)
</ins><span class="cx">             return false;
</span><span class="cx">     }
</span><span class="cx">     return true;
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (282015 => 282016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.cpp 2021-09-03 20:03:18 UTC (rev 282015)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp    2021-09-03 20:08:00 UTC (rev 282016)
</span><span class="lines">@@ -188,7 +188,9 @@
</span><span class="cx"> 
</span><span class="cx"> ExceptionOr<bool> FontFaceSet::check(const String& family, const String& text)
</span><span class="cx"> {
</span><del>-    return m_backing->check(family, text);
</del><ins>+    Ref protect = m_backing;
+    protect->updateStyleIfNeeded();
+    return protect->check(family, text);
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> auto FontFaceSet::status() const -> LoadStatus
</span></span></pre>
</div>
</div>

</body>
</html>