| Index: Source/core/dom/shadow/ShadowRoot.cpp
|
| diff --git a/Source/core/dom/shadow/ShadowRoot.cpp b/Source/core/dom/shadow/ShadowRoot.cpp
|
| index bb0f5a1aabd36064f551e21bdb741564c6b64c71..f854574f12686a547f243684883d935802612861 100644
|
| --- a/Source/core/dom/shadow/ShadowRoot.cpp
|
| +++ b/Source/core/dom/shadow/ShadowRoot.cpp
|
| @@ -171,7 +171,7 @@ void ShadowRoot::recalcStyle(StyleRecalcChange change)
|
| return;
|
| }
|
|
|
| - // When we're set to lazyAttach we'll have a SubtreeStyleChange and we'll need
|
| + // When we're set to scheduleRenderTreeCreation we'll have a SubtreeStyleChange and we'll need
|
| // to promote the change to a Force for all our descendants so they get a
|
| // recalc and will attach.
|
| if (styleChangeType() >= SubtreeStyleChange)
|
| @@ -187,7 +187,7 @@ void ShadowRoot::recalcStyle(StyleRecalcChange change)
|
|
|
| if (child->isTextNode()) {
|
| if (forceReattachOfAnyWhitespaceSibling && toText(child)->containsOnlyWhitespace())
|
| - child->reattach();
|
| + child->recreateRenderTree();
|
| else
|
| didReattach = toText(child)->recalcTextStyle(change);
|
| } else if (child->isElementNode() && shouldRecalcStyle(change, child)) {
|
| @@ -251,11 +251,11 @@ void ShadowRoot::setResetStyleInheritance(bool value)
|
| setNeedsStyleRecalc();
|
| }
|
|
|
| -void ShadowRoot::attach(const AttachContext& context)
|
| +void ShadowRoot::createRenderTree(const AttachContext& context)
|
| {
|
| StyleResolver* styleResolver = document().styleResolver();
|
| styleResolver->pushParentShadowRoot(*this);
|
| - DocumentFragment::attach(context);
|
| + DocumentFragment::createRenderTree(context);
|
| styleResolver->popParentShadowRoot(*this);
|
| }
|
|
|
|
|