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

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

    CSSFontFaceSet.clear() should not clear CSS-connected members
    https://bugs.webkit.org/show_bug.cgi?id=229643

    Reviewed by Darin Adler.

    LayoutTests/imported/w3c:

    * web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt:

    Source/WebCore:

    The spec https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-clear says:

    > Remove all non-CSS-connected items

    * css/CSSFontFaceSet.h:
    * css/FontFaceSet.cpp:
    (WebCore::FontFaceSet::clear):

    LayoutTests:

    * TestExpectations:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281842 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="#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="#branchessafari612branchSourceWebCorecssCSSFontFaceSeth">branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h</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="#branchessafari612branchLayoutTestsimportedw3cwebplatformtestscsscssfontloadingfontfacesetclearcssconnectedexpectedtxt">branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt</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 (282581 => 282582)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-09-16 18:48:54 UTC (rev 282581)
+++ branches/safari-612-branch/LayoutTests/ChangeLog    2021-09-16 18:48:59 UTC (rev 282582)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r281842. rdar://problem/83183953
+
+    CSSFontFaceSet.clear() should not clear CSS-connected members
+    https://bugs.webkit.org/show_bug.cgi?id=229643
+    
+    Reviewed by Darin Adler.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt:
+    
+    Source/WebCore:
+    
+    The spec https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-clear says:
+    
+    > Remove all non-CSS-connected items
+    
+    * css/CSSFontFaceSet.h:
+    * css/FontFaceSet.cpp:
+    (WebCore::FontFaceSet::clear):
+    
+    LayoutTests:
+    
+    * TestExpectations:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-01  Myles C. Maxfield  <mmaxfield@apple.com>
+
+            CSSFontFaceSet.clear() should not clear CSS-connected members
+            https://bugs.webkit.org/show_bug.cgi?id=229643
+
+            Reviewed by Darin Adler.
+
+            * TestExpectations:
+
+2021-09-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r282468. rdar://problem/83183967
</span><span class="cx"> 
</span><span class="cx">     [JSC] Optimize leaf object creation in JSON.parse
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog (282581 => 282582)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog    2021-09-16 18:48:54 UTC (rev 282581)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog       2021-09-16 18:48:59 UTC (rev 282582)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r281842. rdar://problem/83183953
+
+    CSSFontFaceSet.clear() should not clear CSS-connected members
+    https://bugs.webkit.org/show_bug.cgi?id=229643
+    
+    Reviewed by Darin Adler.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt:
+    
+    Source/WebCore:
+    
+    The spec https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-clear says:
+    
+    > Remove all non-CSS-connected items
+    
+    * css/CSSFontFaceSet.h:
+    * css/FontFaceSet.cpp:
+    (WebCore::FontFaceSet::clear):
+    
+    LayoutTests:
+    
+    * TestExpectations:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-01  Myles C. Maxfield  <mmaxfield@apple.com>
+
+            CSSFontFaceSet.clear() should not clear CSS-connected members
+            https://bugs.webkit.org/show_bug.cgi?id=229643
+
+            Reviewed by Darin Adler.
+
+            * web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt:
+
+2021-09-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r282261. rdar://problem/83183323
</span><span class="cx"> 
</span><span class="cx">     FontFaceSet.load() needs to react to style changes
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestsimportedw3cwebplatformtestscsscssfontloadingfontfacesetclearcssconnectedexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt (0 => 282582)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt                         (rev 0)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt    2021-09-16 18:48:59 UTC (rev 282582)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS fontfaceset-clear-css-connected
+
</ins></span></pre></div>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (282581 => 282582)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2021-09-16 18:48:54 UTC (rev 282581)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-16 18:48:59 UTC (rev 282582)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2021-09-16  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r281842. rdar://problem/83183953
+
+    CSSFontFaceSet.clear() should not clear CSS-connected members
+    https://bugs.webkit.org/show_bug.cgi?id=229643
+    
+    Reviewed by Darin Adler.
+    
+    LayoutTests/imported/w3c:
+    
+    * web-platform-tests/css/css-font-loading/fontfaceset-clear-css-connected-expected.txt:
+    
+    Source/WebCore:
+    
+    The spec https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-clear says:
+    
+    > Remove all non-CSS-connected items
+    
+    * css/CSSFontFaceSet.h:
+    * css/FontFaceSet.cpp:
+    (WebCore::FontFaceSet::clear):
+    
+    LayoutTests:
+    
+    * TestExpectations:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-01  Myles C. Maxfield  <mmaxfield@apple.com>
+
+            CSSFontFaceSet.clear() should not clear CSS-connected members
+            https://bugs.webkit.org/show_bug.cgi?id=229643
+
+            Reviewed by Darin Adler.
+
+            The spec https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-clear says:
+
+            > Remove all non-CSS-connected items
+
+            * css/CSSFontFaceSet.h:
+            * css/FontFaceSet.cpp:
+            (WebCore::FontFaceSet::clear):
+
+2021-09-16  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r282390. rdar://problem/83183334
</span><span class="cx"> 
</span><span class="cx">     Don't schedule text rendering updates for a non-rendered Document
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssCSSFontFaceSeth"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h (282581 => 282582)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h   2021-09-16 18:48:54 UTC (rev 282581)
+++ branches/safari-612-branch/Source/WebCore/css/CSSFontFaceSet.h      2021-09-16 18:48:59 UTC (rev 282582)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx"> 
</span><span class="cx">     bool hasActiveFontFaces() { return status() == Status::Loading; }
</span><span class="cx"> 
</span><ins>+    size_t facesPartitionIndex() const { return m_facesPartitionIndex; }
+
</ins><span class="cx">     ExceptionOr<Vector<std::reference_wrapper<CSSFontFace>>> matchingFacesExcludingPreinstalledFonts(const String& font, const String& text);
</span><span class="cx"> 
</span><span class="cx">     // CSSFontFace::Client needs to be able to be held in a RefPtr.
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp (282581 => 282582)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp    2021-09-16 18:48:54 UTC (rev 282581)
+++ branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp       2021-09-16 18:48:59 UTC (rev 282582)
</span><span class="lines">@@ -134,8 +134,11 @@
</span><span class="cx"> 
</span><span class="cx"> void FontFaceSet::clear()
</span><span class="cx"> {
</span><del>-    while (m_backing->faceCount())
-        m_backing->remove(m_backing.get()[0]);
</del><ins>+    auto facesPartitionIndex = m_backing->facesPartitionIndex();
+    while (m_backing->faceCount() > facesPartitionIndex) {
+        m_backing->remove(m_backing.get()[m_backing->faceCount() - 1]);
+        ASSERT(m_backing->facesPartitionIndex() == facesPartitionIndex);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FontFaceSet::load(const String& font, const String& text, LoadPromise&& promise)
</span></span></pre>
</div>
</div>

</body>
</html>