diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/css/PageRuleCollector.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/css/PageRuleCollector.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/third_party/WebKit/Source/core/css/PageRuleCollector.cpp b/chromium/third_party/WebKit/Source/core/css/PageRuleCollector.cpp index e4494526d30..3e8c76f8919 100644 --- a/chromium/third_party/WebKit/Source/core/css/PageRuleCollector.cpp +++ b/chromium/third_party/WebKit/Source/core/css/PageRuleCollector.cpp @@ -73,7 +73,7 @@ void PageRuleCollector::matchPageRules(RuleSet* rules) return; rules->compactRulesIfNeeded(); - Vector<StyleRulePage*> matchedPageRules; + WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> > matchedPageRules; matchPageRulesForList(matchedPageRules, rules->pageRules(), m_isLeftPage, m_isFirstPage, m_pageName); if (matchedPageRules.isEmpty()) return; @@ -81,13 +81,13 @@ void PageRuleCollector::matchPageRules(RuleSet* rules) std::stable_sort(matchedPageRules.begin(), matchedPageRules.end(), comparePageRules); for (unsigned i = 0; i < matchedPageRules.size(); i++) - m_result.addMatchedProperties(matchedPageRules[i]->properties()); + m_result.addMatchedProperties(&matchedPageRules[i]->properties()); } static bool checkPageSelectorComponents(const CSSSelector* selector, bool isLeftPage, bool isFirstPage, const String& pageName) { for (const CSSSelector* component = selector; component; component = component->tagHistory()) { - if (component->m_match == CSSSelector::Tag) { + if (component->match() == CSSSelector::Tag) { const AtomicString& localName = component->tagQName().localName(); if (localName != starAtom && localName != pageName) return false; @@ -104,7 +104,7 @@ static bool checkPageSelectorComponents(const CSSSelector* selector, bool isLeft return true; } -void PageRuleCollector::matchPageRulesForList(Vector<StyleRulePage*>& matchedRules, const Vector<StyleRulePage*>& rules, bool isLeftPage, bool isFirstPage, const String& pageName) +void PageRuleCollector::matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >& rules, bool isLeftPage, bool isFirstPage, const String& pageName) { for (unsigned i = 0; i < rules.size(); ++i) { StyleRulePage* rule = rules[i]; @@ -113,8 +113,8 @@ void PageRuleCollector::matchPageRulesForList(Vector<StyleRulePage*>& matchedRul continue; // If the rule has no properties to apply, then ignore it. - const StylePropertySet* properties = rule->properties(); - if (!properties || properties->isEmpty()) + const StylePropertySet& properties = rule->properties(); + if (properties.isEmpty()) continue; // Add this rule to our list of matched rules. |