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

Unified Diff: third_party/WebKit/Source/core/css/CSSRuleList.h

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, 9 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
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSRule.idl ('k') | third_party/WebKit/Source/core/css/CSSRuleList.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/CSSRuleList.h
diff --git a/third_party/WebKit/Source/core/css/CSSRuleList.h b/third_party/WebKit/Source/core/css/CSSRuleList.h
index 78c660b484eef4e0332155f3fa1afe6551c0d306..50e54660075516832bde922e25ec393fd60fba78 100644
--- a/third_party/WebKit/Source/core/css/CSSRuleList.h
+++ b/third_party/WebKit/Source/core/css/CSSRuleList.h
@@ -33,9 +33,8 @@ namespace blink {
class CSSRule;
class CSSStyleSheet;
-class CSSRuleList : public NoBaseWillBeGarbageCollectedFinalized<CSSRuleList>, public ScriptWrappable {
+class CSSRuleList : public GarbageCollectedFinalized<CSSRuleList>, public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO();
- USING_FAST_MALLOC_WILL_BE_REMOVED(CSSRuleList);
WTF_MAKE_NONCOPYABLE(CSSRuleList);
public:
virtual ~CSSRuleList();
@@ -58,9 +57,9 @@ protected:
class StaticCSSRuleList final : public CSSRuleList {
public:
- static PassRefPtrWillBeRawPtr<StaticCSSRuleList> create()
+ static RawPtr<StaticCSSRuleList> create()
{
- return adoptRefWillBeNoop(new StaticCSSRuleList());
+ return new StaticCSSRuleList();
}
#if !ENABLE(OILPAN)
@@ -68,7 +67,7 @@ public:
void deref() override;
#endif
- WillBeHeapVector<RefPtrWillBeMember<CSSRule>>& rules() { return m_rules; }
+ HeapVector<Member<CSSRule>>& rules() { return m_rules; }
CSSStyleSheet* styleSheet() const override { return 0; }
@@ -81,7 +80,7 @@ private:
unsigned length() const override { return m_rules.size(); }
CSSRule* item(unsigned index) const override { return index < m_rules.size() ? m_rules[index].get() : nullptr; }
- WillBeHeapVector<RefPtrWillBeMember<CSSRule>> m_rules;
+ HeapVector<Member<CSSRule>> m_rules;
#if !ENABLE(OILPAN)
unsigned m_refCount;
#endif
@@ -90,9 +89,9 @@ private:
template <class Rule>
class LiveCSSRuleList final : public CSSRuleList {
public:
- static PassOwnPtrWillBeRawPtr<LiveCSSRuleList> create(Rule* rule)
+ static RawPtr<LiveCSSRuleList> create(Rule* rule)
{
- return adoptPtrWillBeNoop(new LiveCSSRuleList(rule));
+ return new LiveCSSRuleList(rule);
}
#if !ENABLE(OILPAN)
@@ -113,7 +112,7 @@ private:
CSSRule* item(unsigned index) const override { return m_rule->item(index); }
CSSStyleSheet* styleSheet() const override { return m_rule->parentStyleSheet(); }
- RawPtrWillBeMember<Rule> m_rule;
+ Member<Rule> m_rule;
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSRule.idl ('k') | third_party/WebKit/Source/core/css/CSSRuleList.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698