<!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>[173234] 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/173234">173234</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-09-03 15:02:08 -0700 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of some uses of OwnPtr
https://bugs.webkit.org/show_bug.cgi?id=136503
Reviewed by Sam Weinig.
* dom/ElementRareData.cpp:
* dom/ElementRareData.h:
(WebCore::ElementRareData::create): Deleted.
* dom/MutationObserverRegistration.cpp:
(WebCore::MutationObserverRegistration::create): Deleted.
* dom/MutationObserverRegistration.h:
* dom/Node.cpp:
(WebCore::Node::materializeRareData):
(WebCore::Node::didMoveToNewDocument):
(WebCore::eventTargetDataMap):
(WebCore::Node::eventTargetData):
(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):
(WebCore::NodeListsNodeData::create): Deleted.
(WebCore::NodeMutationObserverData::create): Deleted.
(WebCore::NodeRareData::create): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementRareDatacpp">trunk/Source/WebCore/dom/ElementRareData.cpp</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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-09-03 Anders Carlsson <andersca@apple.com>
+
+ Get rid of some uses of OwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=136503
+
+ Reviewed by Sam Weinig.
+
+ * dom/ElementRareData.cpp:
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::create): Deleted.
+ * dom/MutationObserverRegistration.cpp:
+ (WebCore::MutationObserverRegistration::create): Deleted.
+ * dom/MutationObserverRegistration.h:
+ * dom/Node.cpp:
+ (WebCore::Node::materializeRareData):
+ (WebCore::Node::didMoveToNewDocument):
+ (WebCore::eventTargetDataMap):
+ (WebCore::Node::eventTargetData):
+ (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):
+ (WebCore::NodeListsNodeData::create): Deleted.
+ (WebCore::NodeMutationObserverData::create): Deleted.
+ (WebCore::NodeRareData::create): Deleted.
+
</ins><span class="cx"> 2014-09-02 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up naming for and slightly refactor legacy video fullscreen support
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.cpp (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementRareData.cpp 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/ElementRareData.cpp 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -42,6 +42,6 @@
</span><span class="cx"> void* pointers[7];
</span><span class="cx"> };
</span><span class="cx">
</span><del>-COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall);
</del><ins>+static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.h (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementRareData.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -36,8 +36,7 @@
</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">@@ -146,7 +145,6 @@
</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 (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.cpp 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -37,11 +37,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></pre></div>
<a id="trunkSourceWebCoredomMutationObserverRegistrationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverRegistration.h (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverRegistration.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/MutationObserverRegistration.h 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -42,7 +42,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,8 +61,6 @@
</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></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -329,9 +329,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 = std::make_unique<ElementRareData>(toRenderElement(m_data.m_renderer)).release();
</ins><span class="cx"> else
</span><del>- data = NodeRareData::create(m_data.m_renderer).leakPtr();
</del><ins>+ data = std::make_unique<NodeRareData>(m_data.m_renderer).release();
</ins><span class="cx"> ASSERT(data);
</span><span class="cx">
</span><span class="cx"> m_data.m_rareData = data;
</span><span class="lines">@@ -1755,16 +1755,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Vector<OwnPtr<MutationObserverRegistration>>* registry = mutationObserverRegistry()) {
- for (size_t i = 0; i < registry->size(); ++i) {
- document().addMutationObserverTypes(registry->at(i)->mutationTypes());
- }
</del><ins>+ if (Vector<std::unique_ptr<MutationObserverRegistration>>* registry = mutationObserverRegistry()) {
+ for (const auto& registration : *registry)
+ document().addMutationObserverTypes(registration->mutationTypes());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (HashSet<MutationObserverRegistration*>* transientRegistry = transientMutationObserverRegistry()) {
</span><del>- for (HashSet<MutationObserverRegistration*>::iterator iter = transientRegistry->begin(); iter != transientRegistry->end(); ++iter) {
- document().addMutationObserverTypes((*iter)->mutationTypes());
- }
</del><ins>+ for (const auto& registration : *transientRegistry)
+ document().addMutationObserverTypes(registration->mutationTypes());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1852,27 +1850,27 @@
</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><del>- DEPRECATED_DEFINE_STATIC_LOCAL(EventTargetDataMap, map, ());
</del><ins>+ static NeverDestroyed<EventTargetDataMap> map;
+
</ins><span class="cx"> return map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventTargetData* Node::eventTargetData()
</span><span class="cx"> {
</span><del>- return hasEventTargetData() ? eventTargetDataMap().get(this) : 0;
</del><ins>+ return hasEventTargetData() ? eventTargetDataMap().get(this) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventTargetData& Node::ensureEventTargetData()
</span><span class="cx"> {
</span><span class="cx"> if (hasEventTargetData())
</span><span class="cx"> return *eventTargetDataMap().get(this);
</span><ins>+
</ins><span class="cx"> setHasEventTargetData(true);
</span><del>- EventTargetData* data = new EventTargetData;
- eventTargetDataMap().set(this, adoptPtr(data));
- return *data;
</del><ins>+ return *eventTargetDataMap().set(this, std::make_unique<EventTargetData>()).iterator->value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::clearEventTargetData()
</span><span class="lines">@@ -1880,7 +1878,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">@@ -1929,8 +1927,9 @@
</span><span class="cx">
</span><span class="cx"> void Node::registerMutationObserver(MutationObserver* observer, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
</span><span class="cx"> {
</span><del>- MutationObserverRegistration* registration = 0;
- Vector<OwnPtr<MutationObserverRegistration>>& registry = ensureRareData().ensureMutationObserverData().registry;
</del><ins>+ MutationObserverRegistration* registration = nullptr;
+ auto& 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">@@ -1939,7 +1938,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">@@ -1948,17 +1947,17 @@
</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>+ auto* 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;
-
- registry->remove(index);
</del><ins>+ for (size_t i = 0; i < registry->size(); ++i) {
+ if (registry->at(i).get() == registration) {
+ registry->remove(i);
+ return;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::registerTransientMutationObserver(MutationObserverRegistration* registration)
</span><span class="lines">@@ -1983,7 +1982,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 (auto* 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 (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/Node.h 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> void trackForDebugging();
</span><span class="cx"> void materializeRareData();
</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 (173233 => 173234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h 2014-09-03 21:52:06 UTC (rev 173233)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-09-03 22:02:08 UTC (rev 173234)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> #include "QualifiedName.h"
</span><span class="cx"> #include "TagNodeList.h"
</span><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">@@ -60,6 +58,12 @@
</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">@@ -218,11 +222,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">@@ -258,12 +257,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">@@ -290,26 +283,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>+ Vector<std::unique_ptr<MutationObserverRegistration>> registry;
</ins><span class="cx"> HashSet<MutationObserverRegistration*> transientRegistry;
</span><span class="cx">
</span><del>- static PassOwnPtr<NodeMutationObserverData> create() { return adoptPtr(new NodeMutationObserverData); }
-
-private:
</del><span class="cx"> NodeMutationObserverData() { }
</span><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">@@ -317,7 +310,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">@@ -333,17 +326,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 class="lines">@@ -370,7 +357,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
</span><del>-COMPILE_ASSERT(Page::maxNumberOfFrames < 1024, Frame_limit_should_fit_in_rare_data_count);
</del><ins>+static_assert(Page::maxNumberOfFrames < 1024, "Frame limit should fit in rare data count");
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>