[cssom] Handle shorthands in removeProperty and getPropertyPriority. https://www.w3.org/Bugs/Public/show_bug.cgi?id=21765&list_id=17798

--HG--
extra : rebase_source : ed308d8f03da691a73723fe6a21ca0c2b5f9433f

Author: Simon Pieters

cssom/Overview.html

@@ -2204,6 +2204,7 @@ <h4 id="the-cssstyledeclaration-interface"><span class="secno">6.5.1 </span>The
 
 <p>The <dfn id="dom-cssstyledeclaration-getpropertyvalue" title="dom-CSSStyleDeclaration-getPropertyValue"><code>getPropertyValue(<var>property</var>)</code></dfn> method must run these steps:</p>
 <ol>
+ <!-- XXX handle shorthands better -->
  <li><p>If <var>property</var> is an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII
  case-insensitive</a> match for a property of a declaration in the
  <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>, and that declaration's property
@@ -2221,15 +2222,26 @@ <h4 id="the-cssstyledeclaration-interface"><span class="secno">6.5.1 </span>The
 
 <p>The <dfn id="dom-cssstyledeclaration-getpropertypriority" title="dom-CSSStyleDeclaration-getPropertyPriority"><code>getPropertyPriority(<var>property</var>)</code></dfn> method must run these steps:
 <ol>
- <li><p>If <var>property</var> is an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII
- case-insensitive</a> match for a property of a declaration in the <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a> that has the
- <i>important</i> flag set, and that declaration's
- property is defined to be case-insensitive, return the string "<code title="">important</code>".</p>
- <li><p>If <var>property</var> is a
- <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#case-sensitive">case-sensitive</a> match for a property of a
- declaration in the <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a> that has the
- <i>important</i> flag set, and that declaration's property is defined to be case-sensitive, return
- the string "<code title="">important</code>".</p>
+ <li><p>If <var>property</var> is a shorthand property, follow these substeps:
+  <ol>
+   <li><p>Let <var>list</var> be a new array.
+   <li><p>For each longhand property <var>longhand</var> that <var>property</var> maps to, append the result of invoking
+   <code title="dom-CSSStyleDeclaration-getPropertyPriority"><a href="#dom-cssstyledeclaration-getpropertypriority">getPropertyPriority()</a></code> with <var>longhand</var> as argument to <var>list</var>.
+   <li><p>If all items in <var>list</var> are the string "<code title="">important</code>", return the string "<code title="">important</code>" and terminate these
+   steps.
+  </ol>
+ <li><p>Otherwise, follow these substeps:
+  <ol>
+   <li><p>If <var>property</var> is an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII
+   case-insensitive</a> match for a property of a declaration in the <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a> that has the
+   <i>important</i> flag set, and that declaration's
+   property is defined to be case-insensitive, return the string "<code title="">important</code>".</p>
+   <li><p>If <var>property</var> is a
+   <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#case-sensitive">case-sensitive</a> match for a property of a
+   declaration in the <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a> that has the
+   <i>important</i> flag set, and that declaration's property is defined to be case-sensitive, return
+   the string "<code title="">important</code>".</p>
+  </ol>
  <li><p>Return the empty string.
 </ol>
 <div class="example"><p>E.g. for <code title="">background-color:lime !IMPORTANT</code> the return
@@ -2238,6 +2250,7 @@ <h4 id="the-cssstyledeclaration-interface"><span class="secno">6.5.1 </span>The
 <p>The <dfn id="dom-cssstyledeclaration-setproperty" title="dom-CSSStyleDeclaration-setProperty"><code>setProperty(<var>property</var>, <var>value</var>,
 <var>priority</var>)</code></dfn> method must run these steps:</p>
 <ol>
+ <!-- XXX handle shorthands better -->
  <li><p>If the <a href="#concept-css-declaration-block-readonly-flag" title="concept-css-declaration-block-readonly-flag">readonly flag</a> is set, <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#concept-throw" title="concept-throw">throw</a>
  an <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#nomodificationallowederror">NoModificationAllowedError</a></code> exception and terminate these steps.</li>
  <li><p>If <var>property</var> is not an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII case-insensitive</a> match for a supported property that is defined to be
