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

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

Issue 1858753003: Remove RawPtr from core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp b/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
index 8da1f3777bb9a99dae97aa86be72ac69f39e27ac..a811fe1e99b3efba598d497f926ce155f00f97b2 100644
--- a/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
+++ b/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
@@ -46,7 +46,7 @@ namespace blink {
class StyleSheetCSSRuleList final : public CSSRuleList {
public:
- static RawPtr<StyleSheetCSSRuleList> create(CSSStyleSheet* sheet)
+ static StyleSheetCSSRuleList* create(CSSStyleSheet* sheet)
{
return new StyleSheetCSSRuleList(sheet);
}
@@ -90,30 +90,30 @@ static bool isAcceptableCSSStyleSheetParent(Node* parentNode)
}
#endif
-RawPtr<CSSStyleSheet> CSSStyleSheet::create(RawPtr<StyleSheetContents> sheet, CSSImportRule* ownerRule)
+CSSStyleSheet* CSSStyleSheet::create(StyleSheetContents* sheet, CSSImportRule* ownerRule)
{
return new CSSStyleSheet(sheet, ownerRule);
}
-RawPtr<CSSStyleSheet> CSSStyleSheet::create(RawPtr<StyleSheetContents> sheet, Node* ownerNode)
+CSSStyleSheet* CSSStyleSheet::create(StyleSheetContents* sheet, Node* ownerNode)
{
return new CSSStyleSheet(sheet, ownerNode, false, TextPosition::minimumPosition());
}
-RawPtr<CSSStyleSheet> CSSStyleSheet::createInline(RawPtr<StyleSheetContents> sheet, Node* ownerNode, const TextPosition& startPosition)
+CSSStyleSheet* CSSStyleSheet::createInline(StyleSheetContents* sheet, Node* ownerNode, const TextPosition& startPosition)
{
ASSERT(sheet);
return new CSSStyleSheet(sheet, ownerNode, true, startPosition);
}
-RawPtr<CSSStyleSheet> CSSStyleSheet::createInline(Node* ownerNode, const KURL& baseURL, const TextPosition& startPosition, const String& encoding)
+CSSStyleSheet* CSSStyleSheet::createInline(Node* ownerNode, const KURL& baseURL, const TextPosition& startPosition, const String& encoding)
{
CSSParserContext parserContext(ownerNode->document(), 0, baseURL, encoding);
- RawPtr<StyleSheetContents> sheet = StyleSheetContents::create(baseURL.getString(), parserContext);
- return new CSSStyleSheet(sheet.release(), ownerNode, true, startPosition);
+ StyleSheetContents* sheet = StyleSheetContents::create(baseURL.getString(), parserContext);
+ return new CSSStyleSheet(sheet, ownerNode, true, startPosition);
}
-CSSStyleSheet::CSSStyleSheet(RawPtr<StyleSheetContents> contents, CSSImportRule* ownerRule)
+CSSStyleSheet::CSSStyleSheet(StyleSheetContents* contents, CSSImportRule* ownerRule)
: m_contents(contents)
, m_isInlineStylesheet(false)
, m_isDisabled(false)
@@ -125,7 +125,7 @@ CSSStyleSheet::CSSStyleSheet(RawPtr<StyleSheetContents> contents, CSSImportRule*
m_contents->registerClient(this);
}
-CSSStyleSheet::CSSStyleSheet(RawPtr<StyleSheetContents> contents, Node* ownerNode, bool isInlineStylesheet, const TextPosition& startPosition)
+CSSStyleSheet::CSSStyleSheet(StyleSheetContents* contents, Node* ownerNode, bool isInlineStylesheet, const TextPosition& startPosition)
: m_contents(contents)
, m_isInlineStylesheet(isInlineStylesheet)
, m_isDisabled(false)
@@ -222,7 +222,7 @@ void CSSStyleSheet::setDisabled(bool disabled)
didMutate();
}
-void CSSStyleSheet::setMediaQueries(RawPtr<MediaQuerySet> mediaQueries)
+void CSSStyleSheet::setMediaQueries(MediaQuerySet* mediaQueries)
{
m_mediaQueries = mediaQueries;
if (m_mediaCSSOMWrapper && m_mediaQueries)
@@ -276,7 +276,7 @@ bool CSSStyleSheet::canAccessRules() const
return false;
}
-RawPtr<CSSRuleList> CSSStyleSheet::rules()
+CSSRuleList* CSSStyleSheet::rules()
{
return cssRules();
}
@@ -290,7 +290,7 @@ unsigned CSSStyleSheet::insertRule(const String& ruleString, unsigned index, Exc
return 0;
}
CSSParserContext context(m_contents->parserContext(), UseCounter::getFrom(this));
- RawPtr<StyleRuleBase> rule = CSSParser::parseRule(context, m_contents.get(), ruleString);
+ StyleRuleBase* rule = CSSParser::parseRule(context, m_contents.get(), ruleString);
if (!rule) {
exceptionState.throwDOMException(SyntaxError, "Failed to parse the rule '" + ruleString + "'.");
@@ -362,7 +362,7 @@ int CSSStyleSheet::addRule(const String& selector, const String& style, Exceptio
}
-RawPtr<CSSRuleList> CSSStyleSheet::cssRules()
+CSSRuleList* CSSStyleSheet::cssRules()
{
if (!canAccessRules())
return nullptr;
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSStyleSheet.h ('k') | third_party/WebKit/Source/core/css/CSSStyleSheetResourceTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698