Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1326)

Unified Diff: third_party/WebKit/Source/core/css/RuleSet.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 42962a163bd9683a5086e89d1dfbedfc6b8382d0..2f49974e09643aefe52dd83a2fbe79421ae90701 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.cpp
+++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -120,9 +120,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 = (new HeapLinkedStack<RuleData>);
rules->push(ruleData);
}
@@ -248,7 +248,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();
@@ -292,7 +292,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)))
@@ -311,10 +311,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());
@@ -328,7 +328,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);

Powered by Google App Engine
This is Rietveld 408576698