| Index: Source/core/dom/shadow/ElementShadow.cpp
|
| diff --git a/Source/core/dom/shadow/ElementShadow.cpp b/Source/core/dom/shadow/ElementShadow.cpp
|
| index bebad50f004c6fac391e15fd7854d459049a452c..2717cf998d4b5d01d5d67f3e8c5fcc72b871f3d4 100644
|
| --- a/Source/core/dom/shadow/ElementShadow.cpp
|
| +++ b/Source/core/dom/shadow/ElementShadow.cpp
|
| @@ -64,7 +64,7 @@ ShadowRoot* ElementShadow::addShadowRoot(Element* shadowHost, ShadowRoot::Shadow
|
| m_shadowRoots.push(shadowRoot.get());
|
| ChildNodeInsertionNotifier(shadowHost).notify(shadowRoot.get());
|
| setNeedsDistributionRecalc();
|
| - shadowHost->lazyReattachIfAttached();
|
| + shadowHost->scheduleRenderTreeRecreationIfAttached();
|
|
|
| // addShadowRoot() affects apply-author-styles. However, we know that the youngest shadow root has not had any children yet.
|
| // The youngest shadow root's apply-author-styles is default (false). So we can just set m_applyAuthorStyles false.
|
| @@ -86,7 +86,7 @@ void ElementShadow::removeAllShadowRoots()
|
| shadowHost->document().removeFocusedElementOfSubtree(oldRoot.get());
|
|
|
| if (oldRoot->attached())
|
| - oldRoot->detach();
|
| + oldRoot->destroyRenderTree();
|
|
|
| m_shadowRoots.removeHead();
|
| oldRoot->setParentOrShadowHostNode(0);
|
| @@ -97,25 +97,25 @@ void ElementShadow::removeAllShadowRoots()
|
| }
|
| }
|
|
|
| -void ElementShadow::attach(const Node::AttachContext& context)
|
| +void ElementShadow::createRenderTree(const Node::AttachContext& context)
|
| {
|
| Node::AttachContext childrenContext(context);
|
| childrenContext.resolvedStyle = 0;
|
|
|
| for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
|
| if (!root->attached())
|
| - root->attach(childrenContext);
|
| + root->createRenderTree(childrenContext);
|
| }
|
| }
|
|
|
| -void ElementShadow::detach(const Node::AttachContext& context)
|
| +void ElementShadow::destroyRenderTree(const Node::AttachContext& context)
|
| {
|
| Node::AttachContext childrenContext(context);
|
| childrenContext.resolvedStyle = 0;
|
|
|
| for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
|
| if (root->attached())
|
| - root->detach(childrenContext);
|
| + root->destroyRenderTree(childrenContext);
|
| }
|
| }
|
|
|
| @@ -251,7 +251,7 @@ void ElementShadow::distribute()
|
| if (distributed[i])
|
| continue;
|
| if (pool[i]->renderer())
|
| - pool[i]->lazyReattachIfAttached();
|
| + pool[i]->scheduleRenderTreeRecreationIfAttached();
|
| }
|
| }
|
|
|
|
|