Changeset 163263 in webkit

Timestamp:

Feb 2, 2014, 9:27:02 AM (11 years ago)

Author:

Antti Koivisto

Message:

Remove StyleScopeResolver
​https://bugs.webkit.org/show_bug.cgi?id=128069

Reviewed by Anders Carlsson.

This is dead code.

• CMakeLists.txt:
• GNUmakefile.list.am:
• WebCore.xcodeproj/project.pbxproj:
• css/DocumentRuleSets.cpp:

(WebCore::DocumentRuleSets::appendAuthorStyleSheets):
(WebCore::DocumentRuleSets::collectFeatures):

• css/DocumentRuleSets.h:
• css/ElementRuleCollector.h:

(WebCore::ElementRuleCollector::ElementRuleCollector):

• css/RuleSet.cpp:

(WebCore::RuleSet::addChildRules):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::pushParentElement):
(WebCore::StyleResolver::popParentElement):
(WebCore::StyleResolver::locateSharedStyle):
(WebCore::StyleResolver::styleForElement):

• css/StyleResolver.h:

(WebCore::StyleResolver::document):

• css/StyleScopeResolver.cpp: Removed.
• css/StyleScopeResolver.h: Removed.
• style/StyleResolveTree.cpp:

(WebCore::Style::attachShadowRoot):
(WebCore::Style::resolveShadowTree):

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• css/CSSAllInOne.cpp (modified) (1 diff)
• css/DocumentRuleSets.cpp (modified) (2 diffs)
• css/DocumentRuleSets.h (modified) (2 diffs)
• css/ElementRuleCollector.h (modified) (3 diffs)
• css/RuleSet.cpp (modified) (1 diff)
• css/StyleResolver.cpp (modified) (5 diffs)
• css/StyleResolver.h (modified) (7 diffs)
• css/StyleScopeResolver.cpp (deleted)
• css/StyleScopeResolver.h (deleted)
• style/StyleResolveTree.cpp (modified) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -1105 +1105 @@
     css/StyleRule.cpp
     css/StyleRuleImport.cpp
-    css/StyleScopeResolver.cpp
     css/StyleSheet.cpp
     css/StyleSheetContents.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-02  Antti Koivisto  <antti@apple.com>
+
+        Remove StyleScopeResolver
+        https://bugs.webkit.org/show_bug.cgi?id=128069
+
+        Reviewed by Anders Carlsson.
+
+        This is dead code.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/DocumentRuleSets.cpp:
+        (WebCore::DocumentRuleSets::appendAuthorStyleSheets):
+        (WebCore::DocumentRuleSets::collectFeatures):
+        * css/DocumentRuleSets.h:
+        * css/ElementRuleCollector.h:
+        (WebCore::ElementRuleCollector::ElementRuleCollector):
+        * css/RuleSet.cpp:
+        (WebCore::RuleSet::addChildRules):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::pushParentElement):
+        (WebCore::StyleResolver::popParentElement):
+        (WebCore::StyleResolver::locateSharedStyle):
+        (WebCore::StyleResolver::styleForElement):
+        * css/StyleResolver.h:
+        (WebCore::StyleResolver::document):
+        * css/StyleScopeResolver.cpp: Removed.
+        * css/StyleScopeResolver.h: Removed.
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::attachShadowRoot):
+        (WebCore::Style::resolveShadowTree):
+
 2014-02-02  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2695 +2695 @@
         Source/WebCore/css/StyleRuleImport.cpp \
         Source/WebCore/css/StyleRuleImport.h \
-        Source/WebCore/css/StyleScopeResolver.cpp \
-        Source/WebCore/css/StyleScopeResolver.h \
         Source/WebCore/css/StyleSheet.cpp \
         Source/WebCore/css/StyleSheet.h \

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3725 +3725 @@
                 A7AD2F880EC89D07008AB002 /* LinkHash.h in Headers */ = {isa = PBXBuildFile; fileRef = A7AD2F860EC89D07008AB002 /* LinkHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A7B6E69F0B291A9600D0529F /* DragData.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B6E69D0B291A9600D0529F /* DragData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                A7B761A1161EE526002083D3 /* StyleScopeResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B7619F161EE526002083D3 /* StyleScopeResolver.h */; };
                 A7BBE26611AFB3F20005EA03 /* JSHTMLMeterElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */; };
                 A7BBE26711AFB3F20005EA03 /* JSHTMLMeterElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */; };
