<!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>[282583] 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/282583">282583</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-09-16 11:49:03 -0700 (Thu, 16 Sep 2021)</dd>
</dl>

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

    document.fonts.size needs to update style so it doesn't return stale values
    https://bugs.webkit.org/show_bug.cgi?id=229644

    Reviewed by Darin Adler.

    LayoutTests/imported/w3c:

    * web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt:

    Source/WebCore:

    Currently, we only update style inside the document::fonts() call.
    This isn't correct because content can save the results of document.fonts,
    do some work, then ask for its size.

    Test: web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html

    * css/CSSFontFace.cpp:
    (WebCore::CSSFontFace::updateStyleIfNeeded):
    * css/CSSFontFace.h:
    * css/CSSFontFaceSet.cpp:
    (WebCore::CSSFontFaceSet::updateStyleIfNeeded):
    * css/CSSFontFaceSet.h:
    * css/CSSFontSelector.cpp:
    (WebCore::CSSFontSelector::updateStyleIfNeeded):
    (WebCore::CSSFontSelector::fontStyleUpdateNeeded): Deleted.
    * css/CSSFontSelector.h:
    * css/FontFaceSet.cpp:
    (WebCore::FontFaceSet::size):
    (WebCore::FontFaceSet::size const): Deleted.
    * css/FontFaceSet.h:
    * dom/Document.cpp:
    (WebCore::Document::fonts):

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsimportedw3cChangeLog">branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssCSSFontFacecpp">branches/safari-612-branch/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssCSSFontFaceh">branches/safari-612-branch/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssCSSFontFaceSetcpp">branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssCSSFontFaceSeth">branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssCSSFontSelectorcpp">branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssCSSFontSelectorh">branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.h</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssFontFaceSetcpp">branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp</a></li>
<li><a href="#branchessafari612branchSourceWebCorecssFontFaceSeth">branches/safari-612-branch/Source/WebCore/css/FontFaceSet.h</a></li>
<li><a href="#branchessafari612branchSourceWebCoredomDocumentcpp">branches/safari-612-branch/Source/WebCore/dom/Document.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsimportedw3cwebplatformtestscsscssfontloadingfontfacesetupdateafterstylesheetchangeexpectedtxt">branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog    2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog       2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -1,5 +1,54 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r281845. rdar://problem/83183887
+
+    document.fonts.size needs to update style so it doesn't return stale values
+    https://bugs.webkit.org/show_bug.cgi?id=229644
+    
+    Reviewed by Darin Adler.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt:
+    
+    Source/WebCore:
+    
+    Currently, we only update style inside the document::fonts() call.
+    This isn't correct because content can save the results of document.fonts,
+    do some work, then ask for its size.
+    
+    Test: web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html
+    
+    * css/CSSFontFace.cpp:
+    (WebCore::CSSFontFace::updateStyleIfNeeded):
+    * css/CSSFontFace.h:
+    * css/CSSFontFaceSet.cpp:
+    (WebCore::CSSFontFaceSet::updateStyleIfNeeded):
+    * css/CSSFontFaceSet.h:
+    * css/CSSFontSelector.cpp:
+    (WebCore::CSSFontSelector::updateStyleIfNeeded):
+    (WebCore::CSSFontSelector::fontStyleUpdateNeeded): Deleted.
+    * css/CSSFontSelector.h:
+    * css/FontFaceSet.cpp:
+    (WebCore::FontFaceSet::size):
+    (WebCore::FontFaceSet::size const): Deleted.
+    * css/FontFaceSet.h:
+    * dom/Document.cpp:
+    (WebCore::Document::fonts):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281845 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-01  Myles C. Maxfield  <mmaxfield@apple.com>
+
+            document.fonts.size needs to update style so it doesn't return stale values
+            https://bugs.webkit.org/show_bug.cgi?id=229644
+
+            Reviewed by Darin Adler.
+
+            * web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt:
+
+2021-09-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r281842. rdar://problem/83183953
</span><span class="cx"> 
</span><span class="cx">     CSSFontFaceSet.clear() should not clear CSS-connected members
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestsimportedw3cwebplatformtestscsscssfontloadingfontfacesetupdateafterstylesheetchangeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt (0 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt                              (rev 0)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt 2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS fontfaceset-update-after-stylesheet-change
+
</ins></span></pre></div>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -1,5 +1,75 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r281845. rdar://problem/83183887
+
+    document.fonts.size needs to update style so it doesn't return stale values
+    https://bugs.webkit.org/show_bug.cgi?id=229644
+    
+    Reviewed by Darin Adler.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change-expected.txt:
+    
+    Source/WebCore:
+    
+    Currently, we only update style inside the document::fonts() call.
+    This isn't correct because content can save the results of document.fonts,
+    do some work, then ask for its size.
+    
+    Test: web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html
+    
+    * css/CSSFontFace.cpp:
+    (WebCore::CSSFontFace::updateStyleIfNeeded):
+    * css/CSSFontFace.h:
+    * css/CSSFontFaceSet.cpp:
+    (WebCore::CSSFontFaceSet::updateStyleIfNeeded):
+    * css/CSSFontFaceSet.h:
+    * css/CSSFontSelector.cpp:
+    (WebCore::CSSFontSelector::updateStyleIfNeeded):
+    (WebCore::CSSFontSelector::fontStyleUpdateNeeded): Deleted.
+    * css/CSSFontSelector.h:
+    * css/FontFaceSet.cpp:
+    (WebCore::FontFaceSet::size):
+    (WebCore::FontFaceSet::size const): Deleted.
+    * css/FontFaceSet.h:
+    * dom/Document.cpp:
+    (WebCore::Document::fonts):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281845 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-01  Myles C. Maxfield  <mmaxfield@apple.com>
+
+            document.fonts.size needs to update style so it doesn't return stale values
+            https://bugs.webkit.org/show_bug.cgi?id=229644
+
+            Reviewed by Darin Adler.
+
+            Currently, we only update style inside the document::fonts() call.
+            This isn't correct because content can save the results of document.fonts,
+            do some work, then ask for its size.
+
+            Test: web-platform-tests/css/css-font-loading/fontfaceset-update-after-stylesheet-change.html
+
+            * css/CSSFontFace.cpp:
+            (WebCore::CSSFontFace::updateStyleIfNeeded):
+            * css/CSSFontFace.h:
+            * css/CSSFontFaceSet.cpp:
+            (WebCore::CSSFontFaceSet::updateStyleIfNeeded):
+            * css/CSSFontFaceSet.h:
+            * css/CSSFontSelector.cpp:
+            (WebCore::CSSFontSelector::updateStyleIfNeeded):
+            (WebCore::CSSFontSelector::fontStyleUpdateNeeded): Deleted.
+            * css/CSSFontSelector.h:
+            * css/FontFaceSet.cpp:
+            (WebCore::FontFaceSet::size):
+            (WebCore::FontFaceSet::size const): Deleted.
+            * css/FontFaceSet.h:
+            * dom/Document.cpp:
+            (WebCore::Document::fonts):
+
+2021-09-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r281842. rdar://problem/83183953
</span><span class="cx"> 
</span><span class="cx">     CSSFontFaceSet.clear() should not clear CSS-connected members
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontFace.cpp (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontFace.cpp    2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontFace.cpp       2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> void CSSFontFace::updateStyleIfNeeded()
</span><span class="cx"> {
</span><span class="cx">     iterateClients(m_clients, [&](Client& client) {
</span><del>-        client.fontStyleUpdateNeeded(*this);
</del><ins>+        client.updateStyleIfNeeded(*this);
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontFace.h (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontFace.h      2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontFace.h 2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">         virtual void fontLoaded(CSSFontFace&) { }
</span><span class="cx">         virtual void fontStateChanged(CSSFontFace&, Status /*oldState*/, Status /*newState*/) { }
</span><span class="cx">         virtual void fontPropertyChanged(CSSFontFace&, CSSValueList* /*oldFamilies*/ = nullptr) { }
</span><del>-        virtual void fontStyleUpdateNeeded(CSSFontFace&) { }
</del><ins>+        virtual void updateStyleIfNeeded(CSSFontFace&) { }
</ins><span class="cx">         virtual void ref() = 0;
</span><span class="cx">         virtual void deref() = 0;
</span><span class="cx">     };
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.cpp (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.cpp 2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.cpp    2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -103,6 +103,13 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// Calling updateStyleIfNeeded() might delete |this|.
+void CSSFontFaceSet::updateStyleIfNeeded()
+{
+    if (m_owningFontSelector)
+        m_owningFontSelector->updateStyleIfNeeded();
+}
+
</ins><span class="cx"> void CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered(const String& familyName)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_owningFontSelector);
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontFaceSeth"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h   2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h      2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -57,6 +57,9 @@
</span><span class="cx">     };
</span><span class="cx">     void addFontEventClient(const FontEventClient&);
</span><span class="cx"> 
</span><ins>+    // Calling updateStyleIfNeeded() might delete |this|.
+    void updateStyleIfNeeded();
+
</ins><span class="cx">     bool hasFace(const CSSFontFace&) const;
</span><span class="cx">     size_t faceCount() const { return m_faces.size(); }
</span><span class="cx">     void add(CSSFontFace&);
</span><span class="lines">@@ -84,6 +87,8 @@
</span><span class="cx">     // CSSFontFace::Client needs to be able to be held in a RefPtr.
</span><span class="cx">     void ref() final { RefCounted::ref(); }
</span><span class="cx">     void deref() final { RefCounted::deref(); }
</span><ins>+    // FIXME: Should this be implemented?
+    void updateStyleIfNeeded(CSSFontFace&) final { }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     CSSFontFaceSet(CSSFontSelector*);
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.cpp (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.cpp        2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.cpp   2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -269,12 +269,17 @@
</span><span class="cx">         dispatchInvalidationCallbacks();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CSSFontSelector::fontStyleUpdateNeeded(CSSFontFace&)
</del><ins>+void CSSFontSelector::updateStyleIfNeeded()
</ins><span class="cx"> {
</span><span class="cx">     if (is<Document>(m_context.get()))
</span><span class="cx">         downcast<Document>(*m_context).updateStyleIfNeeded();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void CSSFontSelector::updateStyleIfNeeded(CSSFontFace&)
+{
+    updateStyleIfNeeded();
+}
+
</ins><span class="cx"> void CSSFontSelector::fontCacheInvalidated()
</span><span class="cx"> {
</span><span class="cx">     dispatchInvalidationCallbacks();
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.h (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.h  2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontSelector.h     2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -89,6 +89,8 @@
</span><span class="cx"> 
</span><span class="cx">     void loadPendingFonts();
</span><span class="cx"> 
</span><ins>+    void updateStyleIfNeeded();
+
</ins><span class="cx">     // CSSFontFace::Client needs to be able to be held in a RefPtr.
</span><span class="cx">     void ref() final { FontSelector::ref(); }
</span><span class="cx">     void deref() final { FontSelector::deref(); }
</span><span class="lines">@@ -104,7 +106,7 @@
</span><span class="cx"> 
</span><span class="cx">     // CSSFontFace::Client
</span><span class="cx">     void fontLoaded(CSSFontFace&) final;
</span><del>-    void fontStyleUpdateNeeded(CSSFontFace&) final;
</del><ins>+    void updateStyleIfNeeded(CSSFontFace&) final;
</ins><span class="cx"> 
</span><span class="cx">     void fontModified();
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp    2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp       2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -112,9 +112,11 @@
</span><span class="cx">     return m_backing->hasFace(face.backing());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-size_t FontFaceSet::size() const
</del><ins>+size_t FontFaceSet::size()
</ins><span class="cx"> {
</span><del>-    return m_backing->faceCount();
</del><ins>+    auto protect = m_backing;
+    protect->updateStyleIfNeeded();
+    return protect->faceCount();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FontFaceSet& FontFaceSet::add(FontFace& face)
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssFontFaceSeth"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/FontFaceSet.h (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/FontFaceSet.h      2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/css/FontFaceSet.h 2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">     virtual ~FontFaceSet();
</span><span class="cx"> 
</span><span class="cx">     bool has(FontFace&) const;
</span><del>-    size_t size() const;
</del><ins>+    size_t size();
</ins><span class="cx">     FontFaceSet& add(FontFace&);
</span><span class="cx">     bool remove(FontFace&);
</span><span class="cx">     void clear();
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/dom/Document.cpp (282582 => 282583)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/dom/Document.cpp       2021-09-16 18:48:59 UTC (rev 282582)
+++ branches/safari-612-branch/Source/WebCore/dom/Document.cpp  2021-09-16 18:49:03 UTC (rev 282583)
</span><span class="lines">@@ -7439,7 +7439,7 @@
</span><span class="cx"> 
</span><span class="cx"> Ref<FontFaceSet> Document::fonts()
</span><span class="cx"> {
</span><del>-    updateStyleIfNeeded();
</del><ins>+    updateStyleIfNeeded(); // FIXME: This is unnecessary. Instead, the actual accessors in the FontFaceSet need to update style.
</ins><span class="cx">     return fontSelector().fontFaceSet();
</span><span class="cx"> }
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>