Attachment 356742 Details for Bug 192461 – WIP - fixed non-debug builds

[patch] WIP - fixed non-debug builds

wip192461b.patch (text/plain), 1.94 KB, created by Ryosuke Niwa on 2018-12-06 13:01:26 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2018-12-06 13:01:26 PST

Size: 1.94 KB

patch

obsolete

>Index: Source/WebCore/dom/Node.cpp
>===================================================================
>--- Source/WebCore/dom/Node.cpp	(revision 238926)
>+++ Source/WebCore/dom/Node.cpp	(working copy)
>@@ -2532,6 +2532,9 @@
>     if (is<Document>(*this)) {
>         downcast<Document>(*this).removedLastRef();
>         return;
>+    } else if (is<ShadowRoot>(*this)) {
>+        downcast<ShadowRoot>(*this).removedLastRef();
>+        return;
>     }
> 
> #ifndef NDEBUG
>Index: Source/WebCore/dom/ShadowRoot.cpp
>===================================================================
>--- Source/WebCore/dom/ShadowRoot.cpp	(revision 238926)
>+++ Source/WebCore/dom/ShadowRoot.cpp	(working copy)
>@@ -72,7 +72,6 @@
> {
> }
> 
>-
> ShadowRoot::~ShadowRoot()
> {
>     if (isConnected())
>@@ -86,14 +85,22 @@
>     // clears Node::m_treeScope thus ContainerNode is no longer able
>     // to access it Document reference after that.
>     willBeDeletedFrom(document());
>+}
> 
>+void ShadowRoot::removedLastRef()
>+{
>+    ASSERT(!m_deletionHasBegun);
>+    ASSERT(refCount() <= 0);
>+
>     ASSERT(!m_hasBegunDeletingDetachedChildren);
>     m_hasBegunDeletingDetachedChildren = true;
> 
>-    // We must remove all of our children first before the TreeScope destructor
>-    // runs so we don't go through Node::setTreeScopeRecursively for each child with a
>-    // destructed tree scope in each descendant.
>     removeDetachedChildren();
>+
>+#ifndef NDEBUG
>+    m_deletionHasBegun = true;
>+#endif
>+    delete this;
> }
> 
> Node::InsertedIntoAncestorResult ShadowRoot::insertedIntoAncestor(InsertionType insertionType, ContainerNode& parentOfInsertedTree)
>Index: Source/WebCore/dom/ShadowRoot.h
>===================================================================
>--- Source/WebCore/dom/ShadowRoot.h	(revision 238926)
>+++ Source/WebCore/dom/ShadowRoot.h	(working copy)
>@@ -54,6 +54,8 @@
> 
>     using TreeScope::rootNode;
> 
>+    void removedLastRef();
>+    
>     Style::Scope& styleScope();
>     StyleSheetList& styleSheets();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192461: 356718 | 356742 | 357033 | 357036 | 359073 | 359089