| Index: Source/core/css/resolver/StyleResolver.h
|
| diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h
|
| index 07290b93b09713f07b1d8b86dfeb0b8f6d5f9e94..76bda55895f20e7c816eb91ed29af03153665921 100644
|
| --- a/Source/core/css/resolver/StyleResolver.h
|
| +++ b/Source/core/css/resolver/StyleResolver.h
|
| @@ -37,6 +37,7 @@
|
| #include "core/css/resolver/StyleBuilder.h"
|
| #include "core/css/resolver/StyleResolverState.h"
|
| #include "core/css/resolver/StyleResourceLoader.h"
|
| +#include "heap/Handle.h"
|
| #include "wtf/Deque.h"
|
| #include "wtf/HashMap.h"
|
| #include "wtf/HashSet.h"
|
| @@ -137,15 +138,15 @@ public:
|
|
|
| // FIXME: It could be better to call appendAuthorStyleSheets() directly after we factor StyleResolver further.
|
| // https://bugs.webkit.org/show_bug.cgi?id=108890
|
| - void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet> >&);
|
| + void appendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >&);
|
| void resetAuthorStyle(const ContainerNode*);
|
| void finishAppendAuthorStyleSheets();
|
|
|
| TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBoundaryCrossingRules; }
|
| void processScopedRules(const RuleSet& authorRules, const KURL&, ContainerNode* scope = 0);
|
|
|
| - void lazyAppendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyleSheet> >&);
|
| - void removePendingAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet> >&);
|
| + void lazyAppendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >&);
|
| + void removePendingAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet> >&);
|
| void appendPendingAuthorStyleSheets();
|
| bool hasPendingAuthorStyleSheets() const { return m_pendingStyleSheets.size() > 0 || m_needCollectFeatures; }
|
|
|
| @@ -176,8 +177,8 @@ public:
|
| AllButEmptyCSSRules = UAAndUserCSSRules | AuthorCSSRules | CrossOriginCSSRules,
|
| AllCSSRules = AllButEmptyCSSRules | EmptyCSSRules,
|
| };
|
| - PassRefPtr<CSSRuleList> cssRulesForElement(Element*, unsigned rulesToInclude = AllButEmptyCSSRules);
|
| - PassRefPtr<CSSRuleList> pseudoCSSRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);
|
| + PassRefPtrWillBeRawPtr<CSSRuleList> cssRulesForElement(Element*, unsigned rulesToInclude = AllButEmptyCSSRules);
|
| + PassRefPtrWillBeRawPtr<CSSRuleList> pseudoCSSRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);
|
| PassRefPtr<StyleRuleList> styleRulesForElement(Element*, unsigned rulesToInclude);
|
|
|
| // |properties| is an array with |count| elements.
|
|
|