<!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>[282570] branches/safari-612-branch</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/282570">282570</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-09-16 11:48:14 -0700 (Thu, 16 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/282015">r282015</a>. rdar://problem/83183864

    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.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282015 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsChangeLog">branches/safari-612-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssFontFaceSetcpp">branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsfasttextFontFaceSetstatusafterstyleupdateexpectedtxt">branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update-expected.txt</a></li>
<li><a href="#branchessafari612branchLayoutTestsfasttextFontFaceSetstatusafterstyleupdatehtml">branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/LayoutTests/ChangeLog (282569 => 282570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-09-16 18:48:10 UTC (rev 282569)
+++ branches/safari-612-branch/LayoutTests/ChangeLog    2021-09-16 18:48:14 UTC (rev 282570)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2021-09-16  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r282015. rdar://problem/83183864
+
+    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.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282015 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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.
+
</ins><span class="cx"> 2021-09-09  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r281792. rdar://problem/82949614
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestsfasttextFontFaceSetstatusafterstyleupdateexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update-expected.txt (0 => 282570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update-expected.txt                              (rev 0)
+++ branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update-expected.txt 2021-09-16 18:48:14 UTC (rev 282570)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This function makes sure document.fonts.status gets updated after style changes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS fonts.status is "loaded"
+PASS fonts.status is "loading"
+PASS fonts.status is "loaded"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari612branchLayoutTestsfasttextFontFaceSetstatusafterstyleupdatehtml"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update.html (0 => 282570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update.html                              (rev 0)
+++ branches/safari-612-branch/LayoutTests/fast/text/FontFaceSet-status-after-style-update.html 2021-09-16 18:48:14 UTC (rev 282570)
</span><span class="lines">@@ -0,0 +1,29 @@
</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.status gets updated after style changes.");
+let fonts = document.fonts;
+shouldBeEqualToString("fonts.status", "loaded");
+fonts.values().next().value.load();
+shouldBeEqualToString("fonts.status", "loading");
+document.getElementById("head").removeChild(document.getElementById("style"));
+shouldBeEqualToString("fonts.status", "loaded");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (282569 => 282570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2021-09-16 18:48:10 UTC (rev 282569)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-16 18:48:14 UTC (rev 282570)
</span><span class="lines">@@ -1,5 +1,58 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r282015. rdar://problem/83183864
+
+    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.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282015 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r281544. rdar://problem/83183832
</span><span class="cx"> 
</span><span class="cx">     Refactor ENABLE(JIT_OPERATION_VALIDATION) code to emit no code when disabled.
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp (282569 => 282570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp    2021-09-16 18:48:10 UTC (rev 282569)
+++ branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp       2021-09-16 18:48:14 UTC (rev 282570)
</span><span class="lines">@@ -183,7 +183,10 @@
</span><span class="cx">     
</span><span class="cx"> auto FontFaceSet::status() const -> LoadStatus
</span><span class="cx"> {
</span><del>-    switch (m_backing->status()) {
</del><ins>+    Ref protect = m_backing;
+    protect->updateStyleIfNeeded();
+
+    switch (protect->status()) {
</ins><span class="cx">     case CSSFontFaceSet::Status::Loading:
</span><span class="cx">         return LoadStatus::Loading;
</span><span class="cx">     case CSSFontFaceSet::Status::Loaded:
</span></span></pre>
</div>
</div>

</body>
</html>