<!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>[162773] 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/162773">162773</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-01-25 10:55:51 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move CSSGroupingRule, CSSStyleSheet, ElementRuleCollector to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=127575
Reviewed by Andreas Kling.
Use std::unique_ptr and std::make_unique in place of OwnPtr and adoptPtr
in the CSSGroupingRule, CSSStyleSheet and ElementRuleCollector classes.
* css/CSSFunctionValue.cpp: Remove the unnecessary PassOwnPtr header inclusion.
* css/CSSGroupingRule.cpp:
(WebCore::CSSGroupingRule::cssRules):
* css/CSSGroupingRule.h:
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::cssRules):
* css/CSSStyleSheet.h:
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::addMatchedRule):
* css/ElementRuleCollector.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFunctionValuecpp">trunk/Source/WebCore/css/CSSFunctionValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGroupingRulecpp">trunk/Source/WebCore/css/CSSGroupingRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGroupingRuleh">trunk/Source/WebCore/css/CSSGroupingRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheeth">trunk/Source/WebCore/css/CSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-01-25 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Move CSSGroupingRule, CSSStyleSheet, ElementRuleCollector to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=127575
+
+ Reviewed by Andreas Kling.
+
+ Use std::unique_ptr and std::make_unique in place of OwnPtr and adoptPtr
+ in the CSSGroupingRule, CSSStyleSheet and ElementRuleCollector classes.
+
+ * css/CSSFunctionValue.cpp: Remove the unnecessary PassOwnPtr header inclusion.
+ * css/CSSGroupingRule.cpp:
+ (WebCore::CSSGroupingRule::cssRules):
+ * css/CSSGroupingRule.h:
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::cssRules):
+ * css/CSSStyleSheet.h:
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::addMatchedRule):
+ * css/ElementRuleCollector.h:
+
+2014-01-25 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Move MediaQueryMatcher, SelectorFilter to std::unique_ptr
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127574
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFunctionValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFunctionValue.cpp (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFunctionValue.cpp 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/CSSFunctionValue.cpp 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSParserValues.h"
</span><span class="cx"> #include "CSSValueList.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGroupingRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGroupingRule.cpp 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> CSSRuleList* CSSGroupingRule::cssRules() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_ruleListCSSOMWrapper)
</span><del>- m_ruleListCSSOMWrapper = adoptPtr(new LiveCSSRuleList<CSSGroupingRule>(const_cast<CSSGroupingRule*>(this)));
</del><ins>+ m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSGroupingRule>>(const_cast<CSSGroupingRule*>(this));
</ins><span class="cx"> return m_ruleListCSSOMWrapper.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGroupingRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGroupingRule.h (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGroupingRule.h 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/CSSGroupingRule.h 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "StyleRule.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleRuleGroup> m_groupRule;
</span><span class="cx"> mutable Vector<RefPtr<CSSRule>> m_childRuleCSSOMWrappers;
</span><del>- mutable OwnPtr<CSSRuleList> m_ruleListCSSOMWrapper;
</del><ins>+ mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> if (!canAccessRules())
</span><span class="cx"> return 0;
</span><span class="cx"> if (!m_ruleListCSSOMWrapper)
</span><del>- m_ruleListCSSOMWrapper = adoptPtr(new StyleSheetCSSRuleList(this));
</del><ins>+ m_ruleListCSSOMWrapper = std::make_unique<StyleSheetCSSRuleList>(this);
</ins><span class="cx"> return m_ruleListCSSOMWrapper.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.h (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.h 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/CSSStyleSheet.h 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "CSSParserMode.h"
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "StyleSheet.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="lines">@@ -135,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> mutable RefPtr<MediaList> m_mediaCSSOMWrapper;
</span><span class="cx"> mutable Vector<RefPtr<CSSRule>> m_childRuleCSSOMWrappers;
</span><del>- mutable OwnPtr<CSSRuleList> m_ruleListCSSOMWrapper;
</del><ins>+ mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> inline void ElementRuleCollector::addMatchedRule(const RuleData* rule)
</span><span class="cx"> {
</span><span class="cx"> if (!m_matchedRules)
</span><del>- m_matchedRules = adoptPtr(new Vector<const RuleData*, 32>);
</del><ins>+ m_matchedRules = std::make_unique<Vector<const RuleData*, 32>>();
</ins><span class="cx"> m_matchedRules->append(rule);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (162772 => 162773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h 2014-01-25 18:54:02 UTC (rev 162772)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2014-01-25 18:55:51 UTC (rev 162773)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include "MediaQueryEvaluator.h"
</span><span class="cx"> #include "SelectorChecker.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><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">@@ -99,7 +100,7 @@
</span><span class="cx"> SelectorChecker::Mode m_mode;
</span><span class="cx"> bool m_canUseFastReject;
</span><span class="cx">
</span><del>- OwnPtr<Vector<const RuleData*, 32>> m_matchedRules;
</del><ins>+ std::unique_ptr<Vector<const RuleData*, 32>> m_matchedRules;
</ins><span class="cx">
</span><span class="cx"> // Output.
</span><span class="cx"> Vector<RefPtr<StyleRuleBase>> m_matchedRuleList;
</span></span></pre>
</div>
</div>
</body>
</html>