commit 2e0672111b4d69fb8363b258ff572ac39a3bdd98
author weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Sep 23 03:40:47 2013 +0000
committer weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Sep 23 03:40:47 2013 +0000
tree 651825a8a95bcae36d05189b2260ff1ae47995af
parent 2a9a19c8292ee71e2425367535c19020d2a88ec5

CTTE: Use references more in ContainerNode, ContainerNodeAlgorithms and related classes
https://bugs.webkit.org/show_bug.cgi?id=121772

Reviewed by Andreas Kling.

../WebCore: 

Use references for never null Nodes in ContainerNode and related classes.

../WebKit/qt: 

* Api/qwebelement.cpp:
(QWebElementCollection::append):
Update to work with the new StaticNodeList adopt function.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/dom/ChildListMutationScope.cpp

diff --git a/Source/WebCore/dom/ChildListMutationScope.cpp b/Source/WebCore/dom/ChildListMutationScope.cpp
index 391483e..004793f 100644
--- a/Source/WebCore/dom/ChildListMutationScope.cpp
+++ b/Source/WebCore/dom/ChildListMutationScope.cpp
@@ -44,14 +44,14 @@
 
 namespace WebCore {
 
-typedef HashMap<Node*, ChildListMutationAccumulator*> AccumulatorMap;
+typedef HashMap<ContainerNode*, ChildListMutationAccumulator*> AccumulatorMap;
 static AccumulatorMap& accumulatorMap()
 {
     DEFINE_STATIC_LOCAL(AccumulatorMap, map, ());
     return map;
 }
 
-ChildListMutationAccumulator::ChildListMutationAccumulator(PassRefPtr<Node> target, PassOwnPtr<MutationObserverInterestGroup> observers)
+ChildListMutationAccumulator::ChildListMutationAccumulator(ContainerNode& target, PassOwnPtr<MutationObserverInterestGroup> observers)
     : m_target(target)
     , m_lastAdded(0)
     , m_observers(observers)
@@ -62,12 +62,12 @@
 {
     if (!isEmpty())
         enqueueMutationRecord();
-    accumulatorMap().remove(m_target.get());
+    accumulatorMap().remove(&m_target.get());
 }
 
-PassRefPtr<ChildListMutationAccumulator> ChildListMutationAccumulator::getOrCreate(Node* target)
+PassRefPtr<ChildListMutationAccumulator> ChildListMutationAccumulator::getOrCreate(ContainerNode& target)
 {
-    AccumulatorMap::AddResult result = accumulatorMap().add(target, nullptr);
+    AccumulatorMap::AddResult result = accumulatorMap().add(&target, nullptr);
     RefPtr<ChildListMutationAccumulator> accumulator;
     if (!result.isNewEntry)
         accumulator = result.iterator->value;
@@ -78,16 +78,16 @@
     return accumulator.release();
 }
 
-inline bool ChildListMutationAccumulator::isAddedNodeInOrder(Node* child)
+inline bool ChildListMutationAccumulator::isAddedNodeInOrder(Node& child)
 {
-    return isEmpty() || (m_lastAdded == child->previousSibling() && m_nextSibling == child->nextSibling());
+    return isEmpty() || (m_lastAdded == child.previousSibling() && m_nextSibling == child.nextSibling());
 }
 
-void ChildListMutationAccumulator::childAdded(PassRefPtr<Node> prpChild)
+void ChildListMutationAccumulator::childAdded(Node& childRef)
 {
     ASSERT(hasObservers());
 
-    RefPtr<Node> child = prpChild;
+    Ref<Node> child(childRef);
 
     if (!isAddedNodeInOrder(child.get()))
         enqueueMutationRecord();
@@ -97,20 +97,20 @@
         m_nextSibling = child->nextSibling();
     }
 
-    m_lastAdded = child.get();
-    m_addedNodes.append(child.release());
+    m_lastAdded = &child.get();
+    m_addedNodes.append(child.get());
 }
 
-inline bool ChildListMutationAccumulator::isRemovedNodeInOrder(Node* child)
+inline bool ChildListMutationAccumulator::isRemovedNodeInOrder(Node& child)
 {
-    return isEmpty() || m_nextSibling == child;
+    return isEmpty() || m_nextSibling == &child;
 }
 
-void ChildListMutationAccumulator::willRemoveChild(PassRefPtr<Node> prpChild)
+void ChildListMutationAccumulator::willRemoveChild(Node& childRef)
 {
     ASSERT(hasObservers());
 
-    RefPtr<Node> child = prpChild;
+    Ref<Node> child(childRef);
 
     if (!m_addedNodes.isEmpty() || !isRemovedNodeInOrder(child.get()))
         enqueueMutationRecord();
@@ -122,7 +122,7 @@
     } else
         m_nextSibling = child->nextSibling();
 
-    m_removedNodes.append(child.release());
+    m_removedNodes.append(child.get());
 }
 
 void ChildListMutationAccumulator::enqueueMutationRecord()
@@ -132,7 +132,7 @@
 
     RefPtr<NodeList> addedNodes = StaticNodeList::adopt(m_addedNodes);
     RefPtr<NodeList> removedNodes = StaticNodeList::adopt(m_removedNodes);
-    RefPtr<MutationRecord> record = MutationRecord::createChildList(m_target, addedNodes.release(), removedNodes.release(), m_previousSibling.release(), m_nextSibling.release());
+    RefPtr<MutationRecord> record = MutationRecord::createChildList(m_target.get(), addedNodes.release(), removedNodes.release(), m_previousSibling.release(), m_nextSibling.release());
     m_observers->enqueueMutationRecord(record.release());
     m_lastAdded = 0;
     ASSERT(isEmpty());