<!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>[278466] trunk/Source/WebCore</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/278466">278466</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2021-06-04 09:34:16 -0700 (Fri, 04 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use references in font loading code instead of pointers which can never be null
https://bugs.webkit.org/show_bug.cgi?id=226622

Reviewed by Chris Dumez.

CSSFontFace::create()'s CSSFontSelector can never be null. This is clear from
observation of all 3 call sites.

No new tests because there is no behavior change.

* css/CSSFontFace.cpp:
(WebCore::CSSFontFace::create):
* css/CSSFontFace.h:
* css/CSSFontFaceSet.cpp:
(WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::addFontFaceRule):
* css/FontFace.cpp:
(WebCore::FontFace::FontFace):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceh">trunk/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSetcpp">trunk/Source/WebCore/css/CSSFontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFacecpp">trunk/Source/WebCore/css/FontFace.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278465 => 278466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-04 16:32:57 UTC (rev 278465)
+++ trunk/Source/WebCore/ChangeLog      2021-06-04 16:34:16 UTC (rev 278466)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-06-04  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Use references in font loading code instead of pointers which can never be null
+        https://bugs.webkit.org/show_bug.cgi?id=226622
+
+        Reviewed by Chris Dumez.
+
+        CSSFontFace::create()'s CSSFontSelector can never be null. This is clear from
+        observation of all 3 call sites.
+
+        No new tests because there is no behavior change.
+
+        * css/CSSFontFace.cpp:
+        (WebCore::CSSFontFace::create):
+        * css/CSSFontFace.h:
+        * css/CSSFontFaceSet.cpp:
+        (WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::addFontFaceRule):
+        * css/FontFace.cpp:
+        (WebCore::FontFace::FontFace):
+
</ins><span class="cx"> 2021-06-04  David Kilzer  <ddkilzer@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r278121): Fix build failure due to weak external symbol
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (278465 => 278466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2021-06-04 16:32:57 UTC (rev 278465)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp    2021-06-04 16:34:16 UTC (rev 278466)
</span><span class="lines">@@ -90,13 +90,12 @@
</span><span class="cx">     fontFace.sourcesPopulated();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Ref<CSSFontFace> CSSFontFace::create(CSSFontSelector* fontSelector, StyleRuleFontFace* cssConnection, FontFace* wrapper, bool isLocalFallback)
</del><ins>+Ref<CSSFontFace> CSSFontFace::create(CSSFontSelector& fontSelector, StyleRuleFontFace* cssConnection, FontFace* wrapper, bool isLocalFallback)
</ins><span class="cx"> {
</span><del>-    auto* context = fontSelector ? fontSelector->scriptExecutionContext() : nullptr;
</del><ins>+    auto* context = fontSelector.scriptExecutionContext();
</ins><span class="cx">     const auto* settings = context ? &context->settingsValues() : nullptr;
</span><span class="cx">     auto result = adoptRef(*new CSSFontFace(settings, cssConnection, wrapper, isLocalFallback));
</span><del>-    if (fontSelector)
-        result->addClient(*fontSelector);
</del><ins>+    result->addClient(fontSelector);
</ins><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.h (278465 => 278466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.h   2021-06-04 16:32:57 UTC (rev 278465)
+++ trunk/Source/WebCore/css/CSSFontFace.h      2021-06-04 16:34:16 UTC (rev 278466)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> class CSSFontFace final : public RefCounted<CSSFontFace> {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(CSSFontFace);
</span><span class="cx"> public:
</span><del>-    static Ref<CSSFontFace> create(CSSFontSelector*, StyleRuleFontFace* cssConnection = nullptr, FontFace* wrapper = nullptr, bool isLocalFallback = false);
</del><ins>+    static Ref<CSSFontFace> create(CSSFontSelector&, StyleRuleFontFace* cssConnection = nullptr, FontFace* wrapper = nullptr, bool isLocalFallback = false);
</ins><span class="cx">     virtual ~CSSFontFace();
</span><span class="cx"> 
</span><span class="cx">     // FIXME: These functions don't need to have boolean return values.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (278465 => 278466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp      2021-06-04 16:32:57 UTC (rev 278465)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2021-06-04 16:34:16 UTC (rev 278466)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> 
</span><span class="cx">     Vector<Ref<CSSFontFace>> faces;
</span><span class="cx">     for (auto item : capabilities) {
</span><del>-        Ref<CSSFontFace> face = CSSFontFace::create(m_owningFontSelector.get(), nullptr, nullptr, true);
</del><ins>+        auto face = CSSFontFace::create(*m_owningFontSelector, nullptr, nullptr, true);
</ins><span class="cx">         
</span><span class="cx">         Ref<CSSValueList> familyList = CSSValueList::createCommaSeparated();
</span><span class="cx">         familyList->append(m_owningFontSelector->scriptExecutionContext()->cssValuePool().createFontFamilyValue(familyName));
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (278465 => 278466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp     2021-06-04 16:32:57 UTC (rev 278465)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp        2021-06-04 16:34:16 UTC (rev 278466)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     SetForScope<bool> creatingFont(m_creatingFont, true);
</span><del>-    Ref<CSSFontFace> fontFace = CSSFontFace::create(this, &fontFaceRule);
</del><ins>+    auto fontFace = CSSFontFace::create(*this, &fontFaceRule);
</ins><span class="cx"> 
</span><span class="cx">     if (!fontFace->setFamilies(*fontFamily))
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (278465 => 278466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp    2021-06-04 16:32:57 UTC (rev 278465)
+++ trunk/Source/WebCore/css/FontFace.cpp       2021-06-04 16:34:16 UTC (rev 278466)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> 
</span><span class="cx"> FontFace::FontFace(CSSFontSelector& fontSelector)
</span><span class="cx">     : ActiveDOMObject(fontSelector.scriptExecutionContext())
</span><del>-    , m_backing(CSSFontFace::create(&fontSelector, nullptr, this))
</del><ins>+    , m_backing(CSSFontFace::create(fontSelector, nullptr, this))
</ins><span class="cx">     , m_loadedPromise(makeUniqueRef<LoadedPromise>(*this, &FontFace::loadedPromiseResolve))
</span><span class="cx"> {
</span><span class="cx">     m_backing->addClient(*this);
</span></span></pre>
</div>
</div>

</body>
</html>