third_party/WebKit/Source/core/dom/Node.cpp - Issue 2760233004: Make all setNeedsReattachLayoutTree happen from updateStyle.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2760233004: Make all setNeedsReattachLayoutTree happen from updateStyle. (Closed)

Patch Set: Included https://codereview.chromium.org/2760953003/ Created 3 years, 9 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:

Index: third_party/WebKit/Source/core/dom/Node.cpp

diff --git a/third_party/WebKit/Source/core/dom/Node.cpp b/third_party/WebKit/Source/core/dom/Node.cpp

index 98b470d9c02d0c16392046c30aaf2d6c6344114c..9e1e08e42a39a3c8586e233f4bbf9da0a943e588 100644

--- a/third_party/WebKit/Source/core/dom/Node.cpp

+++ b/third_party/WebKit/Source/core/dom/Node.cpp

@@ -725,6 +725,8 @@ void Node::markAncestorsWithChildNeedsReattachLayoutTree() {

}

void Node::setNeedsReattachLayoutTree() {

+ DCHECK(document().inStyleRecalc());

+ DCHECK(!document().childNeedsDistributionRecalc());

setFlag(NeedsReattachLayoutTree);

markAncestorsWithChildNeedsReattachLayoutTree();

}

@@ -932,7 +934,6 @@ void Node::detachLayoutTree(const AttachContext& context) {

layoutObject()->destroyAndCleanupAnonymousWrappers();

setLayoutObject(nullptr);

setStyleChange(NeedsReattachStyleChange);

- setFlag(NeedsReattachLayoutTree);

clearChildNeedsStyleInvalidation();

}