From 66b38d294397bdf8c88e727f0d5c884bd69d6d4a Mon Sep 17 00:00:00 2001 From: Simon Pieters Date: Wed, 12 Apr 2017 16:26:00 +0200 Subject: [PATCH] [cssom][css-conditional] Merge IDL definitions for CSSMediaRule Fixes #851. --- css-conditional/Overview.bs | 10 +++++----- cssom/Overview.bs | 12 ++---------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/css-conditional/Overview.bs b/css-conditional/Overview.bs index 4913fcf1029..766c3278ea8 100644 --- a/css-conditional/Overview.bs +++ b/css-conditional/Overview.bs @@ -927,18 +927,18 @@ interface CSSConditionRule : CSSGroupingRule {

The CSSMediaRule interface

-

The {{CSSMediaRule}} interface represents a ''@media'' rule: +

The {{CSSMediaRule}} interface represents a ''@media'' at-rule:

 interface CSSMediaRule : CSSConditionRule {
-    readonly attribute MediaList media;
+    [SameObject, PutForwards=mediaText] readonly attribute MediaList media;
 };
 
-
media of type MediaList, readonly -
The media attribute must return a MediaList object - for the list of media queries specified with the ''@media'' rule. +
media of type {{MediaList}}, readonly +
The media attribute must return a {{MediaList}} object + for the list of media queries specified with the ''@media'' at-rule.
conditionText of type DOMString (CSSMediaRule-specific definition for attribute on CSSConditionRule)
The conditionText attribute (defined on the CSSConditionRule parent rule), diff --git a/cssom/Overview.bs b/cssom/Overview.bs index 97c84fb667e..0fcfc657607 100644 --- a/cssom/Overview.bs +++ b/cssom/Overview.bs @@ -1696,16 +1696,8 @@ The deleteRule(index) method mu ### The {{CSSMediaRule}} Interface ### {#the-cssmediarule-interface} -The CSSMediaRule interface represents an @media at-rule. - -
-interface CSSMediaRule : CSSGroupingRule {
-  [SameObject, PutForwards=mediaText] readonly attribute MediaList media;
-};
-
- -The media attribute must return a MediaList object for the list of media queries specified -with the @media at-rule. +The {{CSSMediaRule}} interface is defined in CSS Conditional Rules. +[[!CSS3-CONDITIONAL]] ### The {{CSSPageRule}} Interface ### {#the-csspagerule-interface}