(1) restore CSSCharsetRule;

(2) specify text argument for MediaList constructor;
(3) issue formatting cleanup;

Author: skynavga

cssom/Overview.html

@@ -18,7 +18,7 @@ <h1 id="cssom">CSS Object Model (CSSOM)</h1>
 
    <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 
-   <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 13 August 2012</h2>
+   <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 21 August 2012</h2>
 
    <dl>
 
@@ -83,7 +83,7 @@ <h2 class="no-num no-toc" id="sotd">Status of this Document</h2>
   can be found in the
   <a href="http://www.w3.org/TR/">W3C technical reports index at http://www.w3.org/TR/.</a></em>
 
-  <p class="dontpublish">This is the 13 August 2012 Editor's Draft of CSSOM. Please send comments to
+  <p class="dontpublish">This is the 21 August 2012 Editor's Draft of CSSOM. Please send comments to
   <a href="mailto:www-style@w3.org?subject=%5Bcssom%5D%20">www-style@w3.org</a>
   (<a href="http://lists.w3.org/Archives/Public/www-style/">archived</a>)
   with <samp>[cssom]</samp> at the start of the subject line.
@@ -153,11 +153,12 @@ <h2 class="no-num no-toc" id="toc">Table of Contents</h2>
      <li><a href="#the-cssrulelist-sequence"><span class="secno">6.4.1 </span>The <code>CSSRuleList</code> Sequence</a></li>
      <li><a href="#the-cssrule-interface"><span class="secno">6.4.2 </span>The <code>CSSRule</code> Interface</a></li>
      <li><a href="#the-cssstylerule-interface"><span class="secno">6.4.3 </span>The <code>CSSStyleRule</code> Interface</a></li>
-     <li><a href="#the-cssimportrule-interface"><span class="secno">6.4.4 </span>The <code>CSSImportRule</code> Interface</a></li>
-     <li><a href="#the-cssmediarule-interface"><span class="secno">6.4.5 </span>The <code>CSSMediaRule</code> Interface</a></li>
-     <li><a href="#the-cssfontfacerule-interface"><span class="secno">6.4.6 </span>The <code>CSSFontFaceRule</code> Interface</a></li>
-     <li><a href="#the-csspagerule-interface"><span class="secno">6.4.7 </span>The <code>CSSPageRule</code> Interface</a></li>
-     <li><a href="#the-cssnamespacerule-interface"><span class="secno">6.4.8 </span>The <code>CSSNamespaceRule</code> Interface</a></ol></li>
+     <li><a href="#the-csscharsetrule-interface"><span class="secno">6.4.4 </span>The <code>CSSCharsetRule</code> Interface</a></li>
+     <li><a href="#the-cssimportrule-interface"><span class="secno">6.4.5 </span>The <code>CSSImportRule</code> Interface</a></li>
+     <li><a href="#the-cssmediarule-interface"><span class="secno">6.4.6 </span>The <code>CSSMediaRule</code> Interface</a></li>
+     <li><a href="#the-cssfontfacerule-interface"><span class="secno">6.4.7 </span>The <code>CSSFontFaceRule</code> Interface</a></li>
+     <li><a href="#the-csspagerule-interface"><span class="secno">6.4.8 </span>The <code>CSSPageRule</code> Interface</a></li>
+     <li><a href="#the-cssnamespacerule-interface"><span class="secno">6.4.9 </span>The <code>CSSNamespaceRule</code> Interface</a></ol></li>
    <li><a href="#css-declaration-blocks"><span class="secno">6.5 </span>CSS Declaration Blocks</a>
     <ol class="toc">
      <li><a href="#the-cssstyledeclaration-interface"><span class="secno">6.5.1 </span>The <code>CSSStyleDeclaration</code> Interface</a></ol></li>
