| Index: Source/core/dom/Node.cpp
|
| diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
|
| index 0798dda6c5b079fdd35680c844fb3a3dd533d867..e5c94c50808b1f1836ade9bfe790d67a115f83e7 100644
|
| --- a/Source/core/dom/Node.cpp
|
| +++ b/Source/core/dom/Node.cpp
|
| @@ -274,14 +274,12 @@ Node::~Node()
|
| #if !ENABLE(OILPAN)
|
| if (!isContainerNode())
|
| willBeDeletedFromDocument();
|
| -#endif
|
|
|
| if (m_previous)
|
| m_previous->setNextSibling(0);
|
| if (m_next)
|
| m_next->setPreviousSibling(0);
|
|
|
| -#if !ENABLE(OILPAN)
|
| if (m_treeScope)
|
| m_treeScope->guardDeref();
|
| #endif
|
| @@ -2375,13 +2373,8 @@ bool Node::willRespondToTouchEvents()
|
| return hasEventListeners(EventTypeNames::touchstart) || hasEventListeners(EventTypeNames::touchmove) || hasEventListeners(EventTypeNames::touchcancel) || hasEventListeners(EventTypeNames::touchend);
|
| }
|
|
|
| +#if !ENABLE(OILPAN)
|
| // This is here for inlining
|
| -#if ENABLE(OILPAN)
|
| -inline void TreeScope::removedLastRefToScope()
|
| -{
|
| - dispose();
|
| -}
|
| -#else
|
| inline void TreeScope::removedLastRefToScope()
|
| {
|
| ASSERT_WITH_SECURITY_IMPLICATION(!deletionHasBegun());
|
| @@ -2409,6 +2402,7 @@ inline void TreeScope::removedLastRefToScope()
|
| }
|
| #endif
|
|
|
| +#if !ENABLE(OILPAN)
|
| // It's important not to inline removedLastRef, because we don't want to inline the code to
|
| // delete a Node at each deref call site.
|
| void Node::removedLastRef()
|
| @@ -2421,13 +2415,12 @@ void Node::removedLastRef()
|
| return;
|
| }
|
|
|
| -#if !ENABLE(OILPAN)
|
| #if SECURITY_ASSERT_ENABLED
|
| m_deletionHasBegun = true;
|
| #endif
|
| delete this;
|
| -#endif
|
| }
|
| +#endif
|
|
|
| unsigned Node::connectedSubframeCount() const
|
| {
|
| @@ -2571,6 +2564,9 @@ void Node::setCustomElementState(CustomElementState newState)
|
|
|
| void Node::trace(Visitor* visitor)
|
| {
|
| + visitor->trace(m_parentOrShadowHostNode);
|
| + visitor->trace(m_previous);
|
| + visitor->trace(m_next);
|
| visitor->trace(m_treeScope);
|
| }
|
|
|
|
|