<!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>[164425] 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/164425">164425</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-20 04:29:53 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move to using std::unique_ptr for VisitedLinkState, CheckedRadioButtons
https://bugs.webkit.org/show_bug.cgi?id=128967
Reviewed by Andreas Kling.
Replace uses of OwnPtr and PassOwnPtr in the VisitedLinkState and
CheckedRadioButtons classes with std::unique_ptr.
* dom/CheckedRadioButtons.cpp:
(WebCore::RadioButtonGroup::RadioButtonGroup):
(WebCore::RadioButtonGroup::remove):
(WebCore::CheckedRadioButtons::addButton):
(WebCore::CheckedRadioButtons::removeButton):
* dom/CheckedRadioButtons.h:
* dom/Document.cpp:
(WebCore::Document::Document):
* dom/Document.h:
* dom/VisitedLinkState.cpp:
* dom/VisitedLinkState.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomCheckedRadioButtonscpp">trunk/Source/WebCore/dom/CheckedRadioButtons.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCheckedRadioButtonsh">trunk/Source/WebCore/dom/CheckedRadioButtons.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomVisitedLinkStatecpp">trunk/Source/WebCore/dom/VisitedLinkState.cpp</a></li>
<li><a href="#trunkSourceWebCoredomVisitedLinkStateh">trunk/Source/WebCore/dom/VisitedLinkState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-02-20 Zan Dobersek <zdobersek@igalia.com>
+
+ Move to using std::unique_ptr for VisitedLinkState, CheckedRadioButtons
+ https://bugs.webkit.org/show_bug.cgi?id=128967
+
+ Reviewed by Andreas Kling.
+
+ Replace uses of OwnPtr and PassOwnPtr in the VisitedLinkState and
+ CheckedRadioButtons classes with std::unique_ptr.
+
+ * dom/CheckedRadioButtons.cpp:
+ (WebCore::RadioButtonGroup::RadioButtonGroup):
+ (WebCore::RadioButtonGroup::remove):
+ (WebCore::CheckedRadioButtons::addButton):
+ (WebCore::CheckedRadioButtons::removeButton):
+ * dom/CheckedRadioButtons.h:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ * dom/Document.h:
+ * dom/VisitedLinkState.cpp:
+ * dom/VisitedLinkState.h:
+
</ins><span class="cx"> 2014-02-20 Artur Moryc <a.moryc@samsung.com>
</span><span class="cx">
</span><span class="cx"> AX: Children Nodes for Canvas objects are not equal to Render Objects.
</span></span></pre></div>
<a id="trunkSourceWebCoredomCheckedRadioButtonscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CheckedRadioButtons.cpp (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CheckedRadioButtons.cpp 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/dom/CheckedRadioButtons.cpp 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> class RadioButtonGroup {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<RadioButtonGroup> create();
</del><ins>+ RadioButtonGroup();
</ins><span class="cx"> bool isEmpty() const { return m_members.isEmpty(); }
</span><span class="cx"> bool isRequired() const { return m_requiredCount; }
</span><span class="cx"> HTMLInputElement* checkedButton() const { return m_checkedButton; }
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> bool contains(HTMLInputElement*) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RadioButtonGroup();
</del><span class="cx"> void setNeedsValidityCheckForAllButtons();
</span><span class="cx"> bool isValid() const;
</span><span class="cx"> void setCheckedButton(HTMLInputElement*);
</span><span class="lines">@@ -51,16 +50,11 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RadioButtonGroup::RadioButtonGroup()
</span><del>- : m_checkedButton(0)
</del><ins>+ : m_checkedButton(nullptr)
</ins><span class="cx"> , m_requiredCount(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<RadioButtonGroup> RadioButtonGroup::create()
-{
- return adoptPtr(new RadioButtonGroup);
-}
-
</del><span class="cx"> inline bool RadioButtonGroup::isValid() const
</span><span class="cx"> {
</span><span class="cx"> return !isRequired() || m_checkedButton;
</span><span class="lines">@@ -140,7 +134,7 @@
</span><span class="cx"> --m_requiredCount;
</span><span class="cx"> }
</span><span class="cx"> if (m_checkedButton == button)
</span><del>- m_checkedButton = 0;
</del><ins>+ m_checkedButton = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (m_members.isEmpty()) {
</span><span class="cx"> ASSERT(!m_requiredCount);
</span><span class="lines">@@ -190,11 +184,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_nameToGroupMap)
</span><del>- m_nameToGroupMap = adoptPtr(new NameToGroupMap);
</del><ins>+ m_nameToGroupMap = std::make_unique<NameToGroupMap>();
</ins><span class="cx">
</span><del>- OwnPtr<RadioButtonGroup>& group = m_nameToGroupMap->add(element->name().impl(), PassOwnPtr<RadioButtonGroup>()).iterator->value;
</del><ins>+ auto& group = m_nameToGroupMap->add(element->name().impl(), nullptr).iterator->value;
</ins><span class="cx"> if (!group)
</span><del>- group = RadioButtonGroup::create();
</del><ins>+ group = std::make_unique<RadioButtonGroup>();
</ins><span class="cx"> group->add(element);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -263,7 +257,7 @@
</span><span class="cx"> // of m_nameToGroupMap from AtomicStringImpl* to RefPtr<AtomicStringImpl>.
</span><span class="cx"> m_nameToGroupMap->remove(it);
</span><span class="cx"> if (m_nameToGroupMap->isEmpty())
</span><del>- m_nameToGroupMap.clear();
</del><ins>+ m_nameToGroupMap = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomCheckedRadioButtonsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CheckedRadioButtons.h (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CheckedRadioButtons.h 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/dom/CheckedRadioButtons.h 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> #ifndef CheckedRadioButtons_h
</span><span class="cx"> #define CheckedRadioButtons_h
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> bool isInRequiredGroup(HTMLInputElement*) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- typedef HashMap<AtomicStringImpl*, OwnPtr<RadioButtonGroup>> NameToGroupMap;
- OwnPtr<NameToGroupMap> m_nameToGroupMap;
</del><ins>+ typedef HashMap<AtomicStringImpl*, std::unique_ptr<RadioButtonGroup>> NameToGroupMap;
+ std::unique_ptr<NameToGroupMap> m_nameToGroupMap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> , m_listenerTypes(0)
</span><span class="cx"> , m_mutationObserverTypes(0)
</span><span class="cx"> , m_styleSheetCollection(*this)
</span><del>- , m_visitedLinkState(VisitedLinkState::create(*this))
</del><ins>+ , m_visitedLinkState(std::make_unique<VisitedLinkState>(*this))
</ins><span class="cx"> , m_visuallyOrdered(false)
</span><span class="cx"> , m_readyState(Complete)
</span><span class="cx"> , m_bParsing(false)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #include "UserActionElementSet.h"
</span><span class="cx"> #include "ViewportArguments.h"
</span><span class="cx"> #include <chrono>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="lines">@@ -1424,7 +1425,7 @@
</span><span class="cx"> Color m_linkColor;
</span><span class="cx"> Color m_visitedLinkColor;
</span><span class="cx"> Color m_activeLinkColor;
</span><del>- const OwnPtr<VisitedLinkState> m_visitedLinkState;
</del><ins>+ const std::unique_ptr<VisitedLinkState> m_visitedLinkState;
</ins><span class="cx">
</span><span class="cx"> bool m_visuallyOrdered;
</span><span class="cx"> ReadyState m_readyState;
</span></span></pre></div>
<a id="trunkSourceWebCoredomVisitedLinkStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/VisitedLinkState.cpp (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/VisitedLinkState.cpp 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/dom/VisitedLinkState.cpp 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -53,11 +53,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<VisitedLinkState> VisitedLinkState::create(Document& document)
-{
- return adoptPtr(new VisitedLinkState(document));
-}
-
</del><span class="cx"> VisitedLinkState::VisitedLinkState(Document& document)
</span><span class="cx"> : m_document(document)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomVisitedLinkStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/VisitedLinkState.h (164424 => 164425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/VisitedLinkState.h 2014-02-20 11:33:09 UTC (rev 164424)
+++ trunk/Source/WebCore/dom/VisitedLinkState.h 2014-02-20 12:29:53 UTC (rev 164425)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "LinkHash.h"
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,15 +41,13 @@
</span><span class="cx"> class VisitedLinkState {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<VisitedLinkState> create(Document&);
</del><ins>+ explicit VisitedLinkState(Document&);
</ins><span class="cx">
</span><span class="cx"> void invalidateStyleForAllLinks();
</span><span class="cx"> void invalidateStyleForLink(LinkHash);
</span><span class="cx"> EInsideLink determineLinkState(Element*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit VisitedLinkState(Document&);
-
</del><span class="cx"> EInsideLink determineLinkStateSlowCase(Element&);
</span><span class="cx">
</span><span class="cx"> Document& m_document;
</span></span></pre>
</div>
</div>
</body>
</html>