<!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>[196393] 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/196393">196393</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-02-10 13:57:53 -0800 (Wed, 10 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>CSSSegmentedFontFace does not need to be reference counted
https://bugs.webkit.org/show_bug.cgi?id=154083

Reviewed by Antti Koivisto.

...There is only ever a single reference to one.

No new tests because there is no behavior change.

* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::getFontFace):
* css/CSSFontSelector.h:
* css/CSSSegmentedFontFace.h:
(WebCore::CSSSegmentedFontFace::create): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196392 => 196393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-10 21:51:18 UTC (rev 196392)
+++ trunk/Source/WebCore/ChangeLog        2016-02-10 21:57:53 UTC (rev 196393)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-02-10  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        CSSSegmentedFontFace does not need to be reference counted
+        https://bugs.webkit.org/show_bug.cgi?id=154083
+
+        Reviewed by Antti Koivisto.
+
+        ...There is only ever a single reference to one.
+
+        No new tests because there is no behavior change.
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::getFontFace):
+        * css/CSSFontSelector.h:
+        * css/CSSSegmentedFontFace.h:
+        (WebCore::CSSSegmentedFontFace::create): Deleted.
+
+2016-02-10  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        FontCache's clients should use references instead of pointers
+        https://bugs.webkit.org/show_bug.cgi?id=154085
+
+        Reviewed by Antti Koivisto.
+
+        They are never null.
+
+        No new tests because there is no behavior change.
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::CSSFontSelector):
+        (WebCore::CSSFontSelector::~CSSFontSelector):
+        * platform/graphics/FontCache.cpp:
+        (WebCore::FontCache::addClient):
+        (WebCore::FontCache::removeClient):
+        * platform/graphics/FontCache.h:
+
</ins><span class="cx"> 2016-02-10  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Web IDL] interface objects should be Function objects
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (196392 => 196393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp        2016-02-10 21:51:18 UTC (rev 196392)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp        2016-02-10 21:57:53 UTC (rev 196393)
</span><span class="lines">@@ -73,13 +73,13 @@
</span><span class="cx">     // seem to be any such guarantee.
</span><span class="cx"> 
</span><span class="cx">     ASSERT(m_document);
</span><del>-    FontCache::singleton().addClient(this);
</del><ins>+    FontCache::singleton().addClient(*this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> CSSFontSelector::~CSSFontSelector()
</span><span class="cx"> {
</span><span class="cx">     clearDocument();
</span><del>-    FontCache::singleton().removeClient(this);
</del><ins>+    FontCache::singleton().removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool CSSFontSelector::isEmpty() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (196392 => 196393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp        2016-02-10 21:51:18 UTC (rev 196392)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp        2016-02-10 21:57:53 UTC (rev 196393)
</span><span class="lines">@@ -485,21 +485,21 @@
</span><span class="cx"> 
</span><span class="cx"> static HashSet&lt;FontSelector*&gt;* gClients;
</span><span class="cx"> 
</span><del>-void FontCache::addClient(FontSelector* client)
</del><ins>+void FontCache::addClient(FontSelector&amp; client)
</ins><span class="cx"> {
</span><span class="cx">     if (!gClients)
</span><span class="cx">         gClients = new HashSet&lt;FontSelector*&gt;;
</span><span class="cx"> 
</span><del>-    ASSERT(!gClients-&gt;contains(client));
-    gClients-&gt;add(client);
</del><ins>+    ASSERT(!gClients-&gt;contains(&amp;client));
+    gClients-&gt;add(&amp;client);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FontCache::removeClient(FontSelector* client)
</del><ins>+void FontCache::removeClient(FontSelector&amp; client)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(gClients);
</span><del>-    ASSERT(gClients-&gt;contains(client));
</del><ins>+    ASSERT(gClients-&gt;contains(&amp;client));
</ins><span class="cx"> 
</span><del>-    gClients-&gt;remove(client);
</del><ins>+    gClients-&gt;remove(&amp;client);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static unsigned short gGeneration = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (196392 => 196393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h        2016-02-10 21:51:18 UTC (rev 196392)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h        2016-02-10 21:57:53 UTC (rev 196393)
</span><span class="lines">@@ -193,8 +193,8 @@
</span><span class="cx">     WEBCORE_EXPORT Ref&lt;Font&gt; fontForPlatformData(const FontPlatformData&amp;);
</span><span class="cx">     RefPtr&lt;Font&gt; similarFont(const FontDescription&amp;, const AtomicString&amp; family);
</span><span class="cx"> 
</span><del>-    void addClient(FontSelector*);
-    void removeClient(FontSelector*);
</del><ins>+    void addClient(FontSelector&amp;);
+    void removeClient(FontSelector&amp;);
</ins><span class="cx"> 
</span><span class="cx">     unsigned short generation();
</span><span class="cx">     WEBCORE_EXPORT void invalidate();
</span></span></pre>
</div>
</div>

</body>
</html>