[cssom] Make parentRule and parentStyleSheet not have seemingly conflicting requirements.

Author: Simon Pieters

cssom/Overview.html

@@ -995,7 +995,7 @@ <h4 id="the-cssstylesheet-interface"><span class="secno">6.1.2 </span>The <code
 //
 -->
 
-<p>The <code><a href="#cssstylesheet">CSSStyleSheet</a></code> interface represents a CSS <a href="#css-style-sheet">CSS style sheet</a> rule.</p>
+<p>The <code><a href="#cssstylesheet">CSSStyleSheet</a></code> interface represents a <a href="#css-style-sheet">CSS style sheet</a>.</p>
 <pre class="idl">interface <dfn id="cssstylesheet">CSSStyleSheet</dfn> : <a href="#stylesheet">StyleSheet</a> {
   readonly attribute <a href="#cssrule">CSSRule</a>? <a href="#dom-cssstylesheet-ownerrule" title="dom-CSSStyleSheet-ownerRule">ownerRule</a>;
   readonly attribute <a href="#cssrulelist">CSSRuleList</a> <a href="#dom-cssstylesheet-cssrules" title="dom-CSSStyleSheet-cssRules">cssRules</a>;
@@ -1004,7 +1004,7 @@ <h4 id="the-cssstylesheet-interface"><span class="secno">6.1.2 </span>The <code
 };</pre>
 
 <p>The <dfn id="dom-cssstylesheet-ownerrule" title="dom-CSSStyleSheet-ownerRule"><code>ownerRule</code></dfn> attribute must return the <a href="#concept-css-style-sheet-owner-css-rule" title="concept-css-style-sheet-owner-css-rule">owner
-CSS rule</a> or null if none. If a value other than null is ever returned, than that same value must always be returned on each get access.</p>
+CSS rule</a>. If a value other than null is ever returned, then that same value must always be returned on each get access.</p>
 
 <p>The <dfn id="dom-cssstylesheet-cssrules" title="dom-CSSStyleSheet-cssRules"><code>cssRules</code></dfn> attribute must follow these steps:
 
@@ -1725,12 +1725,12 @@ <h3 id="css-rules"><span class="secno">6.4 </span>CSS Rules</h3>
 This item is initialized when a rule is created, and may change over the lifetime of the rule.</dd>
 
 <dt><dfn id="concept-css-rule-parent-css-rule" title="concept-css-rule-parent-css-rule">parent CSS rule</dfn></dt>
-<dd><p>An optional reference to another, enclosing <a href="#css-rule">CSS rule</a>.
+<dd><p>A reference to an enclosing <a href="#css-rule">CSS rule</a> or null.
 If the rule has an enclosing rule when it is created, then this item is initialized to the enclosing rule; otherwise it is null.
 Subsequent to initialization, this item is reset to null if the rule becomes non-enclosed. Once reset to null, it must never change.</dd>
 
 <dt><dfn id="concept-css-rule-parent-css-style-sheet" title="concept-css-rule-parent-css-style-sheet">parent CSS style sheet</dfn></dt>
-<dd><p>An optional reference to an associated <a href="#css-style-sheet">CSS style sheet</a>.
+<dd><p>A reference to a parent <a href="#css-style-sheet">CSS style sheet</a> or null.
 This item is initialized to reference an associated style sheet when the rule is created. Subsequent to initialization, this item
 is reset to null if the rule becomes disassociated from its initial style sheet. Once reset to null, it must never change.</dd>
 
@@ -1932,13 +1932,13 @@ <h4 id="the-cssrule-interface"><span class="secno">6.4.2 </span>The <code title=
  <li><p>Replace the current object with <var>new rule</var>.</li>
 </ol>
 
-<p>The <dfn id="dom-cssrule-parentrule" title="dom-CSSRule-parentRule"><code>parentRule</code></dfn> attribute must return the nearest enclosing rule of the current rule or null if
-there is none. If a value other than null is ever returned, than that same value must always be returned on each get access.</p>
+<p>The <dfn id="dom-cssrule-parentrule" title="dom-CSSRule-parentRule"><code>parentRule</code></dfn> attribute must return the <a href="#concept-css-rule-parent-css-rule" title="concept-css-rule-parent-css-rule">parent CSS
+rule</a>.</p>
 <p class="note">For example, <code title="">@media</code> can enclose a rule, in which case <code title="dom-CSSRule-parentRule"><a href="#dom-cssrule-parentrule">parentRule</a></code> would