@@ -532,7 +533,7 @@ <h3 id="comparing-media-queries"><span class="secno">4.3 </span>Comparing Media
   <h3 id="the-medialist-interface"><span class="secno">4.4 </span>The <code>MediaList</code> Interface</h3>
 
   <p>An object that implements the <a class="idlType" href="#widl-def-MediaList"><code>MediaList</code></a> interface has an associated <dfn id="collection-of-media-queries">collection of media queries</dfn>.</p>
-<pre class="idl"><span class="idlInterface" id="widl-def-MediaList">[Constructor]
+<pre class="idl"><span class="idlInterface" id="widl-def-MediaList">[Constructor(DOMString text)]
 interface <span class="idlInterfaceID">MediaList</span> {
 <span class="idlAttribute">    stringifier attribute <span class="idlAttrType"><a>DOMString</a></span> <span class="idlAttrName"><a href="#widl-MediaList-mediaText">mediaText</a></span>;</span>
 <span class="idlAttribute">    readonly attribute <span class="idlAttrType"><a>unsigned long</a></span> <span class="idlAttrName"><a href="#widl-MediaList-length">length</a></span>;</span>
@@ -541,10 +542,10 @@ <h3 id="the-medialist-interface"><span class="secno">4.4 </span>The <code>MediaL
 <span class="idlMethod">    <span class="idlMethType"><a>void</a></span> <span class="idlMethName"><a href="#widl-MediaList-deleteMedium-void-DOMString-medium">deleteMedium</a></span> (<span class="idlParam"><span class="idlParamType"><a>DOMString</a></span> <span class="idlParamName">medium</span></span>);</span>
 };</span></pre>
 <dl class="constructors">
-<dt class="constructor" id="widl-MediaList-void">
-<code>MediaList</code> ()</dt>
+<dt class="constructor" id="widl-MediaList-DOMString-text">
+<code>MediaList</code> (<span class="idlParam"><span class="idlParamType"><a>DOMString</a></span></span>)</dt>
 <dd>
-<p>To <dfn id="create-a-medialist-object">create a <code>MediaList</code> object</dfn> from a string <var>s</var>, run these steps:</p>   <ol>    <li><p>Create a new <code>MediaList</code> object.</li>    <li><p>Set its <span title="dom-MediaList-mediaText">mediaText</span> attribute to <var>s</var>.</li>    <li><p>Return the newly created <code><code>MediaList</code></code> object.</li>   </ol></dd>
+<p>To <dfn id="create-a-medialist-object">create a <code>MediaList</code> object</dfn> from a string <var>text</var>, run these steps:</p>   <ol>    <li><p>Create a new <code>MediaList</code> object.</li>    <li><p>Set its <span title="dom-MediaList-mediaText">mediaText</span> attribute to <var>text</var>.</li>    <li><p>Return the newly created <code><code>MediaList</code></code> object.</li>   </ol></dd>
 </dl>
 <dl class="attributes">
 <dt class="attribute" id="widl-MediaList-mediaText">
@@ -1525,7 +1526,10 @@ <h3 id="css-rules"><span class="secno">6.4 </span>CSS Rules</h3>
 
   <dl class="switch">
    <dt><code>CSSStyleRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</dd>
+
+   <dt><code>CSSCharsetRule</code></dt>
+   <dd><p class="issue">...</dd>
 
    <dt><code>CSSImportRule</code></dt>
    <dd>
@@ -1544,13 +1548,13 @@ <h3 id="css-rules"><span class="secno">6.4 </span>CSS Rules</h3>
    </dd>
 
    <dt><code>CSSMediaRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</dd>
 
    <dt><code>CSSFontFaceRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</dd>
 
    <dt><code>CSSPageRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</dd>
 
    <dt><code>CSSNamespaceRule</code></dt>
    <dd><p>The literal string "<code>@namespace</code>", followed by a space
