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

Unified Diff: third_party/WebKit/Source/core/css/StyleRule.h

Issue 2416893002: CSSMediaRule and CSSSupportsRule inherit from CSSConditionRule (Closed)
Patch Set: Fix tracing Created 4 years, 2 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/StyleRule.h
diff --git a/third_party/WebKit/Source/core/css/StyleRule.h b/third_party/WebKit/Source/core/css/StyleRule.h
index db4533d97373d03a4c629f14efaad15e85537d43..63c8721a0ffe86b23ab95f2987c7bf0411e5003e 100644
--- a/third_party/WebKit/Source/core/css/StyleRule.h
+++ b/third_party/WebKit/Source/core/css/StyleRule.h
@@ -195,7 +195,24 @@ class CORE_EXPORT StyleRuleGroup : public StyleRuleBase {
HeapVector<Member<StyleRuleBase>> m_childRules;
};
-class CORE_EXPORT StyleRuleMedia : public StyleRuleGroup {
+class CORE_EXPORT StyleRuleCondition : public StyleRuleGroup {
+ public:
+ String conditionText() const { return m_conditionText; }
+
+ DEFINE_INLINE_TRACE_AFTER_DISPATCH() {
+ StyleRuleGroup::traceAfterDispatch(visitor);
+ }
+
+ protected:
+ StyleRuleCondition(RuleType, HeapVector<Member<StyleRuleBase>>& adoptRule);
+ StyleRuleCondition(RuleType,
+ const String& conditionText,
+ HeapVector<Member<StyleRuleBase>>& adoptRule);
+ StyleRuleCondition(const StyleRuleCondition&);
+ String m_conditionText;
+};
+
+class CORE_EXPORT StyleRuleMedia : public StyleRuleCondition {
public:
static StyleRuleMedia* create(MediaQuerySet* media,
HeapVector<Member<StyleRuleBase>>& adoptRules) {
@@ -215,7 +232,7 @@ class CORE_EXPORT StyleRuleMedia : public StyleRuleGroup {
Member<MediaQuerySet> m_mediaQueries;
};
-class StyleRuleSupports : public StyleRuleGroup {
+class StyleRuleSupports : public StyleRuleCondition {
public:
static StyleRuleSupports* create(
const String& conditionText,
@@ -225,12 +242,11 @@ class StyleRuleSupports : public StyleRuleGroup {
adoptRules);
}
- String conditionText() const { return m_conditionText; }
bool conditionIsSupported() const { return m_conditionIsSupported; }
StyleRuleSupports* copy() const { return new StyleRuleSupports(*this); }
DEFINE_INLINE_TRACE_AFTER_DISPATCH() {
- StyleRuleGroup::traceAfterDispatch(visitor);
+ StyleRuleCondition::traceAfterDispatch(visitor);
}
private:
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSSupportsRule.idl ('k') | third_party/WebKit/Source/core/css/StyleRule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698