@@ -10702 +10701 @@
                 A7B4EA7914C9348400C8F5BF /* JSInternalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternalSettings.h; sourceTree = "<group>"; };
                 A7B6E69D0B291A9600D0529F /* DragData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragData.h; sourceTree = "<group>"; };
-                A7B7619F161EE526002083D3 /* StyleScopeResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleScopeResolver.h; sourceTree = "<group>"; };
                 A7BBE26411AFB3F20005EA03 /* JSHTMLMeterElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLMeterElement.cpp; sourceTree = "<group>"; };
                 A7BBE26511AFB3F20005EA03 /* JSHTMLMeterElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLMeterElement.h; sourceTree = "<group>"; };
@@ -21524 +21522 @@
                                 E4946EAC156E64DD00D3297F /* StyleRuleImport.cpp */,
                                 E4946EAD156E64DD00D3297F /* StyleRuleImport.h */,
-                                A7B7619F161EE526002083D3 /* StyleScopeResolver.h */,
                                 A8EA80050A19516E00A8EF5F /* StyleSheet.cpp */,
                                 A8EA80040A19516E00A8EF5F /* StyleSheet.h */,
@@ -25340 +25337 @@
                                 E4BBED4D14FCDBA1003F0B98 /* StyleRule.h in Headers */,
                                 E4946EAF156E64DD00D3297F /* StyleRuleImport.h in Headers */,
-                                A7B761A1161EE526002083D3 /* StyleScopeResolver.h in Headers */,
                                 A8EA800C0A19516E00A8EF5F /* StyleSheet.h in Headers */,
                                 0F54DCE61881051D003EEDBB /* TextAutoSizing.h in Headers */,

trunk/Source/WebCore/css/CSSAllInOne.cpp

@@ -85 +85 @@
 #include "StylePropertyShorthand.cpp"
 #include "StyleResolver.cpp"
-#include "StyleScopeResolver.cpp"
 #include "ViewportStyleResolver.cpp"

trunk/Source/WebCore/css/DocumentRuleSets.cpp

@@ -94 +94 @@
         if (cssSheet->mediaQueries() && !medium->eval(cssSheet->mediaQueries(), resolver))
             continue;
-        StyleSheetContents& sheet = cssSheet->contents();
-#if ENABLE(SHADOW_DOM)
-        if (const ContainerNode* scope = StyleScopeResolver::scopeFor(cssSheet)) {
-            // FIXME: Remove a dependency to calling a StyleResolver's member function.
-            // If we can avoid calling resolver->ensureScopeResolver() here, we don't have to include "StyleResolver.h".
-            // https://bugs.webkit.org/show_bug.cgi?id=108890
-            resolver->ensureScopeResolver()->ensureRuleSetFor(scope)->addRulesFromSheet(&sheet, *medium, resolver, scope);
-            continue;
-        }
-#endif
-        m_authorStyle->addRulesFromSheet(&sheet, *medium, resolver);
+        m_authorStyle->addRulesFromSheet(&cssSheet->contents(), *medium, resolver);
         inspectorCSSOMWrappers.collectFromStyleSheetIfNeeded(cssSheet);
     }
     m_authorStyle->shrinkToFit();
-    collectFeatures(isViewSource, resolver->scopeResolver());
+    collectFeatures(isViewSource);
 }
 
