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

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

Issue 2416893002: CSSMediaRule and CSSSupportsRule inherit from CSSConditionRule (Closed)
Patch Set: Fix layout virtual tests 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/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;
+ 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

Powered by Google App Engine
This is Rietveld 408576698