| Index: Source/core/css/RuleSet.h
|
| diff --git a/Source/core/css/RuleSet.h b/Source/core/css/RuleSet.h
|
| index 517f5446485af74d7e06d074dd2909049b096dac..50550addcc093c80a4be4e68d505deea7eb64011 100644
|
| --- a/Source/core/css/RuleSet.h
|
| +++ b/Source/core/css/RuleSet.h
|
| @@ -138,10 +138,10 @@ public:
|
| const WillBeHeapVector<RuleData>* focusPseudoClassRules() const { ASSERT(!m_pendingRules); return &m_focusPseudoClassRules; }
|
| const WillBeHeapVector<RuleData>* universalRules() const { ASSERT(!m_pendingRules); return &m_universalRules; }
|
| const WillBeHeapVector<RuleData>* shadowHostRules() const { ASSERT(!m_pendingRules); return &m_shadowHostRules; }
|
| - const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >& pageRules() const { ASSERT(!m_pendingRules); return m_pageRules; }
|
| - const WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport> >& viewportRules() const { ASSERT(!m_pendingRules); return m_viewportRules; }
|
| - const WillBeHeapVector<RawPtrWillBeMember<StyleRuleFontFace> >& fontFaceRules() const { return m_fontFaceRules; }
|
| - const WillBeHeapVector<RawPtrWillBeMember<StyleRuleKeyframes> >& keyframesRules() const { return m_keyframesRules; }
|
| + const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage>>& pageRules() const { ASSERT(!m_pendingRules); return m_pageRules; }
|
| + const WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport>>& viewportRules() const { ASSERT(!m_pendingRules); return m_viewportRules; }
|
| + const WillBeHeapVector<RawPtrWillBeMember<StyleRuleFontFace>>& fontFaceRules() const { return m_fontFaceRules; }
|
| + const WillBeHeapVector<RawPtrWillBeMember<StyleRuleKeyframes>>& keyframesRules() const { return m_keyframesRules; }
|
| const WillBeHeapVector<MinimalRuleData>& treeBoundaryCrossingRules() const { return m_treeBoundaryCrossingRules; }
|
| const WillBeHeapVector<MinimalRuleData>& shadowDistributedRules() const { return m_shadowDistributedRules; }
|
| const MediaQueryResultList& viewportDependentMediaQueryResults() const { return m_viewportDependentMediaQueryResults; }
|
| @@ -162,8 +162,8 @@ public:
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - typedef WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData> > > PendingRuleMap;
|
| - typedef WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<WillBeHeapTerminatedArray<RuleData> > > CompactRuleMap;
|
| + typedef WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData>>> PendingRuleMap;
|
| + typedef WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<WillBeHeapTerminatedArray<RuleData>>> CompactRuleMap;
|
|
|
| RuleSet()
|
| : m_ruleCount(0)
|
| @@ -176,7 +176,7 @@ private:
|
| void addFontFaceRule(StyleRuleFontFace*);
|
| void addKeyframesRule(StyleRuleKeyframes*);
|
|
|
| - void addChildRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase> >&, const MediaQueryEvaluator& medium, AddRuleFlags);
|
| + void addChildRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>&, const MediaQueryEvaluator& medium, AddRuleFlags);
|
| bool findBestRuleSetAndAdd(const CSSSelector&, RuleData&);
|
|
|
| void compactRules();
|
| @@ -214,10 +214,10 @@ private:
|
| WillBeHeapVector<RuleData> m_universalRules;
|
| WillBeHeapVector<RuleData> m_shadowHostRules;
|
| RuleFeatureSet m_features;
|
| - WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> > m_pageRules;
|
| - WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport> > m_viewportRules;
|
| - WillBeHeapVector<RawPtrWillBeMember<StyleRuleFontFace> > m_fontFaceRules;
|
| - WillBeHeapVector<RawPtrWillBeMember<StyleRuleKeyframes> > m_keyframesRules;
|
| + WillBeHeapVector<RawPtrWillBeMember<StyleRulePage>> m_pageRules;
|
| + WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport>> m_viewportRules;
|
| + WillBeHeapVector<RawPtrWillBeMember<StyleRuleFontFace>> m_fontFaceRules;
|
| + WillBeHeapVector<RawPtrWillBeMember<StyleRuleKeyframes>> m_keyframesRules;
|
| WillBeHeapVector<MinimalRuleData> m_treeBoundaryCrossingRules;
|
| WillBeHeapVector<MinimalRuleData> m_shadowDistributedRules;
|
|
|
|
|