CSSMediaRule and CSSSupportsRule inherit from CSSConditionRule

third_party/WebKit/Source/core/css/CSSMediaRule.cpp

Index: third_party/WebKit/Source/core/css/CSSMediaRule.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSMediaRule.cpp b/third_party/WebKit/Source/core/css/CSSMediaRule.cpp
index fcc0e7763a5a0b81c40bbc05b13799241d02e3de..d540c1a75ad4e49bb691e0dbf3bcf0cd0f0d0d01 100644
--- a/third_party/WebKit/Source/core/css/CSSMediaRule.cpp
+++ b/third_party/WebKit/Source/core/css/CSSMediaRule.cpp
@@ -28,7 +28,7 @@
 namespace blink {
 
 CSSMediaRule::CSSMediaRule(StyleRuleMedia* mediaRule, CSSStyleSheet* parent)
-    : CSSGroupingRule(mediaRule, parent) {}
+    : CSSConditionRule(mediaRule, parent) {}
 
 CSSMediaRule::~CSSMediaRule() {}
 
@@ -49,6 +49,14 @@ String CSSMediaRule::cssText() const {
   return result.toString();
 }
 
+String CSSMediaRule::conditionText() const {
+  StringBuilder result;

[foolip, 2016/10/15 21:02:19]

https://drafts.csswg.org/css-conditional/#the-cssmediarule-interface says "The
conditionText attribute (defined on the CSSConditionRule parent rule), on
getting, must return the value of media.mediaText on the rule", can it be
implemented as just media()->mediaTest(), or is MediaList not to be used
internally?

Tests for this will be needed, if there aren't any already.

+  if (mediaQueries()) {
+    result.append(mediaQueries()->mediaText());
+  }
+  return result.toString();
+}
+
 MediaList* CSSMediaRule::media() const {
   if (!mediaQueries())
     return nullptr;
@@ -59,13 +67,13 @@ MediaList* CSSMediaRule::media() const {
 }
 
 void CSSMediaRule::reattach(StyleRuleBase* rule) {
-  CSSGroupingRule::reattach(rule);
+  CSSConditionRule::reattach(rule);
   if (m_mediaCSSOMWrapper && mediaQueries())
     m_mediaCSSOMWrapper->reattach(mediaQueries());
 }
 
 DEFINE_TRACE(CSSMediaRule) {
   visitor->trace(m_mediaCSSOMWrapper);
-  CSSGroupingRule::trace(visitor);
+  CSSConditionRule::trace(visitor);
 }
 }  // namespace blink