[cssom] Make 'parse a CSS declaration block' drop invalid stuff, and move that step from 'insert a CSS rule' to 'parse a CSS rule'.

--HG--
extra : rebase_source : fe4abcc1872e73fcd4943936ce55dc4e4422c223

Author: Simon Pieters

cssom/Overview.html

@@ -16,7 +16,7 @@
  <h1>CSS Object Model (CSSOM)</h1>
 
 
- <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 2 September 2013</h2>
+ <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 5 September 2013</h2>
 
  <dl>
 
@@ -90,7 +90,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 2 September 2013 Editor's Draft of CSSOM. Please send comments to
+<p class="dontpublish">This is the 5 September 2013 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.
@@ -1738,8 +1738,15 @@ <h3 id="css-rules"><span class="secno">6.4 </span>CSS Rules</h3>
 <p>In addition to the above state, each <a href="#css-rule">CSS rule</a> may be associated
 with other state in accordance with its <a href="#concept-css-rule-type" title="concept-css-rule-type">type</a>.</p>
 
-<p>To <dfn id="parse-a-css-rule">parse a CSS rule</dfn> from a string <var>string</var>, invoke <a class="external" data-anolis-spec="csssyntax" href="http://dev.w3.org/csswg/css-syntax/#parse-a-rule0">parse a rule</a> with <var>string</var> and return
-the value returned.</p>
+<p>To <dfn id="parse-a-css-rule">parse a CSS rule</dfn> from a string <var>string</var>, run the following steps:
+
+<ol>
+ <li><p>Let <var>rule</var> be the return value of invoking <a class="external" data-anolis-spec="csssyntax" href="http://dev.w3.org/csswg/css-syntax/#parse-a-rule0">parse a rule</a> with <var>string</var>.
+ <li><p>If <var>rule</var> is a syntax error, return <var>rule</var>.
+ <li><p>Let <var>parsed rule</var> be the result of parsing <var>rule</var> according to the appropriate CSS specifications, dropping parts that are said to be
+ ignored. If the whole style rule is dropped, return a syntax error.
+ <li><p>Return <var>parsed rule</var>.
+</ol>
 
 <p>To <dfn id="serialize-a-css-rule">serialize a CSS rule</dfn>, perform one of the following in accordance with the <a href="#css-rule">CSS rule</a>'s
 <a href="#concept-css-rule-type" title="concept-css-rule-type">type</a>:</p>
@@ -1813,8 +1820,6 @@ <h3 id="css-rules"><span class="secno">6.4 </span>CSS Rules</h3>
  on argument <var>rule</var>.
  <li><p>If <var>new rule</var> is a syntax error, <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#concept-throw" title="concept-throw">throw</a>
  a <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#syntaxerror">SyntaxError</a></code> exception.</li>
- <li><p>Parse <var>new rule</var> according to the appropriate CSS specifications, dropping parts that are said to be ignored. If the whole style rule is
- dropped, <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#concept-throw" title="concept-throw">throw</a> a <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#syntaxerror">SyntaxError</a></code> exception.
  <li><p>If <var>new rule</var> is an <code title="">@charset</code> at-rule, <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#concept-throw" title="concept-throw">throw</a> a
  <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#syntaxerror">SyntaxError</a></code> exception.
  <li><p>Set <var>length</var> to the number of items in <var>list</var>.</li>
@@ -2210,8 +2215,19 @@ <h3 id="css-declaration-blocks"><span class="secno">6.6 </span>CSS Declaration B
  null otherwise.
 </dl>
 
-<p>To <dfn id="parse-a-css-declaration-block">parse a CSS declaration block</dfn> from a string <var>string</var>, invoke <a class="external" data-anolis-spec="csssyntax" href="http://dev.w3.org/csswg/css-syntax/#parse-a-list-of-declarations0">parse a list of declarations</a> with
-<var>string</var> and return the value returned.</p>
+<p>To <dfn id="parse-a-css-declaration-block">parse a CSS declaration block</dfn> from a string <var>string</var>, follow these steps:
+
+<ol>
+ <li><p>Let <var>declarations</var> be the return value of invoking <a class="external" data-anolis-spec="csssyntax" href="http://dev.w3.org/csswg/css-syntax/#parse-a-list-of-declarations0">parse a list of declarations</a> with <var>string</var>.
+ <li><p>Let <var>parsed declarations</var> be a new empty list.
+ <li><p>For each item <var>declaration</var> in <var>declarations</var>, follow these substeps:
+  <ol>
+   <li><p>Let <var>parsed declaration</var> be the result of parsing <var>declaration</var> according to the appropriate CSS specifications, dropping parts that
+   are said to be ignored. If the whole declaration is dropped, let <var>parsed declaration</var> be null.
+   <li><p>If <var>parsed declaration</var> is not null, append it to <var>parsed declarations</var>.
+  </ol>
+ <li><p>Return <var>parsed declarations</var>.
+</ol>
 
 <p>To <dfn id="serialize-a-css-declaration">serialize a CSS declaration</dfn> with property name <var>property</var>, value <var>value</var> and optionally an <i>important</i> flag set, follow
 these steps:

