Remove ScopedStyleResolver::treeScopeFor. We only support inline stylesheets or <style scoped> so we can remove this helper. R=ojan@chromium.org Review URL: https://codereview.chromium.org/767013004
diff --git a/sky/engine/core/css/CSSStyleSheet.cpp b/sky/engine/core/css/CSSStyleSheet.cpp index 24966fe..00dcdcb 100644 --- a/sky/engine/core/css/CSSStyleSheet.cpp +++ b/sky/engine/core/css/CSSStyleSheet.cpp
@@ -73,11 +73,6 @@ } #endif -PassRefPtr<CSSStyleSheet> CSSStyleSheet::create(PassRefPtr<StyleSheetContents> sheet) -{ - return adoptRef(new CSSStyleSheet(sheet)); -} - PassRefPtr<CSSStyleSheet> CSSStyleSheet::createInline(PassRefPtr<StyleSheetContents> sheet, Node* ownerNode, const TextPosition& startPosition) { ASSERT(sheet);
diff --git a/sky/engine/core/css/CSSStyleSheet.h b/sky/engine/core/css/CSSStyleSheet.h index ae63dd4..f1ea840 100644 --- a/sky/engine/core/css/CSSStyleSheet.h +++ b/sky/engine/core/css/CSSStyleSheet.h
@@ -46,7 +46,6 @@ class CSSStyleSheet final : public StyleSheet { DEFINE_WRAPPERTYPEINFO(); public: - static PassRefPtr<CSSStyleSheet> create(PassRefPtr<StyleSheetContents>); static PassRefPtr<CSSStyleSheet> createInline(Node*, const KURL&, const TextPosition& startPosition = TextPosition::minimumPosition()); static PassRefPtr<CSSStyleSheet> createInline(PassRefPtr<StyleSheetContents>, Node* ownerNode, const TextPosition& startPosition = TextPosition::minimumPosition());
diff --git a/sky/engine/core/css/resolver/ScopedStyleResolver.cpp b/sky/engine/core/css/resolver/ScopedStyleResolver.cpp index 625d5a9..92d891d 100644 --- a/sky/engine/core/css/resolver/ScopedStyleResolver.cpp +++ b/sky/engine/core/css/resolver/ScopedStyleResolver.cpp
@@ -39,23 +39,6 @@ namespace blink { -TreeScope* ScopedStyleResolver::treeScopeFor(Document& document, const CSSStyleSheet* sheet) -{ - ASSERT(sheet); - - if (!sheet->ownerDocument()) - return 0; - - Node* ownerNode = sheet->ownerNode(); - if (!isHTMLStyleElement(ownerNode)) - return &document; - - HTMLStyleElement& styleElement = toHTMLStyleElement(*ownerNode); - if (styleElement.isInShadowTree()) - return styleElement.containingShadowRoot(); - return &document; -} - void ScopedStyleResolver::addRulesFromSheet(CSSStyleSheet* cssSheet, const MediaQueryEvaluator& medium, StyleResolver* resolver) { m_authorStyleSheets.append(cssSheet);
diff --git a/sky/engine/core/css/resolver/ScopedStyleResolver.h b/sky/engine/core/css/resolver/ScopedStyleResolver.h index fe668c6..ba24a9c 100644 --- a/sky/engine/core/css/resolver/ScopedStyleResolver.h +++ b/sky/engine/core/css/resolver/ScopedStyleResolver.h
@@ -51,8 +51,6 @@ return adoptPtr(new ScopedStyleResolver(scope)); } - static TreeScope* treeScopeFor(Document&, const CSSStyleSheet*); - const TreeScope& treeScope() const { return *m_scope; } public:
diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp index cb9f08a..85b8dd4 100644 --- a/sky/engine/core/css/resolver/StyleResolver.cpp +++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -166,11 +166,12 @@ if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), &m_viewportDependentMediaQueryResults)) return; - TreeScope* treeScope = ScopedStyleResolver::treeScopeFor(document(), cssSheet); - if (!treeScope) + Node* ownerNode = cssSheet->ownerNode(); + if (!ownerNode) return; - ScopedStyleResolver& resolver = treeScope->ensureScopedStyleResolver(); + TreeScope& treeScope = ownerNode->treeScope(); + ScopedStyleResolver& resolver = treeScope.ensureScopedStyleResolver(); document().styleEngine()->addScopedStyleResolver(&resolver); resolver.addRulesFromSheet(cssSheet, *m_medium, this); }