merge from tip

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 21 August 2012</h2>
+   <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 31 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 21 August 2012 Editor's Draft of CSSOM. Please send comments to
+  <p class="dontpublish">This is the 31 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.
@@ -1633,8 +1633,8 @@ <h4 id="the-cssrule-interface"><span class="secno">6.4.2 </span>The <code>CSSRul
 <span class="idlConst">    const <span class="idlConstType"><a>unsigned short</a></span> <span class="idlConstName"><a href="#widl-CSSRule-NAMESPACE_RULE">NAMESPACE_RULE</a></span> = <span class="idlConstValue">10</span>;</span>
 <span class="idlAttribute">    readonly attribute <span class="idlAttrType"><a>unsigned short</a></span> <span class="idlAttrName"><a href="#widl-CSSRule-type">type</a></span>;</span>
 <span class="idlAttribute">    attribute <span class="idlAttrType"><a>DOMString</a></span> <span class="idlAttrName"><a href="#widl-CSSRule-cssText">cssText</a></span>;</span>
-<span class="idlAttribute">    readonly attribute <span class="idlAttrType"><a>CSSRule</a></span> <span class="idlAttrName"><a href="#widl-CSSRule-parentRule">parentRule</a></span>;</span>
-<span class="idlAttribute">    readonly attribute <span class="idlAttrType"><a>CSSStyleSheet</a></span> <span class="idlAttrName"><a href="#widl-CSSRule-parentStyleSheet">parentStyleSheet</a></span>;</span>
+<span class="idlAttribute">    readonly attribute <span class="idlAttrType"><a>CSSRule</a>?</span> <span class="idlAttrName"><a href="#widl-CSSRule-parentRule">parentRule</a></span>;</span>
+<span class="idlAttribute">    readonly attribute <span class="idlAttrType"><a>CSSStyleSheet</a>?</span> <span class="idlAttrName"><a href="#widl-CSSRule-parentStyleSheet">parentStyleSheet</a></span>;</span>
 };</span></pre>
 <dl class="constants">
 <dt class="constant" id="widl-CSSRule-STYLE_RULE">

cssom/idl/CSSRule.idl

@@ -94,12 +94,12 @@ interface CSSRule {
     there is no enclosing rule.</p>\
     <p class='note'>For example, <code>@media</code> can enclose a rule.</p>"
   ]
-  readonly attribute CSSRule parentRule;
+  readonly attribute CSSRule? parentRule;
 
   [Documentation=
    "<p>The {@name} {@type} must return the <code>CSSStyleSheet</code> object that contains the the\
     current rule.</p>"
   ]
-  readonly attribute CSSStyleSheet parentStyleSheet;
+  readonly attribute CSSStyleSheet? parentStyleSheet;
 
 };