<!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>[164638] 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/164638">164638</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-25 00:47:50 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move to using std::unique_ptr for Element, Node and related classes
https://bugs.webkit.org/show_bug.cgi?id=129058
Reviewed by Anders Carlsson.
Replace uses of OwnPtr and PassOwnPtr in Element, Node and the related
classes with std::unique_ptr and move semantics.
* dom/ContainerNode.h:
(WebCore::ChildNodesLazySnapshot::takeSnapshot):
(WebCore::ChildNodesLazySnapshot::hasSnapshot):
* dom/Element.cpp:
(WebCore::ensureAttrNodeListForElement):
(WebCore::Element::attributes):
* dom/ElementIteratorAssertions.h:
(WebCore::ElementIteratorAssertions::ElementIteratorAssertions):
* dom/ElementRareData.h:
(WebCore::ElementRareData::setAttributeMap):
* dom/MutationObserverRegistration.cpp:
(WebCore::MutationObserverRegistration::observedSubtreeNodeWillDetach):
(WebCore::MutationObserverRegistration::clearTransientRegistrations):
(WebCore::MutationObserverRegistration::addRegistrationNodesToSet):
* dom/MutationObserverRegistration.h:
* dom/NamedNodeMap.h:
(WebCore::NamedNodeMap::NamedNodeMap):
* dom/Node.cpp:
(WebCore::Node::ensureRareData):
(WebCore::Node::didMoveToNewDocument):
(WebCore::Node::ensureEventTargetData):
(WebCore::Node::mutationObserverRegistry):
(WebCore::Node::registerMutationObserver):
(WebCore::Node::unregisterMutationObserver):
(WebCore::Node::notifyMutationObserversNodeWillDetach):
* dom/Node.h:
* dom/NodeRareData.h:
(WebCore::NodeListsNodeData::NodeListsNodeData):
(WebCore::NodeRareData::NodeRareData):
(WebCore::NodeRareData::clearNodeLists):
(WebCore::NodeRareData::ensureNodeLists):
(WebCore::NodeRareData::ensureMutationObserverData):
* dom/StyledElement.cpp:
(WebCore::StyledElement::rebuildPresentationAttributeStyle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementIteratorAssertionsh">trunk/Source/WebCore/dom/ElementIteratorAssertions.h</a></li>
<li><a href="#trunkSourceWebCoredomElementRareDatah">trunk/Source/WebCore/dom/ElementRareData.h</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverRegistrationcpp">trunk/Source/WebCore/dom/MutationObserverRegistration.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverRegistrationh">trunk/Source/WebCore/dom/MutationObserverRegistration.h</a></li>
<li><a href="#trunkSourceWebCoredomNamedNodeMaph">trunk/Source/WebCore/dom/NamedNodeMap.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeRareDatah">trunk/Source/WebCore/dom/NodeRareData.h</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-02-25 Zan Dobersek <zdobersek@igalia.com>
+
+ Move to using std::unique_ptr for Element, Node and related classes
+ https://bugs.webkit.org/show_bug.cgi?id=129058
+
+ Reviewed by Anders Carlsson.
+
+ Replace uses of OwnPtr and PassOwnPtr in Element, Node and the related
+ classes with std::unique_ptr and move semantics.
+
+ * dom/ContainerNode.h:
+ (WebCore::ChildNodesLazySnapshot::takeSnapshot):
+ (WebCore::ChildNodesLazySnapshot::hasSnapshot):
+ * dom/Element.cpp:
+ (WebCore::ensureAttrNodeListForElement):
+ (WebCore::Element::attributes):
+ * dom/ElementIteratorAssertions.h:
+ (WebCore::ElementIteratorAssertions::ElementIteratorAssertions):
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::setAttributeMap):
+ * dom/MutationObserverRegistration.cpp:
+ (WebCore::MutationObserverRegistration::observedSubtreeNodeWillDetach):
+ (WebCore::MutationObserverRegistration::clearTransientRegistrations):
+ (WebCore::MutationObserverRegistration::addRegistrationNodesToSet):
+ * dom/MutationObserverRegistration.h:
+ * dom/NamedNodeMap.h:
+ (WebCore::NamedNodeMap::NamedNodeMap):
+ * dom/Node.cpp:
+ (WebCore::Node::ensureRareData):
+ (WebCore::Node::didMoveToNewDocument):
+ (WebCore::Node::ensureEventTargetData):
+ (WebCore::Node::mutationObserverRegistry):
+ (WebCore::Node::registerMutationObserver):
+ (WebCore::Node::unregisterMutationObserver):
+ (WebCore::Node::notifyMutationObserversNodeWillDetach):
+ * dom/Node.h:
+ * dom/NodeRareData.h:
+ (WebCore::NodeListsNodeData::NodeListsNodeData):
+ (WebCore::NodeRareData::NodeRareData):
+ (WebCore::NodeRareData::clearNodeLists):
+ (WebCore::NodeRareData::ensureNodeLists):
+ (WebCore::NodeRareData::ensureMutationObserverData):
+ * dom/StyledElement.cpp:
+ (WebCore::StyledElement::rebuildPresentationAttributeStyle):
+
</ins><span class="cx"> 2014-02-25 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Prune dead code for Web Inspector memory instrumentation.
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><span class="cx"> #include "Node.h"
</span><del>-
-#include <wtf/OwnPtr.h>
</del><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">@@ -288,7 +287,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (hasSnapshot())
</span><span class="cx"> return;
</span><del>- m_childNodes = adoptPtr(new Vector<RefPtr<Node>>());
</del><ins>+ m_childNodes = std::make_unique<Vector<RefPtr<Node>>>();
</ins><span class="cx"> Node* node = m_currentNode.get();
</span><span class="cx"> while (node) {
</span><span class="cx"> m_childNodes->append(node);
</span><span class="lines">@@ -297,7 +296,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ChildNodesLazySnapshot* nextSnapshot() { return m_nextSnapshot; }
</span><del>- bool hasSnapshot() { return !!m_childNodes.get(); }
</del><ins>+ bool hasSnapshot() { return !!m_childNodes; }
</ins><span class="cx">
</span><span class="cx"> static void takeChildNodesLazySnapshot()
</span><span class="cx"> {
</span><span class="lines">@@ -313,7 +312,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Node> m_currentNode;
</span><span class="cx"> unsigned m_currentIndex;
</span><del>- OwnPtr<Vector<RefPtr<Node>>> m_childNodes; // Lazily instantiated.
</del><ins>+ std::unique_ptr<Vector<RefPtr<Node>>> m_childNodes; // Lazily instantiated.
</ins><span class="cx"> ChildNodesLazySnapshot* m_nextSnapshot;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> #include "XMLNSNames.h"
</span><span class="cx"> #include "XMLNames.h"
</span><span class="cx"> #include "htmlediting.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/BitVector.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<Attr>> AttrNodeList;
</span><del>-typedef HashMap<Element*, OwnPtr<AttrNodeList>> AttrNodeListMap;
</del><ins>+typedef HashMap<Element*, std::unique_ptr<AttrNodeList>> AttrNodeListMap;
</ins><span class="cx">
</span><span class="cx"> static AttrNodeListMap& attrNodeListMap()
</span><span class="cx"> {
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx"> }
</span><span class="cx"> ASSERT(!attrNodeListMap().contains(element));
</span><span class="cx"> element->setHasSyntheticAttrChildNodes(true);
</span><del>- AttrNodeListMap::AddResult result = attrNodeListMap().add(element, adoptPtr(new AttrNodeList));
</del><ins>+ AttrNodeListMap::AddResult result = attrNodeListMap().add(element, std::make_unique<AttrNodeList>());
</ins><span class="cx"> return *result.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,7 +352,7 @@
</span><span class="cx"> if (NamedNodeMap* attributeMap = rareData.attributeMap())
</span><span class="cx"> return attributeMap;
</span><span class="cx">
</span><del>- rareData.setAttributeMap(NamedNodeMap::create(const_cast<Element&>(*this)));
</del><ins>+ rareData.setAttributeMap(std::make_unique<NamedNodeMap>(const_cast<Element&>(*this)));
</ins><span class="cx"> return rareData.attributeMap();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementIteratorAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementIteratorAssertions.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementIteratorAssertions.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/ElementIteratorAssertions.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Element.h"
</span><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> private:
</span><span class="cx"> const Document* m_document;
</span><span class="cx"> uint64_t m_initialDOMTreeVersion;
</span><del>- OwnPtr<NoEventDispatchAssertion> m_noEventDispatchAssertion;
</del><ins>+ std::unique_ptr<NoEventDispatchAssertion> m_noEventDispatchAssertion;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline ElementIteratorAssertions::ElementIteratorAssertions()
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> inline ElementIteratorAssertions::ElementIteratorAssertions(const Element* first)
</span><span class="cx"> : m_document(first ? &first->document() : nullptr)
</span><span class="cx"> , m_initialDOMTreeVersion(m_document ? m_document->domTreeVersion() : 0)
</span><del>- , m_noEventDispatchAssertion(m_document ? adoptPtr(new NoEventDispatchAssertion) : nullptr)
</del><ins>+ , m_noEventDispatchAssertion(m_document ? std::make_unique<NoEventDispatchAssertion>() : nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementRareData.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -30,14 +30,13 @@
</span><span class="cx"> #include "RenderElement.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ElementRareData : public NodeRareData {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ElementRareData> create(RenderElement* renderer) { return adoptPtr(new ElementRareData(renderer)); }
-
</del><ins>+ explicit ElementRareData(RenderElement*);
</ins><span class="cx"> ~ElementRareData();
</span><span class="cx">
</span><span class="cx"> void setBeforePseudoElement(PassRefPtr<PseudoElement>);
</span><span class="lines">@@ -93,7 +92,7 @@
</span><span class="cx"> void setShadowRoot(PassRefPtr<ShadowRoot> shadowRoot) { m_shadowRoot = shadowRoot; }
</span><span class="cx">
</span><span class="cx"> NamedNodeMap* attributeMap() const { return m_attributeMap.get(); }
</span><del>- void setAttributeMap(PassOwnPtr<NamedNodeMap> attributeMap) { m_attributeMap = attributeMap; }
</del><ins>+ void setAttributeMap(std::unique_ptr<NamedNodeMap> attributeMap) { m_attributeMap = std::move(attributeMap); }
</ins><span class="cx">
</span><span class="cx"> RenderStyle* computedStyle() const { return m_computedStyle.get(); }
</span><span class="cx"> void setComputedStyle(PassRef<RenderStyle> computedStyle) { m_computedStyle = std::move(computedStyle); }
</span><span class="lines">@@ -150,12 +149,11 @@
</span><span class="cx"> std::unique_ptr<DatasetDOMStringMap> m_dataset;
</span><span class="cx"> std::unique_ptr<ClassList> m_classList;
</span><span class="cx"> RefPtr<ShadowRoot> m_shadowRoot;
</span><del>- OwnPtr<NamedNodeMap> m_attributeMap;
</del><ins>+ std::unique_ptr<NamedNodeMap> m_attributeMap;
</ins><span class="cx">
</span><span class="cx"> RefPtr<PseudoElement> m_beforePseudoElement;
</span><span class="cx"> RefPtr<PseudoElement> m_afterPseudoElement;
</span><span class="cx">
</span><del>- explicit ElementRareData(RenderElement*);
</del><span class="cx"> void releasePseudoElement(PseudoElement*);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverRegistrationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverRegistration.cpp (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -36,11 +36,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<MutationObserverRegistration> MutationObserverRegistration::create(PassRefPtr<MutationObserver> observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
-{
- return adoptPtr(new MutationObserverRegistration(observer, registrationNode, options, attributeFilter));
-}
-
</del><span class="cx"> MutationObserverRegistration::MutationObserverRegistration(PassRefPtr<MutationObserver> observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
</span><span class="cx"> : m_observer(observer)
</span><span class="cx"> , m_registrationNode(registrationNode)
</span><span class="lines">@@ -72,7 +67,7 @@
</span><span class="cx"> m_observer->setHasTransientRegistration();
</span><span class="cx">
</span><span class="cx"> if (!m_transientRegistrationNodes) {
</span><del>- m_transientRegistrationNodes = adoptPtr(new NodeHashSet);
</del><ins>+ m_transientRegistrationNodes = std::make_unique<NodeHashSet>();
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_registrationNodeKeepAlive);
</span><span class="cx"> m_registrationNodeKeepAlive = m_registrationNode; // Balanced in clearTransientRegistrations.
</span><span class="lines">@@ -87,10 +82,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (NodeHashSet::iterator iter = m_transientRegistrationNodes->begin(); iter != m_transientRegistrationNodes->end(); ++iter)
- (*iter)->unregisterTransientMutationObserver(this);
</del><ins>+ for (auto& iter : *m_transientRegistrationNodes)
+ iter->unregisterTransientMutationObserver(this);
</ins><span class="cx">
</span><del>- m_transientRegistrationNodes.clear();
</del><ins>+ m_transientRegistrationNodes = nullptr;
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_registrationNodeKeepAlive);
</span><span class="cx"> m_registrationNodeKeepAlive = 0; // Balanced in observeSubtreeNodeWillDetach.
</span><span class="lines">@@ -126,8 +121,8 @@
</span><span class="cx"> nodes.add(m_registrationNode);
</span><span class="cx"> if (!m_transientRegistrationNodes)
</span><span class="cx"> return;
</span><del>- for (NodeHashSet::const_iterator iter = m_transientRegistrationNodes->begin(); iter != m_transientRegistrationNodes->end(); ++iter)
- nodes.add(iter->get());
</del><ins>+ for (auto& iter : *m_transientRegistrationNodes)
+ nodes.add(iter.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverRegistrationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverRegistration.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverRegistration.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #define MutationObserverRegistration_h
</span><span class="cx">
</span><span class="cx"> #include "MutationObserver.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> class MutationObserverRegistration {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<MutationObserverRegistration> create(PassRefPtr<MutationObserver>, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
</del><ins>+ MutationObserverRegistration(PassRefPtr<MutationObserver>, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
</ins><span class="cx"> ~MutationObserverRegistration();
</span><span class="cx">
</span><span class="cx"> void resetObservation(MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
</span><span class="lines">@@ -61,13 +62,11 @@
</span><span class="cx"> void addRegistrationNodesToSet(HashSet<Node*>&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- MutationObserverRegistration(PassRefPtr<MutationObserver>, Node*, MutationObserverOptions, const HashSet<AtomicString>& attributeFilter);
-
</del><span class="cx"> RefPtr<MutationObserver> m_observer;
</span><span class="cx"> Node* m_registrationNode;
</span><span class="cx"> RefPtr<Node> m_registrationNodeKeepAlive;
</span><span class="cx"> typedef HashSet<RefPtr<Node>> NodeHashSet;
</span><del>- OwnPtr<NodeHashSet> m_transientRegistrationNodes;
</del><ins>+ std::unique_ptr<NodeHashSet> m_transientRegistrationNodes;
</ins><span class="cx">
</span><span class="cx"> MutationObserverOptions m_options;
</span><span class="cx"> HashSet<AtomicString> m_attributeFilter;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNamedNodeMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NamedNodeMap.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NamedNodeMap.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/NamedNodeMap.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #define NamedNodeMap_h
</span><span class="cx">
</span><span class="cx"> #include "ScriptWrappable.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><span class="lines">@@ -41,9 +40,10 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> friend class Element;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<NamedNodeMap> create(Element& element)
</del><ins>+ explicit NamedNodeMap(Element& element)
+ : m_element(element)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new NamedNodeMap(element));
</del><ins>+ // Only supports NamedNodeMaps with Element associated, DocumentType.entities and DocumentType.notations are not supported yet.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ref();
</span><span class="lines">@@ -67,12 +67,6 @@
</span><span class="cx"> Element* element() const { return &m_element; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit NamedNodeMap(Element& element)
- : m_element(element)
- {
- // Only supports NamedNodeMaps with Element associated, DocumentType.entities and DocumentType.notations are not supported yet.
- }
-
</del><span class="cx"> Element& m_element;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -339,9 +339,9 @@
</span><span class="cx">
</span><span class="cx"> NodeRareData* data;
</span><span class="cx"> if (isElementNode())
</span><del>- data = ElementRareData::create(toRenderElement(m_data.m_renderer)).leakPtr();
</del><ins>+ data = new ElementRareData(toRenderElement(m_data.m_renderer));
</ins><span class="cx"> else
</span><del>- data = NodeRareData::create(m_data.m_renderer).leakPtr();
</del><ins>+ data = new NodeRareData(m_data.m_renderer);
</ins><span class="cx"> ASSERT(data);
</span><span class="cx">
</span><span class="cx"> m_data.m_rareData = data;
</span><span class="lines">@@ -1766,7 +1766,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Vector<OwnPtr<MutationObserverRegistration>>* registry = mutationObserverRegistry()) {
</del><ins>+ if (Vector<std::unique_ptr<MutationObserverRegistration>>* registry = mutationObserverRegistry()) {
</ins><span class="cx"> for (size_t i = 0; i < registry->size(); ++i) {
</span><span class="cx"> document().addMutationObserverTypes(registry->at(i)->mutationTypes());
</span><span class="cx"> }
</span><span class="lines">@@ -1863,7 +1863,7 @@
</span><span class="cx"> return tryRemoveEventListener(this, eventType, listener, useCapture);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef HashMap<Node*, OwnPtr<EventTargetData>> EventTargetDataMap;
</del><ins>+typedef HashMap<Node*, std::unique_ptr<EventTargetData>> EventTargetDataMap;
</ins><span class="cx">
</span><span class="cx"> static EventTargetDataMap& eventTargetDataMap()
</span><span class="cx"> {
</span><span class="lines">@@ -1882,7 +1882,7 @@
</span><span class="cx"> return *eventTargetDataMap().get(this);
</span><span class="cx"> setHasEventTargetData(true);
</span><span class="cx"> EventTargetData* data = new EventTargetData;
</span><del>- eventTargetDataMap().set(this, adoptPtr(data));
</del><ins>+ eventTargetDataMap().set(this, std::unique_ptr<EventTargetData>(data));
</ins><span class="cx"> return *data;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1891,7 +1891,7 @@
</span><span class="cx"> eventTargetDataMap().remove(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<OwnPtr<MutationObserverRegistration>>* Node::mutationObserverRegistry()
</del><ins>+Vector<std::unique_ptr<MutationObserverRegistration>>* Node::mutationObserverRegistry()
</ins><span class="cx"> {
</span><span class="cx"> if (!hasRareData())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1941,7 +1941,7 @@
</span><span class="cx"> void Node::registerMutationObserver(MutationObserver* observer, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
</span><span class="cx"> {
</span><span class="cx"> MutationObserverRegistration* registration = 0;
</span><del>- Vector<OwnPtr<MutationObserverRegistration>>& registry = ensureRareData().ensureMutationObserverData().registry;
</del><ins>+ Vector<std::unique_ptr<MutationObserverRegistration>>& registry = ensureRareData().ensureMutationObserverData().registry;
</ins><span class="cx"> for (size_t i = 0; i < registry.size(); ++i) {
</span><span class="cx"> if (registry[i]->observer() == observer) {
</span><span class="cx"> registration = registry[i].get();
</span><span class="lines">@@ -1950,7 +1950,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!registration) {
</span><del>- registry.append(MutationObserverRegistration::create(observer, this, options, attributeFilter));
</del><ins>+ registry.append(std::make_unique<MutationObserverRegistration>(observer, this, options, attributeFilter));
</ins><span class="cx"> registration = registry.last().get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1959,17 +1959,22 @@
</span><span class="cx">
</span><span class="cx"> void Node::unregisterMutationObserver(MutationObserverRegistration* registration)
</span><span class="cx"> {
</span><del>- Vector<OwnPtr<MutationObserverRegistration>>* registry = mutationObserverRegistry();
</del><ins>+ Vector<std::unique_ptr<MutationObserverRegistration>>* registry = mutationObserverRegistry();
</ins><span class="cx"> ASSERT(registry);
</span><span class="cx"> if (!registry)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- size_t index = registry->find(registration);
- ASSERT(index != notFound);
- if (index == notFound)
- return;
</del><ins>+ size_t index = 0;
+ for (const auto& storedRegistration : *registry) {
+ if (storedRegistration.get() == registration) {
+ registry->remove(index);
+ return;
+ }
</ins><span class="cx">
</span><del>- registry->remove(index);
</del><ins>+ index++;
+ }
+
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::registerTransientMutationObserver(MutationObserverRegistration* registration)
</span><span class="lines">@@ -1994,7 +1999,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (Node* node = parentNode(); node; node = node->parentNode()) {
</span><del>- if (Vector<OwnPtr<MutationObserverRegistration>>* registry = node->mutationObserverRegistry()) {
</del><ins>+ if (Vector<std::unique_ptr<MutationObserverRegistration>>* registry = node->mutationObserverRegistry()) {
</ins><span class="cx"> const size_t size = registry->size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><span class="cx"> registry->at(i)->observedSubtreeNodeWillDetach(this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/Node.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "SimulatedClickOptions.h"
</span><span class="cx"> #include "TreeScope.h"
</span><span class="cx"> #include "TreeShared.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="lines">@@ -674,7 +675,7 @@
</span><span class="cx">
</span><span class="cx"> void trackForDebugging();
</span><span class="cx">
</span><del>- Vector<OwnPtr<MutationObserverRegistration>>* mutationObserverRegistry();
</del><ins>+ Vector<std::unique_ptr<MutationObserverRegistration>>* mutationObserverRegistry();
</ins><span class="cx"> HashSet<MutationObserverRegistration*>* transientMutationObserverRegistry();
</span><span class="cx">
</span><span class="cx"> mutable uint32_t m_nodeFlags;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRareData.h (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -36,9 +36,8 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #endif
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="lines">@@ -51,6 +50,11 @@
</span><span class="cx"> class NodeListsNodeData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NodeListsNodeData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+ NodeListsNodeData()
+ : m_childNodeList(nullptr)
+ , m_emptyChildNodeList(nullptr)
+ { }
+
</ins><span class="cx"> void clearChildNodeListCache()
</span><span class="cx"> {
</span><span class="cx"> if (m_childNodeList)
</span><span class="lines">@@ -207,11 +211,6 @@
</span><span class="cx"> m_cachedCollections.remove(namedCollectionKey(collection->type(), name));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<NodeListsNodeData> create()
- {
- return adoptPtr(new NodeListsNodeData);
- }
-
</del><span class="cx"> void invalidateCaches(const QualifiedName* attrName = 0);
</span><span class="cx"> bool isEmpty() const
</span><span class="cx"> {
</span><span class="lines">@@ -256,11 +255,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- NodeListsNodeData()
- : m_childNodeList(nullptr)
- , m_emptyChildNodeList(nullptr)
- { }
-
</del><span class="cx"> std::pair<unsigned char, AtomicString> namedCollectionKey(CollectionType type, const AtomicString& name)
</span><span class="cx"> {
</span><span class="cx"> return std::pair<unsigned char, AtomicString>(type, name);
</span><span class="lines">@@ -286,26 +280,26 @@
</span><span class="cx"> class NodeMutationObserverData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NodeMutationObserverData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- Vector<OwnPtr<MutationObserverRegistration>> registry;
</del><ins>+ NodeMutationObserverData() = default;
+ Vector<std::unique_ptr<MutationObserverRegistration>> registry;
</ins><span class="cx"> HashSet<MutationObserverRegistration*> transientRegistry;
</span><del>-
- static PassOwnPtr<NodeMutationObserverData> create() { return adoptPtr(new NodeMutationObserverData); }
-
-private:
- NodeMutationObserverData() { }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class NodeRareData : public NodeRareDataBase {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NodeRareData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<NodeRareData> create(RenderObject* renderer) { return adoptPtr(new NodeRareData(renderer)); }
</del><ins>+ NodeRareData(RenderObject* renderer)
+ : NodeRareDataBase(renderer)
+ , m_connectedFrameCount(0)
+ { }
</ins><span class="cx">
</span><del>- void clearNodeLists() { m_nodeLists.clear(); }
</del><ins>+
+ void clearNodeLists() { m_nodeLists = nullptr; }
</ins><span class="cx"> NodeListsNodeData* nodeLists() const { return m_nodeLists.get(); }
</span><span class="cx"> NodeListsNodeData& ensureNodeLists()
</span><span class="cx"> {
</span><span class="cx"> if (!m_nodeLists)
</span><del>- m_nodeLists = NodeListsNodeData::create();
</del><ins>+ m_nodeLists = std::make_unique<NodeListsNodeData>();
</ins><span class="cx"> return *m_nodeLists;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,7 +307,7 @@
</span><span class="cx"> NodeMutationObserverData& ensureMutationObserverData()
</span><span class="cx"> {
</span><span class="cx"> if (!m_mutationObserverData)
</span><del>- m_mutationObserverData = NodeMutationObserverData::create();
</del><ins>+ m_mutationObserverData = std::make_unique<NodeMutationObserverData>();
</ins><span class="cx"> return *m_mutationObserverData;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -329,17 +323,11 @@
</span><span class="cx"> m_connectedFrameCount -= amount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-protected:
- NodeRareData(RenderObject* renderer)
- : NodeRareDataBase(renderer)
- , m_connectedFrameCount(0)
- { }
-
</del><span class="cx"> private:
</span><span class="cx"> unsigned m_connectedFrameCount : 10; // Must fit Page::maxNumberOfFrames.
</span><span class="cx">
</span><del>- OwnPtr<NodeListsNodeData> m_nodeLists;
- OwnPtr<NodeMutationObserverData> m_mutationObserverData;
</del><ins>+ std::unique_ptr<NodeListsNodeData> m_nodeLists;
+ std::unique_ptr<NodeMutationObserverData> m_mutationObserverData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool NodeListsNodeData::deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node& ownerNode)
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (164637 => 164638)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp 2014-02-25 08:19:25 UTC (rev 164637)
+++ trunk/Source/WebCore/dom/StyledElement.cpp 2014-02-25 08:47:50 UTC (rev 164638)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> RefPtr<StyleProperties> value;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef HashMap<unsigned, OwnPtr<PresentationAttributeCacheEntry>, AlreadyHashed> PresentationAttributeCache;
</del><ins>+typedef HashMap<unsigned, std::unique_ptr<PresentationAttributeCacheEntry>, AlreadyHashed> PresentationAttributeCache;
</ins><span class="cx">
</span><span class="cx"> static bool operator!=(const PresentationAttributeCacheKey& a, const PresentationAttributeCacheKey& b)
</span><span class="cx"> {
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> if (!cacheHash || cacheIterator->value)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- OwnPtr<PresentationAttributeCacheEntry> newEntry = adoptPtr(new PresentationAttributeCacheEntry);
</del><ins>+ auto newEntry = std::make_unique<PresentationAttributeCacheEntry>();
</ins><span class="cx"> newEntry->key = cacheKey;
</span><span class="cx"> newEntry->value = style.release();
</span><span class="cx">
</span><span class="lines">@@ -354,9 +354,9 @@
</span><span class="cx"> if (presentationAttributeCache().size() > presentationAttributeCacheMaximumSize) {
</span><span class="cx"> // Start building from scratch if the cache ever gets big.
</span><span class="cx"> presentationAttributeCache().clear();
</span><del>- presentationAttributeCache().set(cacheHash, newEntry.release());
</del><ins>+ presentationAttributeCache().set(cacheHash, std::move(newEntry));
</ins><span class="cx"> } else
</span><del>- cacheIterator->value = newEntry.release();
</del><ins>+ cacheIterator->value = std::move(newEntry);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, CSSValueID identifier)
</span></span></pre>
</div>
</div>
</body>
</html>