@@ -2261,12 +2274,17 @@ <h4 id="the-cssstyledeclaration-interface"><span class="secno">6.5.1 </span>The
  a <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#nomodificationallowederror">NoModificationAllowedError</a></code> exception and terminate these steps.</li>
  <li><p>Let <var>value</var> be the return value of invoking <code title="dom-CSSStyleDeclaration-getPropertyValue"><a href="#dom-cssstyledeclaration-getpropertyvalue">getPropertyValue()</a></code>
  with <var>property</var> as argument.
- <li><p>If <var>property</var> is an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII case-insensitive</a> match for a property of a declaration in the
- <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>, and that property is defined to be a case-insensitive property, remove the
- declaration.</li>
- <li><p>If <var>property</var> is a <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#case-sensitive">case-sensitive</a> match for a property of a declaration in the
- <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>, and that property is defined to be a case-sensitive property, remove the
- declaration.</li>
+ <li><p>If <var>property</var> is a shorthand property, for each longhand property <var>longhand</var> that <var>property</var> maps to, invoke
+ <code title="dom-CSSStyleDeclaration-removeProperty"><a href="#dom-cssstyledeclaration-removeproperty">removeProperty()</a></code> with <var>longhand</var> as argument.
+ <li><p>Otherwise, run these substeps:
+  <ol>
+   <li><p>If <var>property</var> is an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII case-insensitive</a> match for a property of a declaration in the
+   <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>, and that property is defined to be a case-insensitive property, remove the
+   declaration.</li>
+   <li><p>If <var>property</var> is a <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#case-sensitive">case-sensitive</a> match for a property of a declaration in the
+   <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>, and that property is defined to be a case-sensitive property, remove the
+   declaration.</li>
+  </ol>
  <li><p>Return <var>value</var>.
 </ol>
 

cssom/Overview.src.html

@@ -2126,6 +2126,7 @@ <h4>The <code title>CSSStyleDeclaration</code> Interface</h4>
 
 <p>The <dfn title=dom-CSSStyleDeclaration-getPropertyValue><code>getPropertyValue(<var>property</var>)</code></dfn> method must run these steps:</p>
 <ol>
+ <!-- XXX handle shorthands better -->
  <li><p>If <var>property</var> is an <span data-anolis-spec=dom>ASCII
  case-insensitive</span> match for a property of a declaration in the
  <span title=concept-css-declaration-block-declarations>declarations</span>, and that declaration's property
@@ -2143,15 +2144,26 @@ <h4>The <code title>CSSStyleDeclaration</code> Interface</h4>
 
 <p>The <dfn title=dom-CSSStyleDeclaration-getPropertyPriority><code>getPropertyPriority(<var>property</var>)</code></dfn> method must run these steps:
 <ol>
- <li><p>If <var>property</var> is an <span data-anolis-spec=dom>ASCII
- case-insensitive</span> match for a property of a declaration in the <span title=concept-css-declaration-block-declarations>declarations</span> that has the
- <i>important</i> flag set, and that declaration's
- property is defined to be case-insensitive, return the string "<code title>important</code>".</p>
- <li><p>If <var>property</var> is a
- <span data-anolis-spec=dom>case-sensitive</span> match for a property of a
- declaration in the <span title=concept-css-declaration-block-declarations>declarations</span> that has the
- <i>important</i> flag set, and that declaration's property is defined to be case-sensitive, return
- the string "<code title>important</code>".</p>
+ <li><p>If <var>property</var> is a shorthand property, follow these substeps:
+  <ol>
+   <li><p>Let <var>list</var> be a new array.
+   <li><p>For each longhand property <var>longhand</var> that <var>property</var> maps to, append the result of invoking
+   <code title=dom-CSSStyleDeclaration-getPropertyPriority>getPropertyPriority()</code> with <var>longhand</var> as argument to <var>list</var>.
+   <li><p>If all items in <var>list</var> are the string "<code title>important</code>", return the string "<code title>important</code>" and terminate these
+   steps.
+  </ol>
+ <li><p>Otherwise, follow these substeps:
+  <ol>
+   <li><p>If <var>property</var> is an <span data-anolis-spec=dom>ASCII
+   case-insensitive</span> match for a property of a declaration in the <span title=concept-css-declaration-block-declarations>declarations</span> that has the
+   <i>important</i> flag set, and that declaration's
+   property is defined to be case-insensitive, return the string "<code title>important</code>".</p>
+   <li><p>If <var>property</var> is a
+   <span data-anolis-spec=dom>case-sensitive</span> match for a property of a
+   declaration in the <span title=concept-css-declaration-block-declarations>declarations</span> that has the
+   <i>important</i> flag set, and that declaration's property is defined to be case-sensitive, return
+   the string "<code title>important</code>".</p>
+  </ol>
  <li><p>Return the empty string.
 </ol>
 <div class='example'><p>E.g. for <code title>background-color:lime !IMPORTANT</code> the return
@@ -2160,6 +2172,7 @@ <h4>The <code title>CSSStyleDeclaration</code> Interface</h4>
 <p>The <dfn title=dom-CSSStyleDeclaration-setProperty><code>setProperty(<var>property</var>, <var>value</var>,
 <var>priority</var>)</code></dfn> method must run these steps:</p>
 <ol>
+ <!-- XXX handle shorthands better -->
  <li><p>If the <span title=concept-css-declaration-block-readonly-flag>readonly flag</span> is set, <span data-anolis-spec=dom title=concept-throw>throw</span>
  an <code data-anolis-spec=dom>NoModificationAllowedError</code> exception and terminate these steps.</li>
  <li><p>If <var>property</var> is not an <span data-anolis-spec=dom>ASCII case-insensitive</span> match for a supported property that is defined to be
@@ -2183,12 +2196,17 @@ <h4>The <code title>CSSStyleDeclaration</code> Interface</h4>
  a <code data-anolis-spec=dom>NoModificationAllowedError</code> exception and terminate these steps.</li>
  <li><p>Let <var>value</var> be the return value of invoking <code title='dom-CSSStyleDeclaration-getPropertyValue'>getPropertyValue()</code>
  with <var>property</var> as argument.
- <li><p>If <var>property</var> is an <span data-anolis-spec=dom>ASCII case-insensitive</span> match for a property of a declaration in the
- <span title=concept-css-declaration-block-declarations>declarations</span>, and that property is defined to be a case-insensitive property, remove the
- declaration.</p></li>
- <li><p>If <var>property</var> is a <span data-anolis-spec=dom>case-sensitive</span> match for a property of a declaration in the
- <span title=concept-css-declaration-block-declarations>declarations</span>, and that property is defined to be a case-sensitive property, remove the
- declaration.</p></li>
+ <li><p>If <var>property</var> is a shorthand property, for each longhand property <var>longhand</var> that <var>property</var> maps to, invoke
+ <code title=dom-CSSStyleDeclaration-removeProperty>removeProperty()</code> with <var>longhand</var> as argument.
+ <li><p>Otherwise, run these substeps:
+  <ol>
+   <li><p>If <var>property</var> is an <span data-anolis-spec=dom>ASCII case-insensitive</span> match for a property of a declaration in the
+   <span title=concept-css-declaration-block-declarations>declarations</span>, and that property is defined to be a case-insensitive property, remove the
+   declaration.</p></li>
+   <li><p>If <var>property</var> is a <span data-anolis-spec=dom>case-sensitive</span> match for a property of a declaration in the
+   <span title=concept-css-declaration-block-declarations>declarations</span>, and that property is defined to be a case-sensitive property, remove the
+   declaration.</p></li>
+  </ol>
  <li><p>Return <var>value</var>.
 </ol>