-be non-null; in cases where there is no enclosing rule, <code title="dom-CSSRule-parentRule"><a href="#dom-cssrule-parentrule">ownerRule</a></code> will be null.</p>
+be non-null; in cases where there is no enclosing rule, <code title="dom-CSSRule-parentRule"><a href="#dom-cssrule-parentrule">parentRule</a></code> will be null.</p>
 
-<p>The <dfn id="dom-cssrule-parentstylesheet" title="dom-CSSRule-parentStyleSheet"><code>parentStyleSheet</code></dfn> attribute must return the <code><a href="#cssstylesheet">CSSStyleSheet</a></code> object that contains the
-current rule or null if there is none.</p>
+<p>The <dfn id="dom-cssrule-parentstylesheet" title="dom-CSSRule-parentStyleSheet"><code>parentStyleSheet</code></dfn> attribute must return the
+<a href="#concept-css-rule-parent-css-style-sheet" title="concept-css-rule-parent-css-style-sheet">parent CSS style sheet</a>.</p>
 <p class="note">The only circumstance where null is returned when a rule has been <a href="#remove-a-css-rule" title="remove a CSS rule">removed</a>.</p>
 <p class="note">Removing a <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#node">Node</a></code> that implements the <code><a href="#linkstyle">LinkStyle</a></code> interface from a
 <code class="external" data-anolis-spec="dom"><a href="http://dom.spec.whatwg.org/#document">Document</a></code> instance does not (by itself) cause the <code><a href="#cssstylesheet">CSSStyleSheet</a></code> referenced by a <code><a href="#cssrule">CSSRule</a></code> to be
@@ -1961,7 +1961,8 @@ <h4 id="the-cssstylerule-interface"><span class="secno">6.4.3 </span>The <code t
 
 <pre class="idl">interface <dfn id="cssstylerule">CSSStyleRule</dfn> : <a href="#cssrule">CSSRule</a> {
   attribute DOMString <a href="#dom-cssstylerule-selectortext" title="dom-CSSStyleRule-selectorText">selectorText</a>;
-  [PutForwards=<a href="#dom-cssstyledeclaration-csstext" title="dom-CSSStyleDeclaration-cssText">cssText</a>] readonly attribute <a href="#cssstyledeclaration">CSSStyleDeclaration</a> <a href="#dom-cssstylerule-style" title="dom-CSSStyleRule-style">style</a>;
+  [PutForwards=<a href="#dom-cssstyledeclaration-csstext" title="dom-CSSStyleDeclaration-cssText">cssText</a>] readonly attribute <a href="#cssstyledeclaration">CSSStyleDeclaration</a> <!--
+  --><a href="#dom-cssstylerule-style" title="dom-CSSStyleRule-style">style</a>;
 };</pre>
 
 <p>The <dfn id="dom-cssstylerule-selectortext" title="dom-CSSStyleRule-selectorText"><code>selectorText</code></dfn> attribute, on getting, must return the result of

cssom/Overview.src.html

@@ -918,7 +918,7 @@ <h4>The <code title>CSSStyleSheet</code> Interface</h4>
 //
 -->
 
-<p>The <code>CSSStyleSheet</code> interface represents a CSS <span>CSS style sheet</span> rule.</p>
+<p>The <code>CSSStyleSheet</code> interface represents a <span>CSS style sheet</span>.</p>
 <pre class=idl>interface <dfn>CSSStyleSheet</dfn> : <span>StyleSheet</span> {
   readonly attribute <span>CSSRule</span>? <span title=dom-CSSStyleSheet-ownerRule>ownerRule</span>;
   readonly attribute <span>CSSRuleList</span> <span title=dom-CSSStyleSheet-cssRules>cssRules</span>;
@@ -927,7 +927,7 @@ <h4>The <code title>CSSStyleSheet</code> Interface</h4>
 };</pre>
 
 <p>The <dfn title=dom-CSSStyleSheet-ownerRule><code>ownerRule</code></dfn> attribute must return the <span title=concept-css-style-sheet-owner-css-rule>owner
