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

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

Issue 2729453002: Revert of Call Element::rebuildLayoutTree from Document::updateStyle directly (Closed)
Patch Set: Created 3 years, 10 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/dom/ContainerNode.h ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/ContainerNode.cpp
diff --git a/third_party/WebKit/Source/core/dom/ContainerNode.cpp b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
index 066f9919aa6ba9c8c9e0142dbce14f88837653c1..207659d70f65cfdf3da66036ac30f8ba15cce0d2 100644
--- a/third_party/WebKit/Source/core/dom/ContainerNode.cpp
+++ b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
@@ -788,7 +788,6 @@
child->detachLayoutTree(childrenContext);
setChildNeedsStyleRecalc();
- setChildNeedsReattachLayoutTree();
Node::detachLayoutTree(context);
}
@@ -796,15 +795,9 @@
document().incDOMTreeVersion();
document().notifyChangeChildren(*this);
invalidateNodeListCachesInAncestors();
- if (change.isChildInsertion()) {
- if (!childNeedsStyleRecalc()) {
- setChildNeedsStyleRecalc();
- markAncestorsWithChildNeedsStyleRecalc();
- }
- if (!childNeedsReattachLayoutTree()) {
- setChildNeedsReattachLayoutTree();
- markAncestorsWithChildNeedsReattachLayoutTree();
- }
+ if (change.isChildInsertion() && !childNeedsStyleRecalc()) {
+ setChildNeedsStyleRecalc();
+ markAncestorsWithChildNeedsStyleRecalc();
}
}
@@ -1312,24 +1305,6 @@
}
}
-void ContainerNode::rebuildChildrenLayoutTrees() {
- DCHECK(!needsReattachLayoutTree());
-
- for (Node* child = lastChild(); child; child = child->previousSibling()) {
- if (child->needsReattachLayoutTree() ||
- child->childNeedsReattachLayoutTree()) {
- if (child->isTextNode())
- toText(child)->rebuildTextLayoutTree();
- else if (child->isElementNode())
- toElement(child)->rebuildLayoutTree();
- }
- }
- // This is done in ContainerNode::attachLayoutTree but will never be cleared
- // if we don't enter ContainerNode::attachLayoutTree so we do it here.
- clearChildNeedsStyleRecalc();
- clearChildNeedsReattachLayoutTree();
-}
-
void ContainerNode::checkForSiblingStyleChanges(SiblingCheckType changeType,
Element* changedElement,
Node* nodeBeforeChange,
« no previous file with comments | « third_party/WebKit/Source/core/dom/ContainerNode.h ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698