Changeset 282498 in webkit

Timestamp:

Sep 16, 2021, 1:00:19 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r275756 - Teardown shadow root renderers on SlotAssignment::didChangeSlot
​https://bugs.webkit.org/show_bug.cgi?id=221386

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2021-04-09
Reviewed by Ryosuke Niwa.

This reverts r272900 to move the call to RenderTreeUpdater::tearDownRenderers() from hostChildElementDidChange()
to didChangeSlot(). This ensures the renderers are also cleared for other shadow root trees not using details
element.

• dom/SlotAssignment.cpp:

(WebCore::SlotAssignment::addSlotElementByName):
(WebCore::SlotAssignment::didChangeSlot):

• dom/SlotAssignment.h:

(WebCore::ShadowRoot::hostChildElementDidChange):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/SlotAssignment.cpp (modified) (2 diffs)
• dom/SlotAssignment.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Teardown shadow root renderers on SlotAssignment::didChangeSlot
+        https://bugs.webkit.org/show_bug.cgi?id=221386
+
+        Reviewed by Ryosuke Niwa.
+
+        This reverts r272900 to move the call to RenderTreeUpdater::tearDownRenderers() from hostChildElementDidChange()
+        to didChangeSlot(). This ensures the renderers are also cleared for other shadow root trees not using details
+        element.
+
+        * dom/SlotAssignment.cpp:
+        (WebCore::SlotAssignment::addSlotElementByName):
+        (WebCore::SlotAssignment::didChangeSlot):
+        * dom/SlotAssignment.h:
+        (WebCore::ShadowRoot::hostChildElementDidChange):
+
 2021-03-24  Sergio Villar Senin  <svillar@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/SlotAssignment.cpp

@@ -121 +121 @@
     });
     auto& slot = *addResult.iterator->value;
+
+    if (!m_slotAssignmentsIsValid)
+        assignSlots(shadowRoot);
+
     bool needsSlotchangeEvent = shadowRoot.shouldFireSlotchangeEvent() && hasAssignedNodes(shadowRoot, slot);
 
@@ -293 +297 @@
     if (!slot)
         return;
-    
+
+    RenderTreeUpdater::tearDownRenderers(*shadowRoot.host());
+
     slot->assignedNodes.clear();
     m_slotAssignmentsIsValid = false;

releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/SlotAssignment.h

@@ -132 +132 @@
 inline void ShadowRoot::hostChildElementDidChange(const Element& childElement)
 {
-    if (!m_slotAssignment)
-        return;
-    if (m_host)
-        RenderTreeUpdater::tearDownRenderers(*m_host);
-    m_slotAssignment->hostChildElementDidChange(childElement, *this);
+    if (m_slotAssignment)
+        m_slotAssignment->hostChildElementDidChange(childElement, *this);
 }