-CSS rule</span> or null if none. If a value other than null is ever returned, than that same value must always be returned on each get access.</p>
+CSS rule</span>. If a value other than null is ever returned, then that same value must always be returned on each get access.</p>
 
 <p>The <dfn title=dom-CSSStyleSheet-cssRules><code>cssRules</code></dfn> attribute must follow these steps:
 
@@ -1648,12 +1648,12 @@ <h3>CSS Rules</h3>
 This item is initialized when a rule is created, and may change over the lifetime of the rule.</p></dd>
 
 <dt><dfn title=concept-css-rule-parent-css-rule>parent CSS rule</dfn></dt>
-<dd><p>An optional reference to another, enclosing <span>CSS rule</span>.
+<dd><p>A reference to an enclosing <span>CSS rule</span> or null.
 If the rule has an enclosing rule when it is created, then this item is initialized to the enclosing rule; otherwise it is null.
 Subsequent to initialization, this item is reset to null if the rule becomes non-enclosed. Once reset to null, it must never change.</p></dd>
 
 <dt><dfn title=concept-css-rule-parent-css-style-sheet>parent CSS style sheet</dfn></dt>
-<dd><p>An optional reference to an associated <span>CSS style sheet</span>.
+<dd><p>A reference to a parent <span>CSS style sheet</span> or null.
 This item is initialized to reference an associated style sheet when the rule is created. Subsequent to initialization, this item
 is reset to null if the rule becomes disassociated from its initial style sheet. Once reset to null, it must never change.</p></dd>
 
@@ -1855,13 +1855,13 @@ <h4>The <code title>CSSRule</code> Interface</h4>
  <li><p>Replace the current object with <var>new rule</var>.</p></li>
 </ol>
 
-<p>The <dfn title=dom-CSSRule-parentRule><code>parentRule</code></dfn> attribute must return the nearest enclosing rule of the current rule or null if
-there is none. If a value other than null is ever returned, than that same value must always be returned on each get access.</p>
+<p>The <dfn title=dom-CSSRule-parentRule><code>parentRule</code></dfn> attribute must return the <span title=concept-css-rule-parent-css-rule>parent CSS
+rule</span>.</p>
 <p class='note'>For example, <code title>@media</code> can enclose a rule, in which case <code title=dom-CSSRule-parentRule>parentRule</code> would
-be non-null; in cases where there is no enclosing rule, <code title=dom-CSSRule-parentRule>ownerRule</code> will be null.</p>
+be non-null; in cases where there is no enclosing rule, <code title=dom-CSSRule-parentRule>parentRule</code> will be null.</p>
 
-<p>The <dfn title=dom-CSSRule-parentStyleSheet><code>parentStyleSheet</code></dfn> attribute must return the <code>CSSStyleSheet</code> object that contains the
-current rule or null if there is none.</p>
+<p>The <dfn title=dom-CSSRule-parentStyleSheet><code>parentStyleSheet</code></dfn> attribute must return the
+<span title=concept-css-rule-parent-css-style-sheet>parent CSS style sheet</span>.</p>
 <p class='note'>The only circumstance where null is returned when a rule has been <span title="remove a CSS rule">removed</span>.</p>
 <p class='note'>Removing a <code data-anolis-spec=dom>Node</code> that implements the <code>LinkStyle</code> interface from a
 <code data-anolis-spec=dom>Document</code> instance does not (by itself) cause the <code>CSSStyleSheet</code> referenced by a <code>CSSRule</code> to be
@@ -1884,7 +1884,8 @@ <h4>The <code title>CSSStyleRule</code> Interface</h4>
 
 <pre class=idl>interface <dfn>CSSStyleRule</dfn> : <span>CSSRule</span> {
   attribute DOMString <span title=dom-CSSStyleRule-selectorText>selectorText</span>;
-  [PutForwards=<span title=dom-CSSStyleDeclaration-cssText>cssText</span>] readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-CSSStyleRule-style>style</span>;
+  [PutForwards=<span title=dom-CSSStyleDeclaration-cssText>cssText</span>] readonly attribute <span>CSSStyleDeclaration</span> <!--
+  --><span title=dom-CSSStyleRule-style>style</span>;
 };</pre>
 
 <p>The <dfn title=dom-CSSStyleRule-selectorText><code>selectorText</code></dfn> attribute, on getting, must return the result of