Index: Source/core/css/MediaList.h |
diff --git a/Source/core/css/MediaList.h b/Source/core/css/MediaList.h |
index 11b2dd2cb466acf3bd35e42cddc0b8959a275c87..08d228c09925a55f106a9f77db67c842ae5e06b8 100644 |
--- a/Source/core/css/MediaList.h |
+++ b/Source/core/css/MediaList.h |
@@ -92,7 +92,7 @@ public: |
// Not part of CSSOM. |
CSSRule* parentRule() const { return m_parentRule; } |
CSSStyleSheet* parentStyleSheet() const { return m_parentStyleSheet; } |
- void clearParentStyleSheet() { ASSERT(m_parentStyleSheet); m_parentStyleSheet = 0; } |
+ void clearParentStyleSheet() { ASSERT(m_parentStyleSheet); m_parentStyleSheet = nullptr; } |
void clearParentRule() { ASSERT(m_parentRule); m_parentRule = nullptr; } |
haraken
2014/03/05 14:21:22
Shall we add #if !ENABLE_OILPAN? The #if will be h
Mads Ager (chromium)
2014/03/05 14:51:16
I'm a little worried about the amount of #if !ENAB
|
const MediaQuerySet* queries() const { return m_mediaQueries.get(); } |
@@ -106,8 +106,8 @@ private: |
MediaList(MediaQuerySet*, CSSRule* parentRule); |
RefPtrWillBeMember<MediaQuerySet> m_mediaQueries; |
- // Cleared in ~CSSStyleSheet destructor. |
- CSSStyleSheet* m_parentStyleSheet; |
+ // Cleared in ~CSSStyleSheet destructor when oilpan is not enabled. |
+ RawPtrWillBeMember<CSSStyleSheet> m_parentStyleSheet; |
// Cleared in the ~CSSMediaRule and ~CSSImportRule destructors when oilpan is not enabled. |
RawPtrWillBeMember<CSSRule> m_parentRule; |
}; |