<!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>[163378] 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/163378">163378</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-04 07:57:23 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Manage RuleSet and RuleData classes through std::unique_ptr instead of OwnPtr
https://bugs.webkit.org/show_bug.cgi?id=128116
Reviewed by Darin Adler.
Replace uses of OwnPtr for the RuleSet and RuleData classes with std::unique_ptr.
* css/CSSDefaultStyleSheets.cpp:
(WebCore::CSSDefaultStyleSheets::loadFullDefaultStyle):
(WebCore::CSSDefaultStyleSheets::loadSimpleDefaultStyle):
(WebCore::CSSDefaultStyleSheets::viewSourceStyle):
* css/DocumentRuleSets.cpp:
(WebCore::DocumentRuleSets::initUserStyle):
(WebCore::makeRuleSet):
(WebCore::DocumentRuleSets::resetAuthorStyle):
* css/DocumentRuleSets.h:
* css/RuleSet.cpp:
(WebCore::RuleSet::addToRuleSet):
(WebCore::RuleSet::addRegionRule):
* css/RuleSet.h:
(WebCore::RuleSet::RuleSetSelectorPair::RuleSetSelectorPair):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSDefaultStyleSheetscpp">trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetscpp">trunk/Source/WebCore/css/DocumentRuleSets.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetsh">trunk/Source/WebCore/css/DocumentRuleSets.h</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSeth">trunk/Source/WebCore/css/RuleSet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163377 => 163378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-04 15:52:21 UTC (rev 163377)
+++ trunk/Source/WebCore/ChangeLog 2014-02-04 15:57:23 UTC (rev 163378)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Manage RuleSet and RuleData classes through std::unique_ptr instead of OwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=128116
+
+ Reviewed by Darin Adler.
+
+ Replace uses of OwnPtr for the RuleSet and RuleData classes with std::unique_ptr.
+
+ * css/CSSDefaultStyleSheets.cpp:
+ (WebCore::CSSDefaultStyleSheets::loadFullDefaultStyle):
+ (WebCore::CSSDefaultStyleSheets::loadSimpleDefaultStyle):
+ (WebCore::CSSDefaultStyleSheets::viewSourceStyle):
+ * css/DocumentRuleSets.cpp:
+ (WebCore::DocumentRuleSets::initUserStyle):
+ (WebCore::makeRuleSet):
+ (WebCore::DocumentRuleSets::resetAuthorStyle):
+ * css/DocumentRuleSets.h:
+ * css/RuleSet.cpp:
+ (WebCore::RuleSet::addToRuleSet):
+ (WebCore::RuleSet::addRegionRule):
+ * css/RuleSet.h:
+ (WebCore::RuleSet::RuleSetSelectorPair::RuleSetSelectorPair):
+
</ins><span class="cx"> 2014-02-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163376.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSDefaultStyleSheetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp (163377 => 163378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2014-02-04 15:52:21 UTC (rev 163377)
+++ trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2014-02-04 15:57:23 UTC (rev 163378)
</span><span class="lines">@@ -107,14 +107,14 @@
</span><span class="cx"> ASSERT(defaultPrintStyle == defaultStyle);
</span><span class="cx"> delete defaultStyle;
</span><span class="cx"> simpleDefaultStyleSheet->deref();
</span><del>- defaultStyle = RuleSet::create().leakPtr();
- defaultPrintStyle = RuleSet::create().leakPtr();
</del><ins>+ defaultStyle = std::make_unique<RuleSet>().release();
+ defaultPrintStyle = std::make_unique<RuleSet>().release();
</ins><span class="cx"> simpleDefaultStyleSheet = 0;
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(!defaultStyle);
</span><del>- defaultStyle = RuleSet::create().leakPtr();
- defaultPrintStyle = RuleSet::create().leakPtr();
- defaultQuirksStyle = RuleSet::create().leakPtr();
</del><ins>+ defaultStyle = std::make_unique<RuleSet>().release();
+ defaultPrintStyle = std::make_unique<RuleSet>().release();
+ defaultQuirksStyle = std::make_unique<RuleSet>().release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Strict-mode rules.
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx"> ASSERT(!defaultStyle);
</span><span class="cx"> ASSERT(!simpleDefaultStyleSheet);
</span><span class="cx">
</span><del>- defaultStyle = RuleSet::create().leakPtr();
</del><ins>+ defaultStyle = std::make_unique<RuleSet>().release();
</ins><span class="cx"> // There are no media-specific rules in the simple default style.
</span><span class="cx"> defaultPrintStyle = defaultStyle;
</span><del>- defaultQuirksStyle = RuleSet::create().leakPtr();
</del><ins>+ defaultQuirksStyle = std::make_unique<RuleSet>().release();
</ins><span class="cx">
</span><span class="cx"> simpleDefaultStyleSheet = parseUASheet(simpleUserAgentStyleSheet, strlen(simpleUserAgentStyleSheet));
</span><span class="cx"> defaultStyle->addRulesFromSheet(simpleDefaultStyleSheet, screenEval());
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!defaultViewSourceStyle) {
</span><span class="cx"> static StyleSheetContents* viewSourceStyleSheet = parseUASheet(sourceUserAgentStyleSheet, sizeof(sourceUserAgentStyleSheet));
</span><del>- defaultViewSourceStyle = RuleSet::create().leakPtr();
</del><ins>+ defaultViewSourceStyle = std::make_unique<RuleSet>().release();
</ins><span class="cx"> defaultViewSourceStyle->addRulesFromSheet(viewSourceStyleSheet, screenEval());
</span><span class="cx"> }
</span><span class="cx"> return defaultViewSourceStyle;
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.cpp (163377 => 163378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.cpp 2014-02-04 15:52:21 UTC (rev 163377)
+++ trunk/Source/WebCore/css/DocumentRuleSets.cpp 2014-02-04 15:57:23 UTC (rev 163378)
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx">
</span><span class="cx"> void DocumentRuleSets::initUserStyle(DocumentStyleSheetCollection& styleSheetCollection, const MediaQueryEvaluator& medium, StyleResolver& resolver)
</span><span class="cx"> {
</span><del>- OwnPtr<RuleSet> tempUserStyle = RuleSet::create();
</del><ins>+ auto tempUserStyle = std::make_unique<RuleSet>();
</ins><span class="cx"> if (CSSStyleSheet* pageUserSheet = styleSheetCollection.pageUserSheet())
</span><span class="cx"> tempUserStyle->addRulesFromSheet(&pageUserSheet->contents(), medium, &resolver);
</span><span class="cx"> collectRulesFromUserStyleSheets(styleSheetCollection.injectedUserStyleSheets(), *tempUserStyle, medium, resolver);
</span><span class="cx"> collectRulesFromUserStyleSheets(styleSheetCollection.documentUserStyleSheets(), *tempUserStyle, medium, resolver);
</span><span class="cx"> if (tempUserStyle->ruleCount() > 0 || tempUserStyle->pageRules().size() > 0)
</span><del>- m_userStyle = tempUserStyle.release();
</del><ins>+ m_userStyle = std::move(tempUserStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentRuleSets::collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSStyleSheet>>& userSheets, RuleSet& userStyle, const MediaQueryEvaluator& medium, StyleResolver& resolver)
</span><span class="lines">@@ -65,21 +65,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<RuleSet> makeRuleSet(const Vector<RuleFeature>& rules)
</del><ins>+static std::unique_ptr<RuleSet> makeRuleSet(const Vector<RuleFeature>& rules)
</ins><span class="cx"> {
</span><span class="cx"> size_t size = rules.size();
</span><span class="cx"> if (!size)
</span><span class="cx"> return nullptr;
</span><del>- OwnPtr<RuleSet> ruleSet = RuleSet::create();
</del><ins>+ auto ruleSet = std::make_unique<RuleSet>();
</ins><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><span class="cx"> ruleSet->addRule(rules[i].rule, rules[i].selectorIndex, rules[i].hasDocumentSecurityOrigin ? RuleHasDocumentSecurityOrigin : RuleHasNoSpecialState);
</span><span class="cx"> ruleSet->shrinkToFit();
</span><del>- return ruleSet.release();
</del><ins>+ return ruleSet;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentRuleSets::resetAuthorStyle()
</span><span class="cx"> {
</span><del>- m_authorStyle = RuleSet::create();
</del><ins>+ m_authorStyle = std::make_unique<RuleSet>();
</ins><span class="cx"> m_authorStyle->disableAutoShrinkToFit();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.h (163377 => 163378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.h 2014-02-04 15:52:21 UTC (rev 163377)
+++ trunk/Source/WebCore/css/DocumentRuleSets.h 2014-02-04 15:57:23 UTC (rev 163378)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "RuleFeature.h"
</span><span class="cx"> #include "RuleSet.h"
</span><del>-
-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -58,11 +57,11 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&, RuleSet& userStyle, const MediaQueryEvaluator&, StyleResolver&);
</span><del>- OwnPtr<RuleSet> m_authorStyle;
- OwnPtr<RuleSet> m_userStyle;
</del><ins>+ std::unique_ptr<RuleSet> m_authorStyle;
+ std::unique_ptr<RuleSet> m_userStyle;
</ins><span class="cx"> RuleFeatureSet m_features;
</span><del>- OwnPtr<RuleSet> m_siblingRuleSet;
- OwnPtr<RuleSet> m_uncommonAttributeRuleSet;
</del><ins>+ std::unique_ptr<RuleSet> m_siblingRuleSet;
+ std::unique_ptr<RuleSet> m_uncommonAttributeRuleSet;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (163377 => 163378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2014-02-04 15:52:21 UTC (rev 163377)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2014-02-04 15:57:23 UTC (rev 163378)
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!key)
</span><span class="cx"> return;
</span><del>- OwnPtr<Vector<RuleData>>& rules = map.add(key, nullptr).iterator->value;
</del><ins>+ std::unique_ptr<Vector<RuleData>>& rules = map.add(key, nullptr).iterator->value;
</ins><span class="cx"> if (!rules)
</span><del>- rules = adoptPtr(new Vector<RuleData>);
</del><ins>+ rules = std::make_unique<Vector<RuleData>>();
</ins><span class="cx"> rules->append(ruleData);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">
</span><span class="cx"> void RuleSet::addRegionRule(StyleRuleRegion* regionRule, bool hasDocumentSecurityOrigin)
</span><span class="cx"> {
</span><del>- OwnPtr<RuleSet> regionRuleSet = RuleSet::create();
</del><ins>+ auto regionRuleSet = std::make_unique<RuleSet>();
</ins><span class="cx"> // The region rule set should take into account the position inside the parent rule set.
</span><span class="cx"> // Otherwise, the rules inside region block might be incorrectly positioned before other similar rules from
</span><span class="cx"> // the stylesheet that contains the region block.
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> // Update the "global" rule count so that proper order is maintained
</span><span class="cx"> m_ruleCount = regionRuleSet->m_ruleCount;
</span><span class="cx">
</span><del>- m_regionSelectorsAndRuleSets.append(RuleSetSelectorPair(regionRule->selectorList().first(), regionRuleSet.release()));
</del><ins>+ m_regionSelectorsAndRuleSets.append(RuleSetSelectorPair(regionRule->selectorList().first(), std::move(regionRuleSet)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase>>& rules, const MediaQueryEvaluator& medium, StyleResolver* resolver, const ContainerNode* scope, bool hasDocumentSecurityOrigin, AddRuleFlags addRuleFlags)
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.h (163377 => 163378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.h 2014-02-04 15:52:21 UTC (rev 163377)
+++ trunk/Source/WebCore/css/RuleSet.h 2014-02-04 15:57:23 UTC (rev 163378)
</span><span class="lines">@@ -128,16 +128,16 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RuleSet); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> struct RuleSetSelectorPair {
</span><del>- RuleSetSelectorPair(const CSSSelector* selector, PassOwnPtr<RuleSet> ruleSet) : selector(selector), ruleSet(ruleSet) { }
</del><ins>+ RuleSetSelectorPair(const CSSSelector* selector, std::unique_ptr<RuleSet> ruleSet) : selector(selector), ruleSet(std::move(ruleSet)) { }
</ins><span class="cx"> RuleSetSelectorPair(const RuleSetSelectorPair& pair) : selector(pair.selector), ruleSet(const_cast<RuleSetSelectorPair*>(&pair)->ruleSet.release()) { }
</span><span class="cx">
</span><span class="cx"> const CSSSelector* selector;
</span><del>- OwnPtr<RuleSet> ruleSet;
</del><ins>+ std::unique_ptr<RuleSet> ruleSet;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- static PassOwnPtr<RuleSet> create() { return adoptPtr(new RuleSet); }
</del><ins>+ RuleSet();
</ins><span class="cx">
</span><del>- typedef HashMap<AtomicStringImpl*, OwnPtr<Vector<RuleData>>> AtomRuleMap;
</del><ins>+ typedef HashMap<AtomicStringImpl*, std::unique_ptr<Vector<RuleData>>> AtomRuleMap;
</ins><span class="cx">
</span><span class="cx"> void addRulesFromSheet(StyleSheetContents*, const MediaQueryEvaluator&, StyleResolver* = 0, const ContainerNode* = 0);
</span><span class="cx">
</span><span class="lines">@@ -170,8 +170,6 @@
</span><span class="cx"> void addChildRules(const Vector<RefPtr<StyleRuleBase>>&, const MediaQueryEvaluator& medium, StyleResolver*, const ContainerNode* scope, bool hasDocumentSecurityOrigin, AddRuleFlags);
</span><span class="cx"> bool findBestRuleSetAndAdd(const CSSSelector*, RuleData&);
</span><span class="cx">
</span><del>- RuleSet();
-
</del><span class="cx"> AtomRuleMap m_idRules;
</span><span class="cx"> AtomRuleMap m_classRules;
</span><span class="cx"> AtomRuleMap m_tagRules;
</span></span></pre>
</div>
</div>
</body>
</html>