Combine match methods on StyleResolver.

sky/engine/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 221 matching lines @@
 
 void StyleResolver::clearStyleSharingList()
 {
     m_styleSharingLists.resize(0);
 }
 
 StyleResolver::~StyleResolver()
 {
 }
 
-void StyleResolver::matchAuthorRulesForShadowHost(Element* element, ElementRuleCollector& collector, bool includeEmptyRules, Vector<RawPtr<ScopedStyleResolver>, 8>& resolvers, Vector<RawPtr<ScopedStyleResolver>, 8>& resolversInShadowTree)
+void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& collector)
 {
     collector.clearMatchedRules();
     collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult().matchedProperties.size() - 1;
 
+    // TODO(esprehn): Eliminate CascadeScope and CascadeOrder.
     CascadeScope cascadeScope = 0;
     CascadeOrder cascadeOrder = 0;
 
-    for (int j = resolversInShadowTree.size() - 1; j >= 0; --j)
-        resolversInShadowTree.at(j)->collectMatchingAuthorRules(collector, includeEmptyRules, cascadeScope, cascadeOrder++);
+    // TODO(esprehn): Remove this.
+    bool includeEmptyRules = false;
 
-    if (resolvers.isEmpty() || resolvers.first()->treeScope() != element->treeScope())
-        ++cascadeScope;
-    cascadeOrder += resolvers.size();
-    for (unsigned i = 0; i < resolvers.size(); ++i)
-        resolvers.at(i)->collectMatchingAuthorRules(collector, includeEmptyRules, cascadeScope++, --cascadeOrder);
+    // TODO(esprehn): This can only match :host rules, we should just store
+    // them in a separate RuleSet.
+    if (ShadowRoot* shadowRoot = element->shadowRoot())
+        shadowRoot->scopedStyleResolver().collectMatchingAuthorRules(collector, includeEmptyRules, cascadeScope, cascadeOrder++);
+
+    ScopedStyleResolver& resolver = element->treeScope().scopedStyleResolver();
+    resolver.collectMatchingAuthorRules(collector, includeEmptyRules, cascadeScope, cascadeOrder);
 
     collector.sortAndTransferMatchedRules();
 }
-
-void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& collector, bool includeEmptyRules)
-{
-    collector.clearMatchedRules();
-    collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult().matchedProperties.size() - 1;
-
-    Vector<RawPtr<ScopedStyleResolver>, 8> resolvers;
-    resolvers.append(&element->treeScope().scopedStyleResolver());
-
-    Vector<RawPtr<ScopedStyleResolver>, 8> resolversInShadowTree;
-    collectScopedResolversForHostedShadowTrees(element, resolversInShadowTree);
-    if (!resolversInShadowTree.isEmpty()) {
-        matchAuthorRulesForShadowHost(element, collector, includeEmptyRules, resolvers, resolversInShadowTree);
-        return;
-    }
-
-    if (resolvers.isEmpty())
-        return;
-
-    CascadeScope cascadeScope = 0;
-    CascadeOrder cascadeOrder = resolvers.size();
-    for (unsigned i = 0; i < resolvers.size(); ++i, --cascadeOrder) {
-        ScopedStyleResolver* resolver = resolvers.at(i);
-        // FIXME: Need to clarify how to treat style scoped.
-        resolver->collectMatchingAuthorRules(collector, includeEmptyRules, cascadeScope++, resolver->treeScope() == element->treeScope() && resolver->treeScope().rootNode().isShadowRoot() ? 0 : cascadeOrder);
-    }
-
-    collector.sortAndTransferMatchedRules();
-}
 
 void StyleResolver::matchUARules(ElementRuleCollector& collector)
 {
     collector.setMatchingUARules(true);
 
-    matchUARules(collector, &defaultStyles());
-
-    collector.setMatchingUARules(false);
-}
-
-void StyleResolver::matchUARules(ElementRuleCollector& collector, RuleSet* rules)
-{
     collector.clearMatchedRules();
     collector.matchedResult().ranges.lastUARule = collector.matchedResult().matchedProperties.size() - 1;
 
     RuleRange ruleRange = collector.matchedResult().ranges.UARuleRange();
-    collector.collectMatchingRules(MatchRequest(rules), ruleRange);
+    collector.collectMatchingRules(MatchRequest(&defaultStyles()), ruleRange);
 
     collector.sortAndTransferMatchedRules();
+
+    collector.setMatchingUARules(false);
 }
 
 void StyleResolver::matchAllRules(StyleResolverState& state, ElementRuleCollector& collector)
 {
     matchUARules(collector);
-    matchAuthorRules(state.element(), collector, false);
+    matchAuthorRules(state.element(), collector);
 
     if (state.element()->isStyledElement()) {
         if (state.element()->inlineStyle()) {
             // Inline style is immutable as long as there is no CSSOM wrapper.
             bool isInlineStyleCacheable = !state.element()->inlineStyle()->isMutable();
             collector.addElementStyleProperties(state.element()->inlineStyle(), isInlineStyleCacheable);
         }
     }
 }
 
@@ skipping 211 matching lines @@
     applyAnimatedProperties<LowPriorityProperties>(state, activeInterpolationsForTransitions);
 
     // Start loading resources used by animations.
     loadPendingResources(state);
 
     ASSERT(!state.fontBuilder().fontDirty());
 
     return true;
 }
 
-void StyleResolver::collectScopedResolversForHostedShadowTrees(const Element* element, Vector<RawPtr<ScopedStyleResolver>, 8>& resolvers)
-{
-    ElementShadow* shadow = element->shadow();
-    if (!shadow)
-        return;
-
-    // Adding scoped resolver for active shadow roots for shadow host styling.
-    if (ShadowRoot* shadowRoot = shadow->shadowRoot())
-        resolvers.append(&shadowRoot->scopedStyleResolver());
-}
-
 void StyleResolver::styleTreeResolveScopedKeyframesRules(const Element* element, Vector<RawPtr<ScopedStyleResolver>, 8>& resolvers)
 {
     // Add resolvers for shadow roots hosted by the given element.
-    collectScopedResolversForHostedShadowTrees(element, resolvers);
+    if (ShadowRoot* shadowRoot = element->shadowRoot())
+        resolvers.append(&shadowRoot->scopedStyleResolver());
     resolvers.append(&element->treeScope().scopedStyleResolver());
 }
 
 template <StyleResolver::StyleApplicationPass pass>
 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolations)
 {
     for (HashMap<CSSPropertyID, RefPtr<Interpolation> >::const_iterator iter = activeInterpolations.begin(); iter != activeInterpolations.end(); ++iter) {
         CSSPropertyID property = iter->key;
         if (!isPropertyForPass<pass>(property))
             continue;
@@ skipping 279 matching lines @@
 bool StyleResolver::mediaQueryAffectedByViewportChange() const
 {
     for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
         if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression()) != m_viewportDependentMediaQueryResults[i]->result())
             return true;
     }
     return false;
 }
 
 } // namespace blink