Index: sky/engine/core/dom/Element.cpp |
diff --git a/sky/engine/core/dom/Element.cpp b/sky/engine/core/dom/Element.cpp |
index b0b9340fb288705a4b994b8aa203a467f6c2c158..e306ef8b60a6022356dd5d7820e24b14a9acc6cc 100644 |
--- a/sky/engine/core/dom/Element.cpp |
+++ b/sky/engine/core/dom/Element.cpp |
@@ -967,7 +967,7 @@ void Element::recalcChildStyle(StyleRecalcChange change) |
ASSERT(!needsStyleRecalc()); |
if (change > Inherit || childNeedsStyleRecalc()) { |
- for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) { |
+ if (ShadowRoot* root = shadowRoot()) { |
if (root->shouldCallRecalcStyle(change)) |
root->recalcStyle(change); |
} |
@@ -1051,6 +1051,8 @@ CustomElementDefinition* Element::customElementDefinition() const |
PassRefPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exceptionState) |
ojan
2014/11/26 18:43:17
s/createShadowRoot/ensureShadowRoot ?
esprehn
2014/11/26 18:54:23
done.
|
{ |
+ if (ShadowRoot* root = shadowRoot()) |
+ return root; |
return PassRefPtr<ShadowRoot>(ensureShadow().addShadowRoot(*this)); |
} |
@@ -1059,7 +1061,7 @@ ShadowRoot* Element::shadowRoot() const |
ElementShadow* elementShadow = shadow(); |
if (!elementShadow) |
return 0; |
- return elementShadow->youngestShadowRoot(); |
+ return elementShadow->shadowRoot(); |
} |
void Element::childrenChanged(const ChildrenChange& change) |