@@ -1621,6 +1625,7 @@ <h4 id="the-cssrule-interface"><span class="secno">6.4.2 </span>The <code>CSSRul
   <p>The <code>CSSRule</code> interface represents an abstract, base CSS style rule. Each  distinct CSS style rule type is represented by a distinct interface that  inherits from this interface.</p>
 <pre class="idl"><span class="idlInterface" id="widl-def-CSSRule">interface <span class="idlInterfaceID">CSSRule</span> {
 <span class="idlConst">    const <span class="idlConstType"><a>unsigned short</a></span> <span class="idlConstName"><a href="#widl-CSSRule-STYLE_RULE">STYLE_RULE</a></span> = <span class="idlConstValue">1</span>;</span>
+<span class="idlConst">    const <span class="idlConstType"><a>unsigned short</a></span> <span class="idlConstName"><a href="#widl-CSSRule-CHARSET_RULE">CHARSET_RULE</a></span> = <span class="idlConstValue">2</span>;</span>
 <span class="idlConst">    const <span class="idlConstType"><a>unsigned short</a></span> <span class="idlConstName"><a href="#widl-CSSRule-IMPORT_RULE">IMPORT_RULE</a></span> = <span class="idlConstValue">3</span>;</span>
 <span class="idlConst">    const <span class="idlConstType"><a>unsigned short</a></span> <span class="idlConstName"><a href="#widl-CSSRule-MEDIA_RULE">MEDIA_RULE</a></span> = <span class="idlConstValue">4</span>;</span>
 <span class="idlConst">    const <span class="idlConstType"><a>unsigned short</a></span> <span class="idlConstName"><a href="#widl-CSSRule-FONT_FACE_RULE">FONT_FACE_RULE</a></span> = <span class="idlConstValue">5</span>;</span>
@@ -1636,6 +1641,10 @@ <h4 id="the-cssrule-interface"><span class="secno">6.4.2 </span>The <code>CSSRul
 <code>STYLE_RULE</code> of type <span class="idlConstType"><a>unsigned short</a></span>, with value 1</dt>
 <dd>
 <p>When the value of the <code>type</code> attribute is <code>STYLE_RULE</code>, then the object that implements    this interface must implement the <code>CSSStyleRule</code> interface.</dd>
+<dt class="constant" id="widl-CSSRule-CHARSET_RULE">
+<code>CHARSET_RULE</code> of type <span class="idlConstType"><a>unsigned short</a></span>, with value 2</dt>
+<dd>
+<p>When the value of the <code>type</code> attribute is <code>CHARSET_RULE</code>, then the object that implements    this interface must implement the <code>CSSCharsetRule</code> interface.</dd>
 <dt class="constant" id="widl-CSSRule-IMPORT_RULE">
 <code>IMPORT_RULE</code> of type <span class="idlConstType"><a>unsigned short</a></span>, with value 3</dt>
 <dd>
@@ -1700,7 +1709,13 @@ <h4 id="the-cssstylerule-interface"><span class="secno">6.4.3 </span>The <code>C
 
   <!-- ........................................................................................................................ -->
 
-  <h4 id="the-cssimportrule-interface"><span class="secno">6.4.4 </span>The <code>CSSImportRule</code> Interface</h4>
+  <h4 id="the-csscharsetrule-interface"><span class="secno">6.4.4 </span>The <code>CSSCharsetRule</code> Interface</h4>
+
+  
+
+  <!-- ........................................................................................................................ -->
+
+  <h4 id="the-cssimportrule-interface"><span class="secno">6.4.5 </span>The <code>CSSImportRule</code> Interface</h4>
 
   <p>The <code>CSSImportRule</code> interface represents an <code>@import</code> rule.</p>
 <pre class="idl"><span class="idlInterface" id="widl-def-CSSImportRule">interface <span class="idlInterfaceID">CSSImportRule</span> : <span class="idlSuperclass"><a class="idlType" href="#widl-def-CSSRule"><code>CSSRule</code></a></span> {
@@ -1726,7 +1741,7 @@ <h4 id="the-cssimportrule-interface"><span class="secno">6.4.4 </span>The <code>
 
   <!-- ........................................................................................................................ -->
 
-  <h4 id="the-cssmediarule-interface"><span class="secno">6.4.5 </span>The <code>CSSMediaRule</code> Interface</h4>
+  <h4 id="the-cssmediarule-interface"><span class="secno">6.4.6 </span>The <code>CSSMediaRule</code> Interface</h4>
 
   <p>The <code>CSSMediaRule</code> interface represents a <code>@media</code> rule.</p>
 <pre class="idl"><span class="idlInterface" id="widl-def-CSSMediaRule">interface <span class="idlInterfaceID">CSSMediaRule</span> : <span class="idlSuperclass"><a class="idlType" href="#widl-def-CSSRule"><code>CSSRule</code></a></span> {
@@ -1759,7 +1774,7 @@ <h4 id="the-cssmediarule-interface"><span class="secno">6.4.5 </span>The <code>C
 
   <!-- ........................................................................................................................ -->
 
-  <h4 id="the-cssfontfacerule-interface"><span class="secno">6.4.6 </span>The <code>CSSFontFaceRule</code> Interface</h4>
+  <h4 id="the-cssfontfacerule-interface"><span class="secno">6.4.7 </span>The <code>CSSFontFaceRule</code> Interface</h4>
 
   <p>The <code>CSSFontFaceRule</code> interface represents a <code>@font-face</code> rule.</p>
 <pre class="idl"><span class="idlInterface" id="widl-def-CSSFontFaceRule">interface <span class="idlInterfaceID">CSSFontFaceRule</span> : <span class="idlSuperclass"><a class="idlType" href="#widl-def-CSSRule"><code>CSSRule</code></a></span> {
@@ -1775,7 +1790,7 @@ <h4 id="the-cssfontfacerule-interface"><span class="secno">6.4.6 </span>The <cod
 
   <!-- ........................................................................................................................ -->
 
-  <h4 id="the-csspagerule-interface"><span class="secno">6.4.7 </span>The <code>CSSPageRule</code> Interface</h4>
+  <h4 id="the-csspagerule-interface"><span class="secno">6.4.8 </span>The <code>CSSPageRule</code> Interface</h4>
 
   <p>The <code>CSSPageRule</code> interface represents a <code>@page</code> rule.</p>  <p class="note">Need to define the rules for  <dfn id="parse-a-css-page-selector">parse a CSS page selector</dfn> and  <dfn id="serialize-a-css-page-selector">serialize a CSS page selector</dfn>.</p>
 <pre class="idl"><span class="idlInterface" id="widl-def-CSSPageRule">interface <span class="idlInterfaceID">CSSPageRule</span> : <span class="idlSuperclass"><a class="idlType" href="#widl-def-CSSRule"><code>CSSRule</code></a></span> {
@@ -1796,7 +1811,7 @@ <h4 id="the-csspagerule-interface"><span class="secno">6.4.7 </span>The <code>CS
 
   <!-- ........................................................................................................................ -->
 
-  <h4 id="the-cssnamespacerule-interface"><span class="secno">6.4.8 </span>The <code>CSSNamespaceRule</code> Interface</h4>
+  <h4 id="the-cssnamespacerule-interface"><span class="secno">6.4.9 </span>The <code>CSSNamespaceRule</code> Interface</h4>
 
   <p>The <code>CSSNamespaceRule</code> interface represents a <code>@namespace</code> rule.</p>
 <pre class="idl"><span class="idlInterface" id="widl-def-CSSNamespaceRule">interface <span class="idlInterfaceID">CSSNamespaceRule</span> : <span class="idlSuperclass"><a class="idlType" href="#widl-def-CSSRule"><code>CSSRule</code></a></span> {

cssom/cssom-source

@@ -1297,7 +1297,10 @@
 
   <dl class="switch">
    <dt><code>CSSStyleRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</p></dd>
+
+   <dt><code>CSSCharsetRule</code></dt>
+   <dd><p class="issue">...</p></dd>
 
    <dt><code>CSSImportRule</code></dt>
    <dd>
@@ -1316,13 +1319,13 @@
    </dd>
 
    <dt><code>CSSMediaRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</p></dd>
 
    <dt><code>CSSFontFaceRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</p></dd>
 
    <dt><code>CSSPageRule</code></dt>
-   <dd class="issue">...</dd>
+   <dd><p class="issue">...</p></dd>
 
    <dt><code>CSSNamespaceRule</code></dt>
    <dd><p>The literal string "<code>@namespace</code>", followed by a space
@@ -1397,6 +1400,12 @@
 
   <!-- ........................................................................................................................ -->
 
+  <h4>The <code>CSSCharsetRule</code> Interface</h4>
+
+  <!--{@idl(CSSCharsetRule)}-->
+
+  <!-- ........................................................................................................................ -->
+
   <h4>The <code>CSSImportRule</code> Interface</h4>
 
   <!--{@idl(CSSImportRule)}-->

cssom/idl/CSSCharsetRule.idl

@@ -0,0 +1,11 @@
+[Documentation=
+ "<p>The {@name} {@type} represents an <code>@charset</code> rule.</p>"
+]
+interface CSSCharsetRule : CSSRule {
+
+  [Documentation=
+   "<p>The {@name} {@type} must return the encoding information specified by the <code>@charset</code> rule.</p>"
+  ]
+  attribute DOMString encoding;
+
+};

cssom/idl/CSSRule.idl

@@ -2,9 +2,8 @@
 // All members defined since DOM-2 Style. The only differences are:
 //
 //   1. removal of UNKNOWN_RULE = 0 constant
-//   2. removal of CHARSET_RULE = 2 constant
-//   3. addition of NAMESPACE_RULE = 10 constant
-//   4. removal of commented raises(DOMException) on setting cssText
+//   2. addition of NAMESPACE_RULE = 10 constant
+//   3. removal of commented raises(DOMException) on setting cssText
 //
 
 [Documentation=
@@ -20,6 +19,12 @@ interface CSSRule {
   ]
   const unsigned short STYLE_RULE = 1;
 
+  [Documentation=
+   "<p>When the value of the <code>type</code> attribute is {@name}, then the object that implements\
+    this interface must implement the <code>CSSCharsetRule</code> interface.</p>"
+  ]
+  const unsigned short CHARSET_RULE = 2;
+
   [Documentation=
    "<p>When the value of the <code>type</code> attribute is {@name}, then the object that implements\
     this interface must implement the <code>CSSImportRule</code> interface.</p>"

cssom/idl/MediaList.idl

@@ -9,14 +9,14 @@
 [Documentation=
  "<p>An object that implements the {@link} {@type} has an associated <dfn>collection of media queries</dfn>.</p>",
  [ Documentation=
-   "<p>To <dfn id='create-a-medialist-object'>create a <code>MediaList</code> object</dfn> from a string <var>s</var>, run these steps:</p>\
+   "<p>To <dfn id='create-a-medialist-object'>create a <code>MediaList</code> object</dfn> from a string <var>text</var>, run these steps:</p>\
    <ol>\
     <li><p>Create a new {@name} object.</p></li>\
-    <li><p>Set its <span title='dom-MediaList-mediaText'>mediaText</span> attribute to <var>s</var>.</p></li>\
+    <li><p>Set its <span title='dom-MediaList-mediaText'>mediaText</span> attribute to <var>text</var>.</p></li>\
     <li><p>Return the newly created <code>{@name}</code> object.</p></li>\
    </ol>"
  ]
- Constructor
+ Constructor(DOMString text)
 ]
 interface MediaList {