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

Unified Diff: Source/core/css/MediaList.h

Issue 187313005: Move StyleSheet to the oilpan heap using transition types. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove clearParentXYZ methods when compiling with oilpan Created 6 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
« no previous file with comments | « Source/core/css/CSSStyleSheet.cpp ('k') | Source/core/css/MediaList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/MediaList.h
diff --git a/Source/core/css/MediaList.h b/Source/core/css/MediaList.h
index 11b2dd2cb466acf3bd35e42cddc0b8959a275c87..8a835d4d90c99ef43d22d0220f607913ee1d92fe 100644
--- a/Source/core/css/MediaList.h
+++ b/Source/core/css/MediaList.h
@@ -92,8 +92,12 @@ 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; }
+
+#if !ENABLE(OILPAN)
+ void clearParentStyleSheet() { ASSERT(m_parentStyleSheet); m_parentStyleSheet = nullptr; }
void clearParentRule() { ASSERT(m_parentRule); m_parentRule = nullptr; }
+#endif
+
const MediaQuerySet* queries() const { return m_mediaQueries.get(); }
void reattach(MediaQuerySet*);
@@ -106,8 +110,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;
};
« no previous file with comments | « Source/core/css/CSSStyleSheet.cpp ('k') | Source/core/css/MediaList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698