Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Unified Diff: third_party/WebKit/Source/core/dom/Element.cpp

Issue 2378573002: Revert of Made ElementRareData store ComputedStyle on LayoutObject if possible. (Closed)
Patch Set: Fixed conflicts (nainar) Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/BUILD.gn ('k') | third_party/WebKit/Source/core/dom/ElementRareData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index 3a29fbac8b4ee36521f349ec6c9005f4bc7123d1..eef8d64119276eeea4485bd17066d9bd44fd59dc 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -1562,7 +1562,7 @@ void Element::attachLayoutTree(const AttachContext& context)
// need to clear any state that's been added since then.
if (hasRareData() && getStyleChangeType() == NeedsReattachStyleChange) {
ElementRareData* data = elementRareData();
- data->clearComputedStyleIfNoLayoutObject();
+ data->clearComputedStyle();
}
if (!isSlotOrActiveInsertionPoint())
@@ -1608,7 +1608,7 @@ void Element::detachLayoutTree(const AttachContext& context)
// attachLayoutTree() will clear the computed style for us when inside recalcStyle.
if (!document().inStyleRecalc())
- data->clearComputedStyleIfNoLayoutObject();
+ data->clearComputedStyle();
if (ElementAnimations* elementAnimations = data->elementAnimations()) {
if (context.performingReattach) {
@@ -1738,7 +1738,7 @@ void Element::recalcStyle(StyleRecalcChange change, Text* nextTextSibling)
if (hasRareData()) {
ElementRareData* data = elementRareData();
if (change != IndependentInherit)
- data->clearComputedStyleIfNoLayoutObject();
+ data->clearComputedStyle();
if (change >= IndependentInherit) {
if (ElementAnimations* elementAnimations = data->elementAnimations())
« no previous file with comments | « third_party/WebKit/Source/core/BUILD.gn ('k') | third_party/WebKit/Source/core/dom/ElementRareData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698