-void DocumentRuleSets::collectFeatures(bool isViewSource, StyleScopeResolver* scopeResolver)
+void DocumentRuleSets::collectFeatures(bool isViewSource)
 {
     m_features.clear();
@@ -124 +114 @@
         m_features.add(CSSDefaultStyleSheets::viewSourceStyle()->features());
 
-    if (scopeResolver)
-        scopeResolver->collectFeaturesTo(m_features);
     if (m_userStyle)
         m_features.add(m_userStyle->features());

trunk/Source/WebCore/css/DocumentRuleSets.h

@@ -39 +39 @@
 class MediaQueryEvaluator;
 class RuleSet;
-class StyleScopeResolver;
 
 class DocumentRuleSets {
@@ -56 +55 @@
     void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet>>&, MediaQueryEvaluator*, InspectorCSSOMWrappers&, bool isViewSource, StyleResolver*);
 
-    void collectFeatures(bool isViewSource, StyleScopeResolver*);
+    void collectFeatures(bool isViewSource);
 
 private:

trunk/Source/WebCore/css/ElementRuleCollector.h

@@ -38 +38 @@
 class RuleSet;
 class SelectorFilter;
-class StyleScopeResolver;
 
 class ElementRuleCollector {
@@ -46 +45 @@
         , m_ruleSets(styleResolver->ruleSets())
         , m_selectorFilter(styleResolver->selectorFilter())
-        , m_scopeResolver(styleResolver->scopeResolver())
         , m_isPrintStyle(false)
         , m_regionForStyling(0)
@@ -92 +90 @@
     DocumentRuleSets& m_ruleSets;
     SelectorFilter& m_selectorFilter;
-    StyleScopeResolver* m_scopeResolver;
 
     bool m_isPrintStyle;

trunk/Source/WebCore/css/RuleSet.cpp

@@ -307 +307 @@
         }
 #endif
-#if ENABLE(SHADOW_DOM)
-        else if (rule->isHostRule())
-            resolver->addHostRule(static_cast<StyleRuleHost*>(rule), hasDocumentSecurityOrigin, scope);
-#endif
 #if ENABLE(CSS_DEVICE_ADAPTATION)
         else if (rule->isViewportRule() && resolver) {

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -329 +329 @@
     else
         m_selectorFilter.pushParent(parent);
-
-    // Note: We mustn't skip ShadowRoot nodes for the scope stack.
-    if (m_scopeResolver)
-        m_scopeResolver->push(parent, parent->parentOrShadowHostNode());
 }
 
@@ -341 +337 @@
     if (m_selectorFilter.parentStackIsConsistent(parent))
         m_selectorFilter.popParent();
-    if (m_scopeResolver)
-        m_scopeResolver->pop(parent);
-}
-
-void StyleResolver::pushParentShadowRoot(const ShadowRoot* shadowRoot)
-{
-    ASSERT(shadowRoot->hostElement());
-    if (m_scopeResolver)
-        m_scopeResolver->push(shadowRoot, shadowRoot->hostElement());
-}
-
-void StyleResolver::popParentShadowRoot(const ShadowRoot* shadowRoot)
-{
-    ASSERT(shadowRoot->hostElement());
-    if (m_scopeResolver)
-        m_scopeResolver->pop(shadowRoot);
 }
 
@@ -398 +378 @@
 }
 
