| Index: third_party/WebKit/Source/core/css/RuleSet.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp
|
| index fddc66594b2649a166508566ae49c2421eb1731d..d5e59cda71de09741eeb389c867db3eb9ebccd57 100644
|
| --- a/third_party/WebKit/Source/core/css/RuleSet.cpp
|
| +++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
|
| @@ -122,9 +122,9 @@ RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position, A
|
|
|
| void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const RuleData& ruleData)
|
| {
|
| - OwnPtrWillBeMember<WillBeHeapLinkedStack<RuleData>>& rules = map.add(key, nullptr).storedValue->value;
|
| + Member<HeapLinkedStack<RuleData>>& rules = map.add(key, nullptr).storedValue->value;
|
| if (!rules)
|
| - rules = adoptPtrWillBeNoop(new WillBeHeapLinkedStack<RuleData>);
|
| + rules = adoptPtrWillBeNoop(new HeapLinkedStack<RuleData>);
|
| rules->push(ruleData);
|
| }
|
|
|
| @@ -251,7 +251,7 @@ void RuleSet::addKeyframesRule(StyleRuleKeyframes* rule)
|
| m_keyframesRules.append(rule);
|
| }
|
|
|
| -void RuleSet::addChildRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& rules, const MediaQueryEvaluator& medium, AddRuleFlags addRuleFlags)
|
| +void RuleSet::addChildRules(const HeapVector<Member<StyleRuleBase>>& rules, const MediaQueryEvaluator& medium, AddRuleFlags addRuleFlags)
|
| {
|
| for (unsigned i = 0; i < rules.size(); ++i) {
|
| StyleRuleBase* rule = rules[i].get();
|
| @@ -295,7 +295,7 @@ void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, const MediaQueryEvalu
|
|
|
| ASSERT(sheet);
|
|
|
| - const WillBeHeapVector<RefPtrWillBeMember<StyleRuleImport>>& importRules = sheet->importRules();
|
| + const HeapVector<Member<StyleRuleImport>>& importRules = sheet->importRules();
|
| for (unsigned i = 0; i < importRules.size(); ++i) {
|
| StyleRuleImport* importRule = importRules[i].get();
|
| if (importRule->styleSheet() && (!importRule->mediaQueries() || medium.eval(importRule->mediaQueries(), &m_viewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults)))
|
| @@ -314,10 +314,10 @@ void RuleSet::addStyleRule(StyleRule* rule, AddRuleFlags addRuleFlags)
|
| void RuleSet::compactPendingRules(PendingRuleMap& pendingMap, CompactRuleMap& compactMap)
|
| {
|
| for (auto& item : pendingMap) {
|
| - OwnPtrWillBeRawPtr<WillBeHeapLinkedStack<RuleData>> pendingRules = item.value.release();
|
| + RawPtr<HeapLinkedStack<RuleData>> pendingRules = item.value.release();
|
| CompactRuleMap::ValueType* compactRules = compactMap.add(item.key, nullptr).storedValue;
|
|
|
| - WillBeHeapTerminatedArrayBuilder<RuleData> builder(compactRules->value.release());
|
| + HeapTerminatedArrayBuilder<RuleData> builder(compactRules->value.release());
|
| builder.grow(pendingRules->size());
|
| while (!pendingRules->isEmpty()) {
|
| builder.append(pendingRules->peek());
|
| @@ -331,7 +331,7 @@ void RuleSet::compactPendingRules(PendingRuleMap& pendingMap, CompactRuleMap& co
|
| void RuleSet::compactRules()
|
| {
|
| ASSERT(m_pendingRules);
|
| - OwnPtrWillBeRawPtr<PendingRuleMaps> pendingRules = m_pendingRules.release();
|
| + RawPtr<PendingRuleMaps> pendingRules = m_pendingRules.release();
|
| compactPendingRules(pendingRules->idRules, m_idRules);
|
| compactPendingRules(pendingRules->classRules, m_classRules);
|
| compactPendingRules(pendingRules->tagRules, m_tagRules);
|
|
|