<!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>[163746] 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/163746">163746</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-09 00:33:19 -0800 (Sun, 09 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Manage MutationObserverInterestGroup through std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=128468
Reviewed by Andreas Kling.
Use std::unique_ptr instead of OwnPtr for managing MutationObserverInterestGroup objects.
* css/PropertySetCSSStyleDeclaration.cpp:
* dom/CharacterData.cpp:
(WebCore::CharacterData::dispatchModifiedEvent):
* dom/ChildListMutationScope.cpp:
(WebCore::ChildListMutationAccumulator::ChildListMutationAccumulator):
* dom/ChildListMutationScope.h:
(WebCore::ChildListMutationAccumulator::hasObservers):
* dom/Element.cpp:
(WebCore::Element::willModifyAttribute):
* dom/MutationObserverInterestGroup.cpp:
(WebCore::MutationObserverInterestGroup::createIfNeeded):
* dom/MutationObserverInterestGroup.h:
(WebCore::MutationObserverInterestGroup::createForChildListMutation):
(WebCore::MutationObserverInterestGroup::createForCharacterDataMutation):
(WebCore::MutationObserverInterestGroup::createForAttributesMutation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCharacterDatacpp">trunk/Source/WebCore/dom/CharacterData.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildListMutationScopecpp">trunk/Source/WebCore/dom/ChildListMutationScope.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildListMutationScopeh">trunk/Source/WebCore/dom/ChildListMutationScope.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverInterestGroupcpp">trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMutationObserverInterestGrouph">trunk/Source/WebCore/dom/MutationObserverInterestGroup.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/ChangeLog 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-02-09 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Manage MutationObserverInterestGroup through std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=128468
+
+ Reviewed by Andreas Kling.
+
+ Use std::unique_ptr instead of OwnPtr for managing MutationObserverInterestGroup objects.
+
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ * dom/CharacterData.cpp:
+ (WebCore::CharacterData::dispatchModifiedEvent):
+ * dom/ChildListMutationScope.cpp:
+ (WebCore::ChildListMutationAccumulator::ChildListMutationAccumulator):
+ * dom/ChildListMutationScope.h:
+ (WebCore::ChildListMutationAccumulator::hasObservers):
+ * dom/Element.cpp:
+ (WebCore::Element::willModifyAttribute):
+ * dom/MutationObserverInterestGroup.cpp:
+ (WebCore::MutationObserverInterestGroup::createIfNeeded):
+ * dom/MutationObserverInterestGroup.h:
+ (WebCore::MutationObserverInterestGroup::createForChildListMutation):
+ (WebCore::MutationObserverInterestGroup::createForCharacterDataMutation):
+ (WebCore::MutationObserverInterestGroup::createForAttributesMutation):
+
+2014-02-09 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Manage MessagePort, MessagePortChannel and friends through std::unique_ptr
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128467
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> static bool s_shouldNotifyInspector;
</span><span class="cx"> static bool s_shouldDeliver;
</span><span class="cx">
</span><del>- OwnPtr<MutationObserverInterestGroup> m_mutationRecipients;
</del><ins>+ std::unique_ptr<MutationObserverInterestGroup> m_mutationRecipients;
</ins><span class="cx"> RefPtr<MutationRecord> m_mutation;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomCharacterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CharacterData.cpp (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CharacterData.cpp 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/dom/CharacterData.cpp 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> void CharacterData::dispatchModifiedEvent(const String& oldData)
</span><span class="cx"> {
</span><del>- if (OwnPtr<MutationObserverInterestGroup> mutationRecipients = MutationObserverInterestGroup::createForCharacterDataMutation(*this))
</del><ins>+ if (std::unique_ptr<MutationObserverInterestGroup> mutationRecipients = MutationObserverInterestGroup::createForCharacterDataMutation(*this))
</ins><span class="cx"> mutationRecipients->enqueueMutationRecord(MutationRecord::createCharacterData(*this, oldData));
</span><span class="cx">
</span><span class="cx"> if (!isInShadowTree()) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildListMutationScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildListMutationScope.cpp (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildListMutationScope.cpp 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/dom/ChildListMutationScope.cpp 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx"> return map;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ChildListMutationAccumulator::ChildListMutationAccumulator(ContainerNode& target, PassOwnPtr<MutationObserverInterestGroup> observers)
</del><ins>+ChildListMutationAccumulator::ChildListMutationAccumulator(ContainerNode& target, std::unique_ptr<MutationObserverInterestGroup> observers)
</ins><span class="cx"> : m_target(target)
</span><del>- , m_lastAdded(0)
- , m_observers(observers)
</del><ins>+ , m_lastAdded(nullptr)
+ , m_observers(std::move(observers))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildListMutationScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildListMutationScope.h (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildListMutationScope.h 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/dom/ChildListMutationScope.h 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "MutationObserver.h"
</span><span class="cx"> #include "Node.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> void childAdded(Node&);
</span><span class="cx"> void willRemoveChild(Node&);
</span><span class="cx">
</span><del>- bool hasObservers() const { return m_observers; }
</del><ins>+ bool hasObservers() const { return !!m_observers; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- ChildListMutationAccumulator(ContainerNode&, PassOwnPtr<MutationObserverInterestGroup>);
</del><ins>+ ChildListMutationAccumulator(ContainerNode&, std::unique_ptr<MutationObserverInterestGroup>);
</ins><span class="cx">
</span><span class="cx"> void enqueueMutationRecord();
</span><span class="cx"> bool isEmpty();
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> RefPtr<Node> m_nextSibling;
</span><span class="cx"> Node* m_lastAdded;
</span><span class="cx">
</span><del>- OwnPtr<MutationObserverInterestGroup> m_observers;
</del><ins>+ std::unique_ptr<MutationObserverInterestGroup> m_observers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ChildListMutationScope {
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -2794,7 +2794,7 @@
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (OwnPtr<MutationObserverInterestGroup> recipients = MutationObserverInterestGroup::createForAttributesMutation(*this, name))
</del><ins>+ if (std::unique_ptr<MutationObserverInterestGroup> recipients = MutationObserverInterestGroup::createForAttributesMutation(*this, name))
</ins><span class="cx"> recipients->enqueueMutationRecord(MutationRecord::createAttributes(*this, name, oldValue));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverInterestGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/dom/MutationObserverInterestGroup.cpp 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<MutationObserverInterestGroup> MutationObserverInterestGroup::createIfNeeded(Node& target, MutationObserver::MutationType type, MutationRecordDeliveryOptions oldValueFlag, const QualifiedName* attributeName)
</del><ins>+std::unique_ptr<MutationObserverInterestGroup> MutationObserverInterestGroup::createIfNeeded(Node& target, MutationObserver::MutationType type, MutationRecordDeliveryOptions oldValueFlag, const QualifiedName* attributeName)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT((type == MutationObserver::Attributes && attributeName) || !attributeName);
</span><span class="cx"> HashMap<MutationObserver*, MutationRecordDeliveryOptions> observers;
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> if (observers.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return adoptPtr(new MutationObserverInterestGroup(observers, oldValueFlag));
</del><ins>+ return std::make_unique<MutationObserverInterestGroup>(observers, oldValueFlag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MutationObserverInterestGroup::MutationObserverInterestGroup(HashMap<MutationObserver*, MutationRecordDeliveryOptions>& observers, MutationRecordDeliveryOptions oldValueFlag)
</span></span></pre></div>
<a id="trunkSourceWebCoredomMutationObserverInterestGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MutationObserverInterestGroup.h (163745 => 163746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MutationObserverInterestGroup.h 2014-02-09 08:19:36 UTC (rev 163745)
+++ trunk/Source/WebCore/dom/MutationObserverInterestGroup.h 2014-02-09 08:33:19 UTC (rev 163746)
</span><span class="lines">@@ -34,14 +34,16 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "MutationObserver.h"
</span><span class="cx"> #include "QualifiedName.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MutationObserverInterestGroup {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<MutationObserverInterestGroup> createForChildListMutation(Node& target)
</del><ins>+ MutationObserverInterestGroup(HashMap<MutationObserver*, MutationRecordDeliveryOptions>& observers, MutationRecordDeliveryOptions oldValueFlag);
+
+ static std::unique_ptr<MutationObserverInterestGroup> createForChildListMutation(Node& target)
</ins><span class="cx"> {
</span><span class="cx"> if (!target.document().hasMutationObserversOfType(MutationObserver::ChildList))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -50,7 +52,7 @@
</span><span class="cx"> return createIfNeeded(target, MutationObserver::ChildList, oldValueFlag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<MutationObserverInterestGroup> createForCharacterDataMutation(Node& target)
</del><ins>+ static std::unique_ptr<MutationObserverInterestGroup> createForCharacterDataMutation(Node& target)
</ins><span class="cx"> {
</span><span class="cx"> if (!target.document().hasMutationObserversOfType(MutationObserver::CharacterData))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -58,7 +60,7 @@
</span><span class="cx"> return createIfNeeded(target, MutationObserver::CharacterData, MutationObserver::CharacterDataOldValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassOwnPtr<MutationObserverInterestGroup> createForAttributesMutation(Node& target, const QualifiedName& attributeName)
</del><ins>+ static std::unique_ptr<MutationObserverInterestGroup> createForAttributesMutation(Node& target, const QualifiedName& attributeName)
</ins><span class="cx"> {
</span><span class="cx"> if (!target.document().hasMutationObserversOfType(MutationObserver::Attributes))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -70,8 +72,7 @@
</span><span class="cx"> void enqueueMutationRecord(PassRefPtr<MutationRecord>);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static PassOwnPtr<MutationObserverInterestGroup> createIfNeeded(Node& target, MutationObserver::MutationType, MutationRecordDeliveryOptions oldValueFlag, const QualifiedName* attributeName = 0);
- MutationObserverInterestGroup(HashMap<MutationObserver*, MutationRecordDeliveryOptions>& observers, MutationRecordDeliveryOptions oldValueFlag);
</del><ins>+ static std::unique_ptr<MutationObserverInterestGroup> createIfNeeded(Node& target, MutationObserver::MutationType, MutationRecordDeliveryOptions oldValueFlag, const QualifiedName* attributeName = nullptr);
</ins><span class="cx">
</span><span class="cx"> bool hasOldValue(MutationRecordDeliveryOptions options) { return options & m_oldValueFlag; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>