-inline bool StyleResolver::styleSharingCandidateMatchesHostRules()
-{
-#if ENABLE(SHADOW_DOM)
-    return m_scopeResolver && m_scopeResolver->styleSharingCandidateMatchesHostRules(m_state.element());
-#else
-    return false;
-#endif
-}
-
 bool StyleResolver::classNamesAffectedByRules(const SpaceSplitString& classNames) const
 {
@@ -776 +747 @@
     if (styleSharingCandidateMatchesRuleSet(m_ruleSets.uncommonAttribute()))
         return 0;
-    // Can't share if @host @-rules apply.
-    if (styleSharingCandidateMatchesHostRules())
-        return 0;
     // Tracking child index requires unique style for each node. This may get set by the sibling rule match above.
     if (parentElementPreventsSharing(state.element()->parentElement()))
@@ -840 +808 @@
     CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(element, needsCollection);
     if (needsCollection)
-        m_ruleSets.collectFeatures(document().isViewSource(), m_scopeResolver.get());
+        m_ruleSets.collectFeatures(document().isViewSource());
 
     ElementRuleCollector collector(this, state);

trunk/Source/WebCore/css/StyleResolver.h

@@ -37 +37 @@
 #include "SelectorFilter.h"
 #include "StyleInheritedData.h"
-#include "StyleScopeResolver.h"
 #include "ViewportStyleResolver.h"
 #include <memory>
@@ -78 +77 @@
 class RuleSet;
 class Settings;
-class StyleScopeResolver;
 class StyleImage;
 class StyleKeyframe;
@@ -148 +146 @@
     void pushParentElement(Element*);
     void popParentElement(Element*);
-    void pushParentShadowRoot(const ShadowRoot*);
-    void popParentShadowRoot(const ShadowRoot*);
-#if ENABLE(SHADOW_DOM)
-    void addHostRule(StyleRuleHost* rule, bool hasDocumentSecurityOrigin, const ContainerNode* scope) { ensureScopeResolver()->addHostRule(rule, hasDocumentSecurityOrigin, scope); }
-#endif
 
     PassRef<RenderStyle> styleForElement(Element*, RenderStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing,
@@ -169 +162 @@
     Element* element() { return m_state.element(); }
     Document& document() { return m_document; }
-    StyleScopeResolver* scopeResolver() const { return m_scopeResolver.get(); }
     bool hasParentNode() const { return m_state.parentNode(); }
 
@@ -179 +171 @@
     const DocumentRuleSets& ruleSets() const { return m_ruleSets; }
     SelectorFilter& selectorFilter() { return m_selectorFilter; }
-
-#if ENABLE(SHADOW_DOM)
-    StyleScopeResolver* ensureScopeResolver()
-    {
-        ASSERT(RuntimeEnabledFeatures::sharedFeatures().shadowDOMEnabled());
-        if (!m_scopeResolver)
-            m_scopeResolver = std::make_unique<StyleScopeResolver>();
-        return m_scopeResolver.get();
-    }
-#endif
 
 private:
@@ -194 +176 @@
     RenderStyle* locateSharedStyle();
     bool styleSharingCandidateMatchesRuleSet(RuleSet*);
-    bool styleSharingCandidateMatchesHostRules();
     Node* locateCousinList(Element* parent, unsigned& visitedNodeCount) const;
     StyledElement* findSiblingForStyleSharing(Node*, unsigned& count) const;
@@ -546 +527 @@
     const DeprecatedStyleBuilder& m_deprecatedStyleBuilder;
 
-    std::unique_ptr<StyleScopeResolver> m_scopeResolver;
     CSSToStyleMap m_styleMap;
     InspectorCSSOMWrappers m_inspectorCSSOMWrappers;

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -467 +467 @@
 static void attachShadowRoot(ShadowRoot& shadowRoot)
 {
-    StyleResolver& styleResolver = shadowRoot.document().ensureStyleResolver();
-    styleResolver.pushParentShadowRoot(&shadowRoot);
-
     attachChildren(shadowRoot);
-
-    styleResolver.popParentShadowRoot(&shadowRoot);
 
     shadowRoot.clearNeedsStyleRecalc();
@@ -727 +722 @@
     if (!shadowRoot)
         return;
-    StyleResolver& styleResolver = shadowRoot->document().ensureStyleResolver();
-    styleResolver.pushParentShadowRoot(shadowRoot);
 
     for (Node* child = shadowRoot->firstChild(); child; child = child->nextSibling()) {
         if (child->isTextNode()) {
-            // Current user agent ShadowRoots don't have immediate text children so this branch is never actually taken.
             updateTextStyle(*toText(child));
             continue;
         }
-        resolveTree(*toElement(child), change);
-    }
-
-    styleResolver.popParentShadowRoot(shadowRoot);
+        if (child->isElementNode())
+            resolveTree(*toElement(child), change);
+    }
+
     shadowRoot->clearNeedsStyleRecalc();
     shadowRoot->clearChildNeedsStyleRecalc();