Changeset 282502 in webkit

Timestamp:

Sep 16, 2021, 1:12:36 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r275938 - Do not reset computed style for element children with display contents style
​https://bugs.webkit.org/show_bug.cgi?id=223794

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2021-04-14
Reviewed by Antti Koivisto.

We were checking hasDisplayContents() was false before calling resetComputedStyle() on the parent, but we don't
check it when iterating the children.

• dom/Element.cpp:

(WebCore::Element::resetComputedStyle):

• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::resolveComposedTree):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

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

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

@@ +1 @@
+2021-04-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Do not reset computed style for element children with display contents style
+        https://bugs.webkit.org/show_bug.cgi?id=223794
+
+        Reviewed by Antti Koivisto.
+
+        We were checking hasDisplayContents() was false before calling resetComputedStyle() on the parent, but we don't
+        check it when iterating the children.
+
+        * dom/Element.cpp:
+        (WebCore::Element::resetComputedStyle):
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolveComposedTree):
+
 2021-04-13  Rob Buis  <rbuis@igalia.com>
 

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

@@ -4218 +4218 @@
 
     auto reset = [](Element& element) {
-        if (!element.hasRareData() || !element.elementRareData()->computedStyle())
-            return;
         if (element.hasCustomStyleResolveCallbacks())
             element.willResetComputedStyle();
@@ -4225 +4223 @@
     };
     reset(*this);
-    for (auto& child : descendantsOfType<Element>(*this))
+    for (auto& child : descendantsOfType<Element>(*this)) {
+        if (!child.hasRareData() || !child.elementRareData()->computedStyle() || child.hasDisplayContents())
+            continue;
         reset(child);
+    }
 }