| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 53348df162a2e4dbeb211c5f3735659ab860ba47..c3a09d8e10e1bdc8682161c9866bbff509a25bd6 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -177,14 +177,14 @@ void StyleResolver::initWatchedSelectorRules(const WillBeHeapVector<RefPtrWillBe
|
| m_watchedSelectorsRules->addStyleRule(watchedSelectors[i].get(), RuleHasNoSpecialState);
|
| }
|
|
|
| -void StyleResolver::lazyAppendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet> >& styleSheets)
|
| +void StyleResolver::lazyAppendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& styleSheets)
|
| {
|
| unsigned size = styleSheets.size();
|
| for (unsigned i = firstNew; i < size; ++i)
|
| m_pendingStyleSheets.add(styleSheets[i].get());
|
| }
|
|
|
| -void StyleResolver::removePendingAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet> >& styleSheets)
|
| +void StyleResolver::removePendingAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& styleSheets)
|
| {
|
| for (unsigned i = 0; i < styleSheets.size(); ++i)
|
| m_pendingStyleSheets.remove(styleSheets[i].get());
|
| @@ -216,7 +216,7 @@ void StyleResolver::appendPendingAuthorStyleSheets()
|
| finishAppendAuthorStyleSheets();
|
| }
|
|
|
| -void StyleResolver::appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet> >& styleSheets)
|
| +void StyleResolver::appendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >& styleSheets)
|
| {
|
| // This handles sheets added to the end of the stylesheet list only. In other cases the style resolver
|
| // needs to be reconstructed. To handle insertions too the rule order numbers would need to be updated.
|
| @@ -1022,7 +1022,7 @@ PassRefPtr<StyleRuleList> StyleResolver::styleRulesForElement(Element* element,
|
| return collector.matchedStyleRuleList();
|
| }
|
|
|
| -PassRefPtr<CSSRuleList> StyleResolver::pseudoCSSRulesForElement(Element* element, PseudoId pseudoId, unsigned rulesToInclude)
|
| +PassRefPtrWillBeRawPtr<CSSRuleList> StyleResolver::pseudoCSSRulesForElement(Element* element, PseudoId pseudoId, unsigned rulesToInclude)
|
| {
|
| ASSERT(element);
|
| StyleResolverState state(document(), element);
|
| @@ -1032,7 +1032,7 @@ PassRefPtr<CSSRuleList> StyleResolver::pseudoCSSRulesForElement(Element* element
|
| return collector.matchedCSSRuleList();
|
| }
|
|
|
| -PassRefPtr<CSSRuleList> StyleResolver::cssRulesForElement(Element* element, unsigned rulesToInclude)
|
| +PassRefPtrWillBeRawPtr<CSSRuleList> StyleResolver::cssRulesForElement(Element* element, unsigned rulesToInclude)
|
| {
|
| return pseudoCSSRulesForElement(element, NOPSEUDO, rulesToInclude);
|
| }
|
|
|