Oilpan: move node/element rare data objects to the heap.

Source/core/dom/MutationObserverRegistration.cpp

Index: Source/core/dom/MutationObserverRegistration.cpp
diff --git a/Source/core/dom/MutationObserverRegistration.cpp b/Source/core/dom/MutationObserverRegistration.cpp
index 12816b0943bc7ef8a243660c0b9450f18fecb2a3..9a7c5e845b34e30f34ebef6a532b90d87618d9d8 100644
--- a/Source/core/dom/MutationObserverRegistration.cpp
+++ b/Source/core/dom/MutationObserverRegistration.cpp
@@ -37,12 +37,12 @@
 
 namespace WebCore {
 
-PassOwnPtrWillBeRawPtr<MutationObserverRegistration> MutationObserverRegistration::create(MutationObserver& observer, Node& registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
+PassOwnPtrWillBeRawPtr<MutationObserverRegistration> MutationObserverRegistration::create(MutationObserver& observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
 {
     return adoptPtrWillBeNoop(new MutationObserverRegistration(observer, registrationNode, options, attributeFilter));
 }
 
-MutationObserverRegistration::MutationObserverRegistration(MutationObserver& observer, Node& registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
+MutationObserverRegistration::MutationObserverRegistration(MutationObserver& observer, Node* registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
     : m_observer(observer)
     , m_registrationNode(registrationNode)
     , m_options(options)
@@ -53,8 +53,9 @@ MutationObserverRegistration::MutationObserverRegistration(MutationObserver& obs
 
 MutationObserverRegistration::~MutationObserverRegistration()
 {
-    // dispose() hasn't been called if this assert triggers.
-    ASSERT(!m_observer);
+#if !ENABLE(OILPAN)
+    dispose();
+#endif
 }
 
 void MutationObserverRegistration::dispose()
@@ -83,7 +84,7 @@ void MutationObserverRegistration::observedSubtreeNodeWillDetach(Node& node)
         m_transientRegistrationNodes = adoptPtr(new NodeHashSet);
 
         ASSERT(!m_registrationNodeKeepAlive);
-        m_registrationNodeKeepAlive = PassRefPtr<Node>(m_registrationNode); // Balanced in clearTransientRegistrations.
+        m_registrationNodeKeepAlive = PassRefPtrWillBeRawPtr<Node>(m_registrationNode.get()); // Balanced in clearTransientRegistrations.

[haraken, 2014/05/08 04:14:00]

Add ASSERT(m_registrationNode).

[sof, 2014/05/08 06:43:15]

Done.

     }
     m_transientRegistrationNodes->add(&node);
 }
@@ -106,7 +107,7 @@ void MutationObserverRegistration::clearTransientRegistrations()
 
 void MutationObserverRegistration::unregister()
 {
-    m_registrationNode.unregisterMutationObserver(this);
+    m_registrationNode->unregisterMutationObserver(this);

[haraken, 2014/05/08 04:14:00]

Add:

ASSERT(m_registrationNode);
ASSERT(m_registrationNodeKeepAlive);

[sof, 2014/05/08 06:43:15]

First yes, 2nd wouldn't be right. Done.

     // The above line will cause this object to be deleted, so don't do any more in this function.
 }
 
@@ -116,7 +117,7 @@ bool MutationObserverRegistration::shouldReceiveMutationFrom(Node& node, Mutatio
     if (!(m_options & type))
         return false;
 
-    if (m_registrationNode != node && !isSubtree())
+    if (m_registrationNode != &node && !isSubtree())
         return false;
 
     if (type != MutationObserver::Attributes || !(m_options & MutationObserver::AttributeFilter))
@@ -130,7 +131,7 @@ bool MutationObserverRegistration::shouldReceiveMutationFrom(Node& node, Mutatio
 
 void MutationObserverRegistration::addRegistrationNodesToSet(HashSet<Node*>& nodes) const
 {
-    nodes.add(&m_registrationNode);
+    nodes.add(m_registrationNode.get());

[haraken, 2014/05/08 04:14:00]

Add:

ASSERT(m_registrationNode);
ASSERT(m_registrationNodeKeepAlive);

[sof, 2014/05/08 06:43:15]

First yes, 2nd wouldn't be right.

     if (!m_transientRegistrationNodes)
         return;
     for (NodeHashSet::const_iterator iter = m_transientRegistrationNodes->begin(); iter != m_transientRegistrationNodes->end(); ++iter)
@@ -140,6 +141,8 @@ void MutationObserverRegistration::addRegistrationNodesToSet(HashSet<Node*>& nod
 void MutationObserverRegistration::trace(Visitor* visitor)
 {
     visitor->trace(m_observer);
+    visitor->trace(m_registrationNode);
+    visitor->trace(m_registrationNodeKeepAlive);
 }
 
 } // namespace WebCore