| 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,
|
|
|