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

Unified Diff: third_party/WebKit/Source/core/css/StyleSheetContents.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, 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/StyleSheetContents.h
diff --git a/third_party/WebKit/Source/core/css/StyleSheetContents.h b/third_party/WebKit/Source/core/css/StyleSheetContents.h
index 2f8f5b74c861e14116393adc46607fceb075a164..6c531aee1d7f4a258cf2167f5ff18f18df6b16fc 100644
--- a/third_party/WebKit/Source/core/css/StyleSheetContents.h
+++ b/third_party/WebKit/Source/core/css/StyleSheetContents.h
@@ -46,19 +46,19 @@ class StyleRuleFontFace;
class StyleRuleImport;
class StyleRuleNamespace;
-class CORE_EXPORT StyleSheetContents : public RefCountedWillBeGarbageCollectedFinalized<StyleSheetContents> {
+class CORE_EXPORT StyleSheetContents : public GarbageCollectedFinalized<StyleSheetContents> {
public:
- static PassRefPtrWillBeRawPtr<StyleSheetContents> create(const CSSParserContext& context)
+ static RawPtr<StyleSheetContents> create(const CSSParserContext& context)
{
- return adoptRefWillBeNoop(new StyleSheetContents(0, String(), context));
+ return (new StyleSheetContents(0, String(), context));
}
- static PassRefPtrWillBeRawPtr<StyleSheetContents> create(const String& originalURL, const CSSParserContext& context)
+ static RawPtr<StyleSheetContents> create(const String& originalURL, const CSSParserContext& context)
{
- return adoptRefWillBeNoop(new StyleSheetContents(0, originalURL, context));
+ return (new StyleSheetContents(0, originalURL, context));
}
- static PassRefPtrWillBeRawPtr<StyleSheetContents> create(StyleRuleImport* ownerRule, const String& originalURL, const CSSParserContext& context)
+ static RawPtr<StyleSheetContents> create(StyleRuleImport* ownerRule, const String& originalURL, const CSSParserContext& context)
{
- return adoptRefWillBeNoop(new StyleSheetContents(ownerRule, originalURL, context));
+ return (new StyleSheetContents(ownerRule, originalURL, context));
}
~StyleSheetContents();
@@ -94,17 +94,17 @@ public:
void setHasFontFaceRule(bool b) { m_hasFontFaceRule = b; }
bool hasFontFaceRule() const { return m_hasFontFaceRule; }
- void findFontFaceRules(WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>& fontFaceRules);
+ void findFontFaceRules(HeapVector<Member<const StyleRuleFontFace>>& fontFaceRules);
void parserAddNamespace(const AtomicString& prefix, const AtomicString& uri);
- void parserAppendRule(PassRefPtrWillBeRawPtr<StyleRuleBase>);
+ void parserAppendRule(RawPtr<StyleRuleBase>);
void clearRules();
// Rules other than @import.
- const WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& childRules() const { return m_childRules; }
- const WillBeHeapVector<RefPtrWillBeMember<StyleRuleImport>>& importRules() const { return m_importRules; }
- const WillBeHeapVector<RefPtrWillBeMember<StyleRuleNamespace>>& namespaceRules() const { return m_namespaceRules; }
+ const HeapVector<Member<StyleRuleBase>>& childRules() const { return m_childRules; }
+ const HeapVector<Member<StyleRuleImport>>& importRules() const { return m_importRules; }
+ const HeapVector<Member<StyleRuleNamespace>>& namespaceRules() const { return m_namespaceRules; }
void notifyLoadedSheet(const CSSStyleSheetResource*);
@@ -123,12 +123,12 @@ public:
unsigned estimatedSizeInBytes() const;
- bool wrapperInsertRule(PassRefPtrWillBeRawPtr<StyleRuleBase>, unsigned index);
+ bool wrapperInsertRule(RawPtr<StyleRuleBase>, unsigned index);
bool wrapperDeleteRule(unsigned index);
- PassRefPtrWillBeRawPtr<StyleSheetContents> copy() const
+ RawPtr<StyleSheetContents> copy() const
{
- return adoptRefWillBeNoop(new StyleSheetContents(*this));
+ return (new StyleSheetContents(*this));
}
void registerClient(CSSStyleSheet*);
@@ -169,13 +169,13 @@ private:
Document* clientSingleOwnerDocument() const;
- RawPtrWillBeMember<StyleRuleImport> m_ownerRule;
+ Member<StyleRuleImport> m_ownerRule;
String m_originalURL;
- WillBeHeapVector<RefPtrWillBeMember<StyleRuleImport>> m_importRules;
- WillBeHeapVector<RefPtrWillBeMember<StyleRuleNamespace>> m_namespaceRules;
- WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>> m_childRules;
+ HeapVector<Member<StyleRuleImport>> m_importRules;
+ HeapVector<Member<StyleRuleNamespace>> m_namespaceRules;
+ HeapVector<Member<StyleRuleBase>> m_childRules;
using PrefixNamespaceURIMap = HashMap<AtomicString, AtomicString>;
PrefixNamespaceURIMap m_namespaces;
AtomicString m_defaultNamespace;
@@ -190,10 +190,10 @@ private:
CSSParserContext m_parserContext;
- WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSStyleSheet>> m_loadingClients;
- WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSStyleSheet>> m_completedClients;
+ HeapHashSet<WeakMember<CSSStyleSheet>> m_loadingClients;
+ HeapHashSet<WeakMember<CSSStyleSheet>> m_completedClients;
- OwnPtrWillBeMember<RuleSet> m_ruleSet;
+ Member<RuleSet> m_ruleSet;
String m_sourceMapURL;
};

Powered by Google App Engine
This is Rietveld 408576698