Treat UA rules like author rules when matching.

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 128 matching lines @@
 
 void StyleResolver::clearStyleSharingList()
 {
     m_styleSharingList.clear();
 }
 
 StyleResolver::~StyleResolver()
 {
 }
 
-void StyleResolver::matchAuthorRules(Element* element, ElementRuleCollector& collector)
+void StyleResolver::matchRules(Element& element, ElementRuleCollector& collector)
 {
     collector.clearMatchedRules();
     collector.matchedResult().ranges.lastAuthorRule = collector.matchedResult().matchedProperties.size() - 1;
 
-    // TODO(esprehn): Eliminate CascadeOrder.
     CascadeOrder cascadeOrder = 0;
 
-    if (ShadowRoot* shadowRoot = element->shadowRoot())
-        shadowRoot->scopedStyleResolver().collectMatchingHostRules(collector, cascadeOrder++);
+    RuleRange ruleRange = collector.matchedResult().ranges.authorRuleRange();
+    collector.collectMatchingRules(MatchRequest(&defaultStyles()), ruleRange, ++cascadeOrder);
 
-    ScopedStyleResolver& resolver = element->treeScope().scopedStyleResolver();
-    resolver.collectMatchingAuthorRules(collector, cascadeOrder);
+    if (ShadowRoot* shadowRoot = element.shadowRoot())
+        shadowRoot->scopedStyleResolver().collectMatchingHostRules(collector, ++cascadeOrder);
+
+    ScopedStyleResolver& resolver = element.treeScope().scopedStyleResolver();
+    resolver.collectMatchingAuthorRules(collector, ++cascadeOrder);
 
     collector.sortAndTransferMatchedRules();
-}
 
-void StyleResolver::matchUARules(ElementRuleCollector& collector)
-{
-    collector.clearMatchedRules();
-    collector.matchedResult().ranges.lastUARule = collector.matchedResult().matchedProperties.size() - 1;
-
-    RuleRange ruleRange = collector.matchedResult().ranges.UARuleRange();
-    collector.collectMatchingRules(MatchRequest(&defaultStyles()), ruleRange);
-
-    collector.sortAndTransferMatchedRules();
-}
-
-void StyleResolver::matchAllRules(StyleResolverState& state, ElementRuleCollector& collector)
-{
-    matchUARules(collector);
-    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);
-        }
+    if (const StylePropertySet* inlineStyle = element.inlineStyle()) {
+        // Inline style is immutable as long as there is no CSSOM wrapper.
+        bool isInlineStyleCacheable = !inlineStyle->isMutable();
+        collector.addElementStyleProperties(inlineStyle, isInlineStyleCacheable);
     }
 }
 
 PassRefPtr<RenderStyle> StyleResolver::styleForDocument(Document& document)
 {
     RefPtr<RenderStyle> documentStyle = RenderStyle::create();
     documentStyle->setDisplay(BLOCK);
     documentStyle->setRTLOrdering(LogicalOrder);
     documentStyle->setLocale(document.contentLanguage());
     documentStyle->setZIndex(0);
@@ skipping 42 matching lines @@
             if (RenderStyle* styleOfShadowHost = parent->renderStyle())
                 state.style()->setUserModify(styleOfShadowHost->userModify());
         }
     }
 
     state.fontBuilder().initForStyleResolve(state.document(), state.style());
 
     {
         ElementRuleCollector collector(state.elementContext(), state.style());
 
-        matchAllRules(state, collector);
+        matchRules(*element, collector);
 
         applyMatchedProperties(state, collector.matchedResult());
     }
 
     // Cache our original display.
     state.style()->setOriginalDisplay(state.style()->display());
 
     StyleAdjuster adjuster;
     adjuster.adjustRenderStyle(state.style(), state.parentStyle(), *element);
 
@@ skipping 428 matching lines @@
                 break;
             default:
                 break;
             }
             StyleBuilder::applyProperty(properties[i].property, state, properties[i].value);
         }
     }
 }
 
 } // namespace blink