cssom/Overview.src.html

@@ -1658,8 +1658,15 @@ <h3>CSS Rules</h3>
 <p>In addition to the above state, each <span>CSS rule</span> may be associated
 with other state in accordance with its <span title=concept-css-rule-type>type</span>.</p>
 
-<p>To <dfn>parse a CSS rule</dfn> from a string <var>string</var>, invoke <span data-anolis-spec=csssyntax>parse a rule</span> with <var>string</var> and return
-the value returned.</p>
+<p>To <dfn>parse a CSS rule</dfn> from a string <var>string</var>, run the following steps:
+
+<ol>
+ <li><p>Let <var>rule</var> be the return value of invoking <span data-anolis-spec=csssyntax>parse a rule</span> with <var>string</var>.
+ <li><p>If <var>rule</var> is a syntax error, return <var>rule</var>.
+ <li><p>Let <var>parsed rule</var> be the result of parsing <var>rule</var> according to the appropriate CSS specifications, dropping parts that are said to be
+ ignored. If the whole style rule is dropped, return a syntax error.
+ <li><p>Return <var>parsed rule</var>.
+</ol>
 
 <p>To <dfn>serialize a CSS rule</dfn>, perform one of the following in accordance with the <span>CSS rule</span>'s
 <span title="concept-css-rule-type">type</span>:</p>
@@ -1733,8 +1740,6 @@ <h3>CSS Rules</h3>
  on argument <var>rule</var>.
  <li><p>If <var>new rule</var> is a syntax error, <span data-anolis-spec='dom' title='concept-throw'>throw</span>
  a <code data-anolis-spec='dom'>SyntaxError</code> exception.</p></li>
- <li><p>Parse <var>new rule</var> according to the appropriate CSS specifications, dropping parts that are said to be ignored. If the whole style rule is
- dropped, <span data-anolis-spec='dom' title='concept-throw'>throw</span> a <code data-anolis-spec='dom'>SyntaxError</code> exception.
  <li><p>If <var>new rule</var> is an <code title>@charset</code> at-rule, <span data-anolis-spec='dom' title='concept-throw'>throw</span> a
  <code data-anolis-spec='dom'>SyntaxError</code> exception.
  <li><p>Set <var>length</var> to the number of items in <var>list</var>.</p></li>
@@ -2130,8 +2135,19 @@ <h3>CSS Declaration Blocks</h3>
  null otherwise.
 </dl>
 
-<p>To <dfn>parse a CSS declaration block</dfn> from a string <var>string</var>, invoke <span data-anolis-spec=csssyntax>parse a list of declarations</span> with
-<var>string</var> and return the value returned.</p>
+<p>To <dfn>parse a CSS declaration block</dfn> from a string <var>string</var>, follow these steps:
+
+<ol>
+ <li><p>Let <var>declarations</var> be the return value of invoking <span data-anolis-spec=csssyntax>parse a list of declarations</span> with <var>string</var>.
+ <li><p>Let <var>parsed declarations</var> be a new empty list.
+ <li><p>For each item <var>declaration</var> in <var>declarations</var>, follow these substeps:
+  <ol>
+   <li><p>Let <var>parsed declaration</var> be the result of parsing <var>declaration</var> according to the appropriate CSS specifications, dropping parts that
+   are said to be ignored. If the whole declaration is dropped, let <var>parsed declaration</var> be null.
+   <li><p>If <var>parsed declaration</var> is not null, append it to <var>parsed declarations</var>.
+  </ol>
+ <li><p>Return <var>parsed declarations</var>.
+</ol>
 
 <p>To <dfn>serialize a CSS declaration</dfn> with property name <var>property</var>, value <var>value</var> and optionally an <i>important</i> flag set, follow
 these steps: