Title: [277186] branches/safari-611-branch/Source/WebCore
- Revision
- 277186
- Author
- [email protected]
- Date
- 2021-05-07 11:48:08 -0700 (Fri, 07 May 2021)
Log Message
Cherry-pick r275938. rdar://problem/77581120
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 <[email protected]> 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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275938 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (277185 => 277186)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-05-07 18:48:04 UTC (rev 277185)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-05-07 18:48:08 UTC (rev 277186)
@@ -1,5 +1,40 @@
2021-05-06 Russell Epstein <[email protected]>
+ Cherry-pick r275938. rdar://problem/77581120
+
+ 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 <[email protected]> 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):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275938 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-14 Carlos Garcia Campos <[email protected]>
+
+ 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-05-06 Russell Epstein <[email protected]>
+
Cherry-pick r275607. rdar://problem/77581135
REGRESSION (r270849): Button content fails to render on apple.com "Blood Oxygen"/"ECG"
Modified: branches/safari-611-branch/Source/WebCore/dom/Element.cpp (277185 => 277186)
--- branches/safari-611-branch/Source/WebCore/dom/Element.cpp 2021-05-07 18:48:04 UTC (rev 277185)
+++ branches/safari-611-branch/Source/WebCore/dom/Element.cpp 2021-05-07 18:48:08 UTC (rev 277186)
@@ -4204,15 +4204,16 @@
return;
auto reset = [](Element& element) {
- if (!element.hasRareData() || !element.elementRareData()->computedStyle())
- return;
if (element.hasCustomStyleResolveCallbacks())
element.willResetComputedStyle();
element.elementRareData()->resetComputedStyle();
};
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);
+ }
}
void Element::resetStyleRelations()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
