Title: [267749] branches/safari-610-branch/Source/WebCore
- Revision
- 267749
- Author
- alanc...@apple.com
- Date
- 2020-09-29 10:36:19 -0700 (Tue, 29 Sep 2020)
Log Message
Cherry-pick r267722. rdar://problem/69586659
Cherry-pick r266899. rdar://problem/69586659
Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications had to be made to this cherry-pick to build.
Address a post-commit review comment after r266887
https://bugs.webkit.org/show_bug.cgi?id=216257
Reviewed by Darin Adler.
Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
style in rare data. There should be no change in behavior; this just makes the code a bit simpler.
* dom/Element.cpp:
(WebCore::Element::invalidateStyle):
(WebCore::Element::storeDisplayContentsStyle):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-610-branch@267722 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (267748 => 267749)
--- branches/safari-610-branch/Source/WebCore/ChangeLog 2020-09-29 17:34:54 UTC (rev 267748)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog 2020-09-29 17:36:19 UTC (rev 267749)
@@ -1,5 +1,66 @@
2020-09-29 Alan Coon <alanc...@apple.com>
+ Cherry-pick r267722. rdar://problem/69586659
+
+ Cherry-pick r266899. rdar://problem/69586659
+
+ Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications had to be made to this cherry-pick to build.
+
+ Address a post-commit review comment after r266887
+ https://bugs.webkit.org/show_bug.cgi?id=216257
+
+ Reviewed by Darin Adler.
+
+ Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
+ style in rare data. There should be no change in behavior; this just makes the code a bit simpler.
+
+ * dom/Element.cpp:
+ (WebCore::Element::invalidateStyle):
+ (WebCore::Element::storeDisplayContentsStyle):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-610-branch@267722 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-28 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r266899. rdar://problem/69586659
+
+ Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications had to be made to this cherry-pick to build.
+
+ Address a post-commit review comment after r266887
+ https://bugs.webkit.org/show_bug.cgi?id=216257
+
+ Reviewed by Darin Adler.
+
+ Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
+ style in rare data. There should be no change in behavior; this just makes the code a bit simpler.
+
+ * dom/Element.cpp:
+ (WebCore::Element::invalidateStyle):
+ (WebCore::Element::storeDisplayContentsStyle):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-09-10 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Integrator's note: as some of the symbols present on trunk are not available on branch, special modifications
+ had to be made to this cherry-pick.
+
+ Address a post-commit review comment after r266887
+ https://bugs.webkit.org/show_bug.cgi?id=216257
+
+ Reviewed by Darin Adler.
+
+ Remove a check that currently makes us conditionally set `IsComputedStyleInvalidFlag` if there is a computed
+ style in rare data. There should be no change in behavior; this just makes the code a bit simpler.
+
+ * dom/Element.cpp:
+ (WebCore::Element::invalidateStyle):
+ (WebCore::Element::storeDisplayContentsStyle):
+
+2020-09-29 Alan Coon <alanc...@apple.com>
+
Cherry-pick r267721. rdar://problem/69586659
Cherry-pick r266887. rdar://problem/69586659
Modified: branches/safari-610-branch/Source/WebCore/dom/Element.cpp (267748 => 267749)
--- branches/safari-610-branch/Source/WebCore/dom/Element.cpp 2020-09-29 17:34:54 UTC (rev 267748)
+++ branches/safari-610-branch/Source/WebCore/dom/Element.cpp 2020-09-29 17:36:19 UTC (rev 267749)
@@ -1947,8 +1947,7 @@
// FIXME: This flag should be set whenever styles are invalidated while computed styles are present,
// not just in this codepath.
- if (hasRareData() && elementRareData()->computedStyle())
- setFlag(IsComputedStyleInvalidFlag);
+ setFlag(IsComputedStyleInvalidFlag);
}
void Element::invalidateStyleAndLayerComposition()
@@ -1999,6 +1998,7 @@
ASSERT(style && style->display() == DisplayType::Contents);
ASSERT(!renderer() || isPseudoElement());
ensureElementRareData().setComputedStyle(WTFMove(style));
+ clearFlag(IsComputedStyleInvalidFlag);
}
// Returns true is the given attribute is an event handler.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
