Oilpan: move mutation observers to the Oilpan heap.

Source/core/dom/MutationObserverRegistration.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "config.h"
 
 #include "core/dom/MutationObserverRegistration.h"
 
 #include "core/dom/Node.h"
 #include "core/dom/QualifiedName.h"
 
 namespace WebCore {
 
-PassOwnPtr<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 adoptPtr(new MutationObserverRegistration(observer, registrationNode, options, attributeFilter));
+    return adoptPtrWillBeNoop(new MutationObserverRegistration(observer, registrationNode, options, attributeFilter));
 }
 
 MutationObserverRegistration::MutationObserverRegistration(MutationObserver& observer, Node& registrationNode, MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
     : m_observer(observer)
     , m_registrationNode(registrationNode)
     , m_options(options)
     , m_attributeFilter(attributeFilter)
 {
     m_observer->observationStarted(this);
 }
 
 MutationObserverRegistration::~MutationObserverRegistration()
 {
+#if ENABLE(OILPAN)
+    // dispose() will not have been called if this assert
+    // triggers.
+    ASSERT(!m_observer);
+#else
+    dispose();
+#endif

[haraken, 2014/04/21 06:00:34]

As I commented previously, would it be possible to remove the #if branch?
Currently dispose() is called before the destructor in oilpan builds, but
dispose() is called inside the destructor. Having two call paths is not that
nice.

[sof, 2014/04/21 07:34:05]

I can remove it, but why is the assert harmful to have around?

[haraken, 2014/04/21 07:41:31]

I'm not concerned about having the assert. My point is just that if we could
reduce the number of #if ENABLE(OILPAN), it would be better :) Having multiple
call paths depending on oilpan/non-oilpan builds would make future development a
bit harder.

[sof, 2014/04/21 12:45:16]

ok, I've switched to explicit dispose()s for the non-Oilpan case also, and
dropped this #if.

+}
+
+void MutationObserverRegistration::dispose()
+{
     clearTransientRegistrations();
     m_observer->observationEnded(this);
+    m_observer.clear();

[haraken, 2014/04/21 06:00:34]

Shall we also clear m_registrationNode in dispose() and add
ASSERT(!m_registrationNode) in ~MutationObserverRegistration() ?

[sof, 2014/04/21 12:45:16]

m_registrationNode was left as a reference, as that was deemed safe by earlier
discussions.

 }
 
 void MutationObserverRegistration::resetObservation(MutationObserverOptions options, const HashSet<AtomicString>& attributeFilter)
 {
     clearTransientRegistrations();
     m_options = options;
     m_attributeFilter = attributeFilter;
 }
 
 void MutationObserverRegistration::observedSubtreeNodeWillDetach(Node& node)
@@ skipping 55 matching lines @@
 
 void MutationObserverRegistration::addRegistrationNodesToSet(HashSet<Node*>& nodes) const
 {
     nodes.add(&m_registrationNode);
     if (!m_transientRegistrationNodes)
         return;
     for (NodeHashSet::const_iterator iter = m_transientRegistrationNodes->begin(); iter != m_transientRegistrationNodes->end(); ++iter)
         nodes.add(iter->get());
 }
 
+void MutationObserverRegistration::trace(Visitor* visitor)
+{
+    visitor->trace(m_observer);
+}
+
 } // namespace WebCore