Title: [269794] branches/safari-610-branch/Source/WebCore
Revision
269794
Author
[email protected]
Date
2020-11-13 14:16:29 -0800 (Fri, 13 Nov 2020)

Log Message

Cherry-pick r268782. rdar://problem/71381941

    Release assert in ~Node due to render element of pseudo element not getting removed in time
    https://bugs.webkit.org/show_bug.cgi?id=217996

    Patch by Julian Gonzalez <[email protected]> on 2020-10-20
    Reviewed by Ryosuke Niwa.

    When attaching a shadow root to an element, remember to tear down renderers not only if
    one exists on the element, but also if it uses display: contents.

    * dom/Element.cpp:
    (WebCore::Element::addShadowRoot):

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

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (269793 => 269794)


--- branches/safari-610-branch/Source/WebCore/ChangeLog	2020-11-13 22:16:12 UTC (rev 269793)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog	2020-11-13 22:16:29 UTC (rev 269794)
@@ -1,5 +1,36 @@
 2020-11-13  Russell Epstein  <[email protected]>
 
+        Cherry-pick r268782. rdar://problem/71381941
+
+    Release assert in ~Node due to render element of pseudo element not getting removed in time
+    https://bugs.webkit.org/show_bug.cgi?id=217996
+    
+    Patch by Julian Gonzalez <[email protected]> on 2020-10-20
+    Reviewed by Ryosuke Niwa.
+    
+    When attaching a shadow root to an element, remember to tear down renderers not only if
+    one exists on the element, but also if it uses display: contents.
+    
+    * dom/Element.cpp:
+    (WebCore::Element::addShadowRoot):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268782 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-20  Julian Gonzalez  <[email protected]>
+
+            Release assert in ~Node due to render element of pseudo element not getting removed in time
+            https://bugs.webkit.org/show_bug.cgi?id=217996
+
+            Reviewed by Ryosuke Niwa.
+
+            When attaching a shadow root to an element, remember to tear down renderers not only if
+            one exists on the element, but also if it uses display: contents.
+
+            * dom/Element.cpp:
+            (WebCore::Element::addShadowRoot):
+
+2020-11-13  Russell Epstein  <[email protected]>
+
         Cherry-pick r266052. rdar://problem/71378190
 
     RTCRtpSynchronizationSource.rtpTimestamp is not present

Modified: branches/safari-610-branch/Source/WebCore/dom/Element.cpp (269793 => 269794)


--- branches/safari-610-branch/Source/WebCore/dom/Element.cpp	2020-11-13 22:16:12 UTC (rev 269793)
+++ branches/safari-610-branch/Source/WebCore/dom/Element.cpp	2020-11-13 22:16:29 UTC (rev 269794)
@@ -2289,7 +2289,7 @@
     {
         WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
         ScriptDisallowedScope::InMainThread scriptDisallowedScope;
-        if (renderer())
+        if (renderer() || hasDisplayContents())
             RenderTreeUpdater::tearDownRenderers(*this);
 
         ensureElementRareData().setShadowRoot(WTFMove(newShadowRoot));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to