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

Unified Diff: Source/core/dom/Node.cpp

Issue 15159008: Node::lazyAttach shouldn't lie about being attached (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase again Created 7 years, 7 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 | « Source/core/dom/Node.h ('k') | Source/core/dom/Text.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Node.cpp
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index 38563d3d7c296bb5e3258e847a1d687f4e95963b..a9ec2fa0a315e89173b8224f8f1b5e4abd998636 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -865,15 +865,19 @@ void Node::setNeedsStyleRecalc(StyleChangeType changeType)
markAncestorsWithChildNeedsStyleRecalc();
}
-void Node::lazyAttach(ShouldSetAttached shouldSetAttached)
-{
- for (Node* n = this; n; n = NodeTraversal::next(n, this)) {
- if (n->hasChildNodes())
- n->setChildNeedsStyleRecalc();
- n->setStyleChange(FullStyleChange);
- if (shouldSetAttached == SetAttached)
- n->setAttached();
+void Node::lazyAttach()
+{
+ // It's safe to synchronously attach here because we're in the middle of style recalc
+ // while it's not safe to mark nodes as needing style recalc except in the loop in
+ // Element::recalcStyle because we may mark an ancestor as not needing recalc and
+ // then the node would never get updated. One place this currently happens is
+ // HTMLObjectElement::renderFallbackContent which may call lazyAttach from inside
+ // attach which was triggered by a recalcStyle.
+ if (document()->inStyleRecalc()) {
+ attach();
+ return;
}
+ setStyleChange(FullStyleChange);
markAncestorsWithChildNeedsStyleRecalc();
}
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/dom/Text.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698