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

Unified Diff: third_party/WebKit/Source/core/css/CSSStyleSheet.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
Index: third_party/WebKit/Source/core/css/CSSStyleSheet.h
diff --git a/third_party/WebKit/Source/core/css/CSSStyleSheet.h b/third_party/WebKit/Source/core/css/CSSStyleSheet.h
index 2bd2368d3be47ff5f8edb290addf0035123272f6..cbe6791ee28ea559d4bf3579fbff0ec882a70a93 100644
--- a/third_party/WebKit/Source/core/css/CSSStyleSheet.h
+++ b/third_party/WebKit/Source/core/css/CSSStyleSheet.h
@@ -48,10 +48,10 @@ enum StyleSheetUpdateType {
class CORE_EXPORT CSSStyleSheet final : public StyleSheet {
DEFINE_WRAPPERTYPEINFO();
public:
- static PassRefPtrWillBeRawPtr<CSSStyleSheet> create(PassRefPtrWillBeRawPtr<StyleSheetContents>, CSSImportRule* ownerRule = 0);
- static PassRefPtrWillBeRawPtr<CSSStyleSheet> create(PassRefPtrWillBeRawPtr<StyleSheetContents>, Node* ownerNode);
- static PassRefPtrWillBeRawPtr<CSSStyleSheet> createInline(Node*, const KURL&, const TextPosition& startPosition = TextPosition::minimumPosition(), const String& encoding = String());
- static PassRefPtrWillBeRawPtr<CSSStyleSheet> createInline(PassRefPtrWillBeRawPtr<StyleSheetContents>, Node* ownerNode, const TextPosition& startPosition = TextPosition::minimumPosition());
+ static RawPtr<CSSStyleSheet> create(RawPtr<StyleSheetContents>, CSSImportRule* ownerRule = 0);
+ static RawPtr<CSSStyleSheet> create(RawPtr<StyleSheetContents>, Node* ownerNode);
+ static RawPtr<CSSStyleSheet> createInline(Node*, const KURL&, const TextPosition& startPosition = TextPosition::minimumPosition(), const String& encoding = String());
+ static RawPtr<CSSStyleSheet> createInline(RawPtr<StyleSheetContents>, Node* ownerNode, const TextPosition& startPosition = TextPosition::minimumPosition());
~CSSStyleSheet() override;
@@ -63,13 +63,13 @@ public:
bool disabled() const override { return m_isDisabled; }
void setDisabled(bool) override;
- PassRefPtrWillBeRawPtr<CSSRuleList> cssRules();
+ RawPtr<CSSRuleList> cssRules();
unsigned insertRule(const String& rule, unsigned index, ExceptionState&);
unsigned insertRule(const String& rule, ExceptionState&); // Deprecated.
void deleteRule(unsigned index, ExceptionState&);
// IE Extensions
- PassRefPtrWillBeRawPtr<CSSRuleList> rules();
+ RawPtr<CSSRuleList> rules();
int addRule(const String& selector, const String& style, int index, ExceptionState&);
int addRule(const String& selector, const String& style, ExceptionState&);
void removeRule(unsigned index, ExceptionState& exceptionState) { deleteRule(index, exceptionState); }
@@ -87,7 +87,7 @@ public:
void clearOwnerRule() { m_ownerRule = nullptr; }
Document* ownerDocument() const;
MediaQuerySet* mediaQueries() const { return m_mediaQueries.get(); }
- void setMediaQueries(PassRefPtrWillBeRawPtr<MediaQuerySet>);
+ void setMediaQueries(RawPtr<MediaQuerySet>);
void setTitle(const String& title) { m_title = title; }
// Set by LinkStyle iff CORS-enabled fetch of stylesheet succeeded from this origin.
void setAllowRuleAccessFromOrigin(PassRefPtr<SecurityOrigin> allowedOrigin);
@@ -101,7 +101,7 @@ public:
~RuleMutationScope();
private:
- RawPtrWillBeMember<CSSStyleSheet> m_styleSheet;
+ Member<CSSStyleSheet> m_styleSheet;
};
void willMutateRules();
@@ -121,8 +121,8 @@ public:
DECLARE_VIRTUAL_TRACE();
private:
- CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents>, CSSImportRule* ownerRule);
- CSSStyleSheet(PassRefPtrWillBeRawPtr<StyleSheetContents>, Node* ownerNode, bool isInlineStylesheet, const TextPosition& startPosition);
+ CSSStyleSheet(RawPtr<StyleSheetContents>, CSSImportRule* ownerRule);
+ CSSStyleSheet(RawPtr<StyleSheetContents>, Node* ownerNode, bool isInlineStylesheet, const TextPosition& startPosition);
bool isCSSStyleSheet() const override { return true; }
String type() const override { return "text/css"; }
@@ -133,22 +133,22 @@ private:
void setLoadCompleted(bool);
- RefPtrWillBeMember<StyleSheetContents> m_contents;
+ Member<StyleSheetContents> m_contents;
bool m_isInlineStylesheet;
bool m_isDisabled;
String m_title;
- RefPtrWillBeMember<MediaQuerySet> m_mediaQueries;
+ Member<MediaQuerySet> m_mediaQueries;
RefPtr<SecurityOrigin> m_allowRuleAccessFromOrigin;
- RawPtrWillBeMember<Node> m_ownerNode;
- RawPtrWillBeMember<CSSRule> m_ownerRule;
+ Member<Node> m_ownerNode;
+ Member<CSSRule> m_ownerRule;
TextPosition m_startPosition;
bool m_loadCompleted;
- mutable RefPtrWillBeMember<MediaList> m_mediaCSSOMWrapper;
- mutable WillBeHeapVector<RefPtrWillBeMember<CSSRule>> m_childRuleCSSOMWrappers;
- mutable OwnPtrWillBeMember<CSSRuleList> m_ruleListCSSOMWrapper;
+ mutable Member<MediaList> m_mediaCSSOMWrapper;
+ mutable HeapVector<Member<CSSRule>> m_childRuleCSSOMWrappers;
+ mutable Member<CSSRuleList> m_ruleListCSSOMWrapper;
};
inline CSSStyleSheet::RuleMutationScope::RuleMutationScope(CSSStyleSheet* sheet)
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSStyleRule.cpp ('k') | third_party/WebKit/Source/core/css/CSSStyleSheet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698