| Index: Source/core/css/resolver/ScopedStyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/ScopedStyleResolver.cpp b/Source/core/css/resolver/ScopedStyleResolver.cpp
|
| index e9693d0db983be5de1d7ef746151382d52539841..11a62da8e1089288b227555330a3fd4b2562c55c 100644
|
| --- a/Source/core/css/resolver/ScopedStyleResolver.cpp
|
| +++ b/Source/core/css/resolver/ScopedStyleResolver.cpp
|
| @@ -45,26 +45,10 @@ namespace WebCore {
|
| ContainerNode* ScopedStyleResolver::scopingNodeFor(Document& document, const CSSStyleSheet* sheet)
|
| {
|
| ASSERT(sheet);
|
| -
|
| - Document* sheetDocument = sheet->ownerDocument();
|
| - if (!sheetDocument)
|
| - return 0;
|
| Node* ownerNode = sheet->ownerNode();
|
| if (!isHTMLStyleElement(ownerNode))
|
| return &document;
|
| -
|
| - HTMLStyleElement& styleElement = toHTMLStyleElement(*ownerNode);
|
| - if (!styleElement.scoped()) {
|
| - if (styleElement.isInShadowTree())
|
| - return styleElement.containingShadowRoot();
|
| - return &document;
|
| - }
|
| -
|
| - ContainerNode* parent = styleElement.parentNode();
|
| - if (!parent)
|
| - return 0;
|
| -
|
| - return (parent->isElementNode() || parent->isShadowRoot()) ? parent : 0;
|
| + return toHTMLStyleElement(*ownerNode).scopingNode();
|
| }
|
|
|
| void ScopedStyleResolver::addRulesFromSheet(CSSStyleSheet* cssSheet, const MediaQueryEvaluator& medium, StyleResolver* resolver)
|
|
|