Tue, 21 Aug 2012 10:53:59 +0800
(1) restore CSSCharsetRule;
(2) specify text argument for MediaList constructor;
(3) issue formatting cleanup;
1.1 --- a/cssom/Overview.html Mon Aug 20 19:45:53 2012 -0700 1.2 +++ b/cssom/Overview.html Tue Aug 21 10:53:59 2012 +0800 1.3 @@ -18,7 +18,7 @@ 1.4 1.5 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> 1.6 1.7 - <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 13 August 2012</h2> 1.8 + <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 21 August 2012</h2> 1.9 1.10 <dl> 1.11 1.12 @@ -83,7 +83,7 @@ 1.13 can be found in the 1.14 <a href="http://www.w3.org/TR/">W3C technical reports index at http://www.w3.org/TR/.</a></em> 1.15 1.16 - <p class="dontpublish">This is the 13 August 2012 Editor's Draft of CSSOM. Please send comments to 1.17 + <p class="dontpublish">This is the 21 August 2012 Editor's Draft of CSSOM. Please send comments to 1.18 <a href="mailto:www-style@w3.org?subject=%5Bcssom%5D%20">www-style@w3.org</a> 1.19 (<a href="http://lists.w3.org/Archives/Public/www-style/">archived</a>) 1.20 with <samp>[cssom]</samp> at the start of the subject line. 1.21 @@ -153,11 +153,12 @@ 1.22 <li><a href="#the-cssrulelist-sequence"><span class="secno">6.4.1 </span>The <code>CSSRuleList</code> Sequence</a></li> 1.23 <li><a href="#the-cssrule-interface"><span class="secno">6.4.2 </span>The <code>CSSRule</code> Interface</a></li> 1.24 <li><a href="#the-cssstylerule-interface"><span class="secno">6.4.3 </span>The <code>CSSStyleRule</code> Interface</a></li> 1.25 - <li><a href="#the-cssimportrule-interface"><span class="secno">6.4.4 </span>The <code>CSSImportRule</code> Interface</a></li> 1.26 - <li><a href="#the-cssmediarule-interface"><span class="secno">6.4.5 </span>The <code>CSSMediaRule</code> Interface</a></li> 1.27 - <li><a href="#the-cssfontfacerule-interface"><span class="secno">6.4.6 </span>The <code>CSSFontFaceRule</code> Interface</a></li> 1.28 - <li><a href="#the-csspagerule-interface"><span class="secno">6.4.7 </span>The <code>CSSPageRule</code> Interface</a></li> 1.29 - <li><a href="#the-cssnamespacerule-interface"><span class="secno">6.4.8 </span>The <code>CSSNamespaceRule</code> Interface</a></ol></li> 1.30 + <li><a href="#the-csscharsetrule-interface"><span class="secno">6.4.4 </span>The <code>CSSCharsetRule</code> Interface</a></li> 1.31 + <li><a href="#the-cssimportrule-interface"><span class="secno">6.4.5 </span>The <code>CSSImportRule</code> Interface</a></li> 1.32 + <li><a href="#the-cssmediarule-interface"><span class="secno">6.4.6 </span>The <code>CSSMediaRule</code> Interface</a></li> 1.33 + <li><a href="#the-cssfontfacerule-interface"><span class="secno">6.4.7 </span>The <code>CSSFontFaceRule</code> Interface</a></li> 1.34 + <li><a href="#the-csspagerule-interface"><span class="secno">6.4.8 </span>The <code>CSSPageRule</code> Interface</a></li> 1.35 + <li><a href="#the-cssnamespacerule-interface"><span class="secno">6.4.9 </span>The <code>CSSNamespaceRule</code> Interface</a></ol></li> 1.36 <li><a href="#css-declaration-blocks"><span class="secno">6.5 </span>CSS Declaration Blocks</a> 1.37 <ol class="toc"> 1.38 <li><a href="#the-cssstyledeclaration-interface"><span class="secno">6.5.1 </span>The <code>CSSStyleDeclaration</code> Interface</a></ol></li> 1.39 @@ -532,7 +533,7 @@ 1.40 <h3 id="the-medialist-interface"><span class="secno">4.4 </span>The <code>MediaList</code> Interface</h3> 1.41 1.42 <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> 1.43 -<pre class="idl"><span class="idlInterface" id="widl-def-MediaList">[Constructor] 1.44 +<pre class="idl"><span class="idlInterface" id="widl-def-MediaList">[Constructor(DOMString text)] 1.45 interface <span class="idlInterfaceID">MediaList</span> { 1.46 <span class="idlAttribute"> stringifier attribute <span class="idlAttrType"><a>DOMString</a></span> <span class="idlAttrName"><a href="#widl-MediaList-mediaText">mediaText</a></span>;</span> 1.47 <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> 1.48 @@ -541,10 +542,10 @@ 1.49 <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> 1.50 };</span></pre> 1.51 <dl class="constructors"> 1.52 -<dt class="constructor" id="widl-MediaList-void"> 1.53 -<code>MediaList</code> ()</dt> 1.54 +<dt class="constructor" id="widl-MediaList-DOMString-text"> 1.55 +<code>MediaList</code> (<span class="idlParam"><span class="idlParamType"><a>DOMString</a></span></span>)</dt> 1.56 <dd> 1.57 -<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> 1.58 +<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> 1.59 </dl> 1.60 <dl class="attributes"> 1.61 <dt class="attribute" id="widl-MediaList-mediaText"> 1.62 @@ -1525,7 +1526,10 @@ 1.63 1.64 <dl class="switch"> 1.65 <dt><code>CSSStyleRule</code></dt> 1.66 - <dd class="issue">...</dd> 1.67 + <dd><p class="issue">...</dd> 1.68 + 1.69 + <dt><code>CSSCharsetRule</code></dt> 1.70 + <dd><p class="issue">...</dd> 1.71 1.72 <dt><code>CSSImportRule</code></dt> 1.73 <dd> 1.74 @@ -1544,13 +1548,13 @@ 1.75 </dd> 1.76 1.77 <dt><code>CSSMediaRule</code></dt> 1.78 - <dd class="issue">...</dd> 1.79 + <dd><p class="issue">...</dd> 1.80 1.81 <dt><code>CSSFontFaceRule</code></dt> 1.82 - <dd class="issue">...</dd> 1.83 + <dd><p class="issue">...</dd> 1.84 1.85 <dt><code>CSSPageRule</code></dt> 1.86 - <dd class="issue">...</dd> 1.87 + <dd><p class="issue">...</dd> 1.88 1.89 <dt><code>CSSNamespaceRule</code></dt> 1.90 <dd><p>The literal string "<code>@namespace</code>", followed by a space 1.91 @@ -1621,6 +1625,7 @@ 1.92 <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> 1.93 <pre class="idl"><span class="idlInterface" id="widl-def-CSSRule">interface <span class="idlInterfaceID">CSSRule</span> { 1.94 <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> 1.95 +<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> 1.96 <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> 1.97 <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> 1.98 <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> 1.99 @@ -1636,6 +1641,10 @@ 1.100 <code>STYLE_RULE</code> of type <span class="idlConstType"><a>unsigned short</a></span>, with value 1</dt> 1.101 <dd> 1.102 <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> 1.103 +<dt class="constant" id="widl-CSSRule-CHARSET_RULE"> 1.104 +<code>CHARSET_RULE</code> of type <span class="idlConstType"><a>unsigned short</a></span>, with value 2</dt> 1.105 +<dd> 1.106 +<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> 1.107 <dt class="constant" id="widl-CSSRule-IMPORT_RULE"> 1.108 <code>IMPORT_RULE</code> of type <span class="idlConstType"><a>unsigned short</a></span>, with value 3</dt> 1.109 <dd> 1.110 @@ -1700,7 +1709,13 @@ 1.111 1.112 <!-- ........................................................................................................................ --> 1.113 1.114 - <h4 id="the-cssimportrule-interface"><span class="secno">6.4.4 </span>The <code>CSSImportRule</code> Interface</h4> 1.115 + <h4 id="the-csscharsetrule-interface"><span class="secno">6.4.4 </span>The <code>CSSCharsetRule</code> Interface</h4> 1.116 + 1.117 + 1.118 + 1.119 + <!-- ........................................................................................................................ --> 1.120 + 1.121 + <h4 id="the-cssimportrule-interface"><span class="secno">6.4.5 </span>The <code>CSSImportRule</code> Interface</h4> 1.122 1.123 <p>The <code>CSSImportRule</code> interface represents an <code>@import</code> rule.</p> 1.124 <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> { 1.125 @@ -1726,7 +1741,7 @@ 1.126 1.127 <!-- ........................................................................................................................ --> 1.128 1.129 - <h4 id="the-cssmediarule-interface"><span class="secno">6.4.5 </span>The <code>CSSMediaRule</code> Interface</h4> 1.130 + <h4 id="the-cssmediarule-interface"><span class="secno">6.4.6 </span>The <code>CSSMediaRule</code> Interface</h4> 1.131 1.132 <p>The <code>CSSMediaRule</code> interface represents a <code>@media</code> rule.</p> 1.133 <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> { 1.134 @@ -1759,7 +1774,7 @@ 1.135 1.136 <!-- ........................................................................................................................ --> 1.137 1.138 - <h4 id="the-cssfontfacerule-interface"><span class="secno">6.4.6 </span>The <code>CSSFontFaceRule</code> Interface</h4> 1.139 + <h4 id="the-cssfontfacerule-interface"><span class="secno">6.4.7 </span>The <code>CSSFontFaceRule</code> Interface</h4> 1.140 1.141 <p>The <code>CSSFontFaceRule</code> interface represents a <code>@font-face</code> rule.</p> 1.142 <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> { 1.143 @@ -1775,7 +1790,7 @@ 1.144 1.145 <!-- ........................................................................................................................ --> 1.146 1.147 - <h4 id="the-csspagerule-interface"><span class="secno">6.4.7 </span>The <code>CSSPageRule</code> Interface</h4> 1.148 + <h4 id="the-csspagerule-interface"><span class="secno">6.4.8 </span>The <code>CSSPageRule</code> Interface</h4> 1.149 1.150 <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> 1.151 <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> { 1.152 @@ -1796,7 +1811,7 @@ 1.153 1.154 <!-- ........................................................................................................................ --> 1.155 1.156 - <h4 id="the-cssnamespacerule-interface"><span class="secno">6.4.8 </span>The <code>CSSNamespaceRule</code> Interface</h4> 1.157 + <h4 id="the-cssnamespacerule-interface"><span class="secno">6.4.9 </span>The <code>CSSNamespaceRule</code> Interface</h4> 1.158 1.159 <p>The <code>CSSNamespaceRule</code> interface represents a <code>@namespace</code> rule.</p> 1.160 <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> {
2.1 --- a/cssom/cssom-source Mon Aug 20 19:45:53 2012 -0700 2.2 +++ b/cssom/cssom-source Tue Aug 21 10:53:59 2012 +0800 2.3 @@ -1297,7 +1297,10 @@ 2.4 2.5 <dl class="switch"> 2.6 <dt><code>CSSStyleRule</code></dt> 2.7 - <dd class="issue">...</dd> 2.8 + <dd><p class="issue">...</p></dd> 2.9 + 2.10 + <dt><code>CSSCharsetRule</code></dt> 2.11 + <dd><p class="issue">...</p></dd> 2.12 2.13 <dt><code>CSSImportRule</code></dt> 2.14 <dd> 2.15 @@ -1316,13 +1319,13 @@ 2.16 </dd> 2.17 2.18 <dt><code>CSSMediaRule</code></dt> 2.19 - <dd class="issue">...</dd> 2.20 + <dd><p class="issue">...</p></dd> 2.21 2.22 <dt><code>CSSFontFaceRule</code></dt> 2.23 - <dd class="issue">...</dd> 2.24 + <dd><p class="issue">...</p></dd> 2.25 2.26 <dt><code>CSSPageRule</code></dt> 2.27 - <dd class="issue">...</dd> 2.28 + <dd><p class="issue">...</p></dd> 2.29 2.30 <dt><code>CSSNamespaceRule</code></dt> 2.31 <dd><p>The literal string "<code>@namespace</code>", followed by a space 2.32 @@ -1397,6 +1400,12 @@ 2.33 2.34 <!-- ........................................................................................................................ --> 2.35 2.36 + <h4>The <code>CSSCharsetRule</code> Interface</h4> 2.37 + 2.38 + <!--{@idl(CSSCharsetRule)}--> 2.39 + 2.40 + <!-- ........................................................................................................................ --> 2.41 + 2.42 <h4>The <code>CSSImportRule</code> Interface</h4> 2.43 2.44 <!--{@idl(CSSImportRule)}-->
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/cssom/idl/CSSCharsetRule.idl Tue Aug 21 10:53:59 2012 +0800 3.3 @@ -0,0 +1,11 @@ 3.4 +[Documentation= 3.5 + "<p>The {@name} {@type} represents an <code>@charset</code> rule.</p>" 3.6 +] 3.7 +interface CSSCharsetRule : CSSRule { 3.8 + 3.9 + [Documentation= 3.10 + "<p>The {@name} {@type} must return the encoding information specified by the <code>@charset</code> rule.</p>" 3.11 + ] 3.12 + attribute DOMString encoding; 3.13 + 3.14 +};
4.1 --- a/cssom/idl/CSSRule.idl Mon Aug 20 19:45:53 2012 -0700 4.2 +++ b/cssom/idl/CSSRule.idl Tue Aug 21 10:53:59 2012 +0800 4.3 @@ -2,9 +2,8 @@ 4.4 // All members defined since DOM-2 Style. The only differences are: 4.5 // 4.6 // 1. removal of UNKNOWN_RULE = 0 constant 4.7 -// 2. removal of CHARSET_RULE = 2 constant 4.8 -// 3. addition of NAMESPACE_RULE = 10 constant 4.9 -// 4. removal of commented raises(DOMException) on setting cssText 4.10 +// 2. addition of NAMESPACE_RULE = 10 constant 4.11 +// 3. removal of commented raises(DOMException) on setting cssText 4.12 // 4.13 4.14 [Documentation= 4.15 @@ -22,6 +21,12 @@ 4.16 4.17 [Documentation= 4.18 "<p>When the value of the <code>type</code> attribute is {@name}, then the object that implements\ 4.19 + this interface must implement the <code>CSSCharsetRule</code> interface.</p>" 4.20 + ] 4.21 + const unsigned short CHARSET_RULE = 2; 4.22 + 4.23 + [Documentation= 4.24 + "<p>When the value of the <code>type</code> attribute is {@name}, then the object that implements\ 4.25 this interface must implement the <code>CSSImportRule</code> interface.</p>" 4.26 ] 4.27 const unsigned short IMPORT_RULE = 3;
5.1 --- a/cssom/idl/MediaList.idl Mon Aug 20 19:45:53 2012 -0700 5.2 +++ b/cssom/idl/MediaList.idl Tue Aug 21 10:53:59 2012 +0800 5.3 @@ -9,14 +9,14 @@ 5.4 [Documentation= 5.5 "<p>An object that implements the {@link} {@type} has an associated <dfn>collection of media queries</dfn>.</p>", 5.6 [ Documentation= 5.7 - "<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>\ 5.8 + "<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>\ 5.9 <ol>\ 5.10 <li><p>Create a new {@name} object.</p></li>\ 5.11 - <li><p>Set its <span title='dom-MediaList-mediaText'>mediaText</span> attribute to <var>s</var>.</p></li>\ 5.12 + <li><p>Set its <span title='dom-MediaList-mediaText'>mediaText</span> attribute to <var>text</var>.</p></li>\ 5.13 <li><p>Return the newly created <code>{@name}</code> object.</p></li>\ 5.14 </ol>" 5.15 ] 5.16 - Constructor 5.17 + Constructor(DOMString text) 5.18 ] 5.19 interface MediaList { 5.20