<!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>[162769] 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/162769">162769</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-01-25 10:49:50 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move CSSFontFace, CSSFontSelector to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=127569
Reviewed by Andreas Kling.
Move the CSSFontFace and CSSFontSelector classes from using OwnPtr, PassOwnPtr and adoptPtr
to using std::unique_ptr, move semantics and std::make_unique.
* css/CSSFontFace.cpp:
(WebCore::CSSFontFace::addSource):
* css/CSSFontFace.h:
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::addFontFaceRule):
(WebCore::CSSFontSelector::getFontFace):
* css/CSSFontSelector.h:</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="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorh">trunk/Source/WebCore/css/CSSFontSelector.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162768 => 162769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 18:48:02 UTC (rev 162768)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 18:49:50 UTC (rev 162769)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-25 Zan Dobersek <zdobersek@igalia.com>
+
+ Move CSSFontFace, CSSFontSelector to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=127569
+
+ Reviewed by Andreas Kling.
+
+ Move the CSSFontFace and CSSFontSelector classes from using OwnPtr, PassOwnPtr and adoptPtr
+ to using std::unique_ptr, move semantics and std::make_unique.
+
+ * css/CSSFontFace.cpp:
+ (WebCore::CSSFontFace::addSource):
+ * css/CSSFontFace.h:
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::addFontFaceRule):
+ (WebCore::CSSFontSelector::getFontFace):
+ * css/CSSFontSelector.h:
+
</ins><span class="cx"> 2014-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Move InspectorRuntimeAgent into JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (162768 => 162769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2014-01-25 18:48:02 UTC (rev 162768)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2014-01-25 18:49:50 UTC (rev 162769)
</span><span class="lines">@@ -67,10 +67,10 @@
</span><span class="cx"> m_segmentedFontFaces.remove(segmentedFontFace);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSFontFace::addSource(PassOwnPtr<CSSFontFaceSource> source)
</del><ins>+void CSSFontFace::addSource(std::unique_ptr<CSSFontFaceSource> source)
</ins><span class="cx"> {
</span><span class="cx"> source->setFontFace(this);
</span><del>- m_sources.append(source);
</del><ins>+ m_sources.append(std::move(source));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSFontFace::fontLoaded(CSSFontFaceSource* source)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.h (162768 => 162769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.h 2014-01-25 18:48:02 UTC (rev 162768)
+++ trunk/Source/WebCore/css/CSSFontFace.h 2014-01-25 18:49:50 UTC (rev 162769)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "CSSFontFaceSource.h"
</span><span class="cx"> #include "FontTraitsMask.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -61,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> bool isLocalFallback() const { return m_isLocalFallback; }
</span><span class="cx">
</span><del>- void addSource(PassOwnPtr<CSSFontFaceSource>);
</del><ins>+ void addSource(std::unique_ptr<CSSFontFaceSource>);
</ins><span class="cx">
</span><span class="cx"> void fontLoaded(CSSFontFaceSource*);
</span><span class="cx">
</span><span class="lines">@@ -107,7 +108,7 @@
</span><span class="cx"> FontTraitsMask m_traitsMask;
</span><span class="cx"> Vector<UnicodeRange> m_ranges;
</span><span class="cx"> HashSet<CSSSegmentedFontFace*> m_segmentedFontFaces;
</span><del>- Vector<OwnPtr<CSSFontFaceSource>> m_sources;
</del><ins>+ Vector<std::unique_ptr<CSSFontFaceSource>> m_sources;
</ins><span class="cx"> CSSFontFaceSource* m_activeSource;
</span><span class="cx"> bool m_isLocalFallback;
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (162768 => 162769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2014-01-25 18:48:02 UTC (rev 162768)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2014-01-25 18:49:50 UTC (rev 162769)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> for (int i = 0; i < srcLength; i++) {
</span><span class="cx"> // An item in the list either specifies a string (local font name) or a URL (remote font to download).
</span><span class="cx"> CSSFontFaceSrcValue* item = toCSSFontFaceSrcValue(srcList->itemWithoutBoundsCheck(i));
</span><del>- OwnPtr<CSSFontFaceSource> source;
</del><ins>+ std::unique_ptr<CSSFontFaceSource> source;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> foundSVGFont = item->isSVGFontFaceSrc() || item->svgFontFaceElement();
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> if (allowDownloading && item->isSupportedFormat() && m_document) {
</span><span class="cx"> CachedFont* cachedFont = item->cachedFont(m_document);
</span><span class="cx"> if (cachedFont) {
</span><del>- source = adoptPtr(new CSSFontFaceSource(item->resource(), cachedFont));
</del><ins>+ source = std::make_unique<CSSFontFaceSource>(item->resource(), cachedFont);
</ins><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> if (foundSVGFont)
</span><span class="cx"> source->setHasExternalSVGFont(true);
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- source = adoptPtr(new CSSFontFaceSource(item->resource()));
</del><ins>+ source = std::make_unique<CSSFontFaceSource>(item->resource());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!fontFace) {
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> source->setSVGFontFaceElement(item->svgFontFaceElement());
</span><span class="cx"> #endif
</span><del>- fontFace->addSource(source.release());
</del><ins>+ fontFace->addSource(std::move(source));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -296,25 +296,25 @@
</span><span class="cx"> if (familyName.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- OwnPtr<Vector<RefPtr<CSSFontFace>>>& familyFontFaces = m_fontFaces.add(familyName, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<Vector<RefPtr<CSSFontFace>>>& familyFontFaces = m_fontFaces.add(familyName, nullptr).iterator->value;
</ins><span class="cx"> if (!familyFontFaces) {
</span><del>- familyFontFaces = adoptPtr(new Vector<RefPtr<CSSFontFace>>);
</del><ins>+ familyFontFaces = std::make_unique<Vector<RefPtr<CSSFontFace>>>();
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_locallyInstalledFontFaces.contains(familyName));
</span><span class="cx">
</span><span class="cx"> Vector<unsigned> locallyInstalledFontsTraitsMasks;
</span><span class="cx"> fontCache()->getTraitsInFamily(familyName, locallyInstalledFontsTraitsMasks);
</span><span class="cx"> if (unsigned numLocallyInstalledFaces = locallyInstalledFontsTraitsMasks.size()) {
</span><del>- OwnPtr<Vector<RefPtr<CSSFontFace>>> familyLocallyInstalledFaces = adoptPtr(new Vector<RefPtr<CSSFontFace>>);
</del><ins>+ auto familyLocallyInstalledFaces = std::make_unique<Vector<RefPtr<CSSFontFace>>>();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < numLocallyInstalledFaces; ++i) {
</span><span class="cx"> RefPtr<CSSFontFace> locallyInstalledFontFace = CSSFontFace::create(static_cast<FontTraitsMask>(locallyInstalledFontsTraitsMasks[i]), 0, true);
</span><del>- locallyInstalledFontFace->addSource(adoptPtr(new CSSFontFaceSource(familyName)));
</del><ins>+ locallyInstalledFontFace->addSource(std::make_unique<CSSFontFaceSource>(familyName));
</ins><span class="cx"> ASSERT(locallyInstalledFontFace->isValid());
</span><span class="cx"> familyLocallyInstalledFaces->append(locallyInstalledFontFace);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_locallyInstalledFontFaces.set(familyName, familyLocallyInstalledFaces.release());
</del><ins>+ m_locallyInstalledFontFaces.set(familyName, std::move(familyLocallyInstalledFaces));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -506,9 +506,9 @@
</span><span class="cx"> if (!familyFontFaces || familyFontFaces->isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>>& segmentedFontFaceCache = m_fonts.add(family, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>>& segmentedFontFaceCache = m_fonts.add(family, nullptr).iterator->value;
</ins><span class="cx"> if (!segmentedFontFaceCache)
</span><del>- segmentedFontFaceCache = adoptPtr(new HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>);
</del><ins>+ segmentedFontFaceCache = std::make_unique<HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>>();
</ins><span class="cx">
</span><span class="cx"> FontTraitsMask traitsMask = fontDescription.traitsMask();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.h (162768 => 162769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.h 2014-01-25 18:48:02 UTC (rev 162768)
+++ trunk/Source/WebCore/css/CSSFontSelector.h 2014-01-25 18:49:50 UTC (rev 162769)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "FontSelector.h"
</span><span class="cx"> #include "SimpleFontData.h"
</span><span class="cx"> #include "Timer.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -88,9 +89,9 @@
</span><span class="cx"> void beginLoadTimerFired(Timer<CSSFontSelector>&);
</span><span class="cx">
</span><span class="cx"> Document* m_document;
</span><del>- HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace>>>, CaseFoldingHash> m_fontFaces;
- HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace>>>, CaseFoldingHash> m_locallyInstalledFontFaces;
- HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>>, CaseFoldingHash> m_fonts;
</del><ins>+ HashMap<String, std::unique_ptr<Vector<RefPtr<CSSFontFace>>>, CaseFoldingHash> m_fontFaces;
+ HashMap<String, std::unique_ptr<Vector<RefPtr<CSSFontFace>>>, CaseFoldingHash> m_locallyInstalledFontFaces;
+ HashMap<String, std::unique_ptr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>>, CaseFoldingHash> m_fonts;
</ins><span class="cx"> HashSet<FontSelectorClient*> m_clients;
</span><span class="cx">
</span><span class="cx"> Vector<CachedResourceHandle<CachedFont>> m_fontsToBeginLoading;
</span></span></pre>
</div>
</div>
</body>
</html>