Skip to content

Commit 5a873ff

Browse files
author
Simon Pieters
committed
[cssom] Expose cascaded style instead of specified style. <http://www.w3.org/mid/CAAWBYDD+5gG9rrQbPyriRnSJHktL_6kyUkuSVW4O9MxC0DRFHg@mail.gmail.com>
1 parent 1abcaaf commit 5a873ff

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

cssom/Overview.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,10 @@ <h2 id="terminology"><span class="secno">3 </span>Terminology</h2>
268268
<code title=""><var>A</var></code> where <code title=""><var>A</var></code> is actually an interface, it generally means an object implementing interface
269269
<code title=""><var>A</var></code>.</p>
270270

271-
<p>The terms <dfn id="whitespace">whitespace</dfn>, <dfn id="ignored">ignored</dfn>, <dfn id="specified-value">specified value</dfn>, <dfn id="computed-value">computed value</dfn> and <dfn id="used-value">used value</dfn> are defined in CSS.
272-
<a href="#refsCSS">[CSS]</a>
271+
<p>The terms <dfn id="whitespace">whitespace</dfn> and <dfn id="ignored">ignored</dfn> are defined in CSS. <a href="#refsCSS">[CSS]</a>
272+
273+
<p>The terms <dfn id="cascaded-value">cascaded value</dfn>, <dfn id="computed-value">computed value</dfn> and <dfn id="used-value">used value</dfn> are defined in CSS Cascade and Inheritance.
274+
<a href="#refsCSSCASCADE">[CSSCASCADE]</a>
273275

274276
<p>The terms <dfn id="simple-selector">simple selector</dfn>, <dfn id="sequence-of-simple-selectors">sequence of simple selectors</dfn>, <dfn id="universal-selector">universal selector</dfn> and <dfn id="group-of-selectors">group of selectors</dfn> are defined in
275277
Selectors. <a href="#refsSELECTORS">[SELECTORS]</a>
@@ -2805,16 +2807,16 @@ <h3 id="the-getstyleutils-interface"><span class="secno">7.3 </span>The <code ti
28052807

28062808
<pre class="idl">[NoInterfaceObject]
28072809
interface <dfn id="getstyleutils">GetStyleUtils</dfn> {
2808-
readonly attribute <a href="#cssstyledeclaration">CSSStyleDeclaration</a> <a href="#dom-getstyleutils-specifiedstyle" title="dom-GetStyleUtils-specifiedStyle">specifiedStyle</a>;
2810+
readonly attribute <a href="#cssstyledeclaration">CSSStyleDeclaration</a> <a href="#dom-getstyleutils-cascadedstyle" title="dom-GetStyleUtils-cascadedStyle">cascadedStyle</a>;
28092811
<!--readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-GetStyleUtils-defaultStyle>defaultStyle</span>;
28102812
-->readonly attribute <a href="#cssstyledeclaration">CSSStyleDeclaration</a> <a href="#dom-getstyleutils-computedstyle" title="dom-GetStyleUtils-computedStyle">computedStyle</a>;
28112813
readonly attribute <a href="#cssstyledeclaration">CSSStyleDeclaration</a> <a href="#dom-getstyleutils-usedstyle" title="dom-GetStyleUtils-usedStyle">usedStyle</a>;
28122814
};</pre>
28132815

2814-
<p class="atrisk">The <dfn id="dom-getstyleutils-specifiedstyle" title="dom-GetStyleUtils-specifiedStyle"><code>specifiedStyle</code></dfn> attribute must return a <a href="#css-declaration-block">CSS declaration block</a>
2816+
<p class="atrisk">The <dfn id="dom-getstyleutils-cascadedstyle" title="dom-GetStyleUtils-cascadedStyle"><code>cascadedStyle</code></dfn> attribute must return a <a href="#css-declaration-block">CSS declaration block</a>
28152817
with the <a href="#concept-css-declaration-block-readonly-flag" title="concept-css-declaration-block-readonly-flag">readonly flag</a> set and the
28162818
<a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a> set to all longhand properties
2817-
that are <a href="#supported-css-property" title="supported CSS property">supported CSS properties</a> with the value being the <a href="#specified-value">specified value</a>
2819+
that are <a href="#supported-css-property" title="supported CSS property">supported CSS properties</a> with the value being the <a href="#cascaded-value">cascaded value</a>
28182820
computed for the <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#context-object">context object</a> using the style rules associated
28192821
with the <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#context-object">context object</a>'s <a href="#associated-document">associated document</a>.</p>
28202822

@@ -2840,7 +2842,7 @@ <h3 id="the-getstyleutils-interface"><span class="secno">7.3 </span>The <code ti
28402842
computed for the <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#context-object">context object</a> using the style rules associated
28412843
with the <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#context-object">context object</a>'s <a href="#associated-document">associated document</a>.</p>
28422844

2843-
<p class="warning">The <code title="dom-GetStyleUtils-specifiedStyle"><a href="#dom-getstyleutils-specifiedstyle">specifiedStyle</a></code>, <code title="dom-GetStyleUtils-computedStyle"><a href="#dom-getstyleutils-computedstyle">computedStyle</a></code> and
2845+
<p class="warning">The <code title="dom-GetStyleUtils-cascadedStyle"><a href="#dom-getstyleutils-cascadedstyle">cascadedStyle</a></code>, <code title="dom-GetStyleUtils-computedStyle"><a href="#dom-getstyleutils-computedstyle">computedStyle</a></code> and
28442846
<code title="dom-GetStyleUtils-usedStyle"><a href="#dom-getstyleutils-usedstyle">usedStyle</a></code> methods expose information from <a href="#css-style-sheet" title="CSS style sheet">CSS style sheets</a> with the
28452847
<a href="#concept-css-style-sheet-origin-clean-flag" title="concept-css-style-sheet-origin-clean-flag">origin-clean flag</a> unset.
28462848

cssom/Overview.src.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,10 @@ <h2>Terminology</h2>
190190
<code title><var>A</var></code> where <code title><var>A</var></code> is actually an interface, it generally means an object implementing interface
191191
<code title><var>A</var></code>.</p>
192192

193-
<p>The terms <dfn>whitespace</dfn>, <dfn>ignored</dfn>, <dfn>specified value</dfn>, <dfn>computed value</dfn> and <dfn>used value</dfn> are defined in CSS.
194-
<span data-anolis-ref>CSS</span>
193+
<p>The terms <dfn>whitespace</dfn> and <dfn>ignored</dfn> are defined in CSS. <span data-anolis-ref>CSS</span>
194+
195+
<p>The terms <dfn>cascaded value</dfn>, <dfn>computed value</dfn> and <dfn>used value</dfn> are defined in CSS Cascade and Inheritance.
196+
<span data-anolis-ref>CSSCASCADE</span>
195197

196198
<p>The terms <dfn>simple selector</dfn>, <dfn>sequence of simple selectors</dfn>, <dfn>universal selector</dfn> and <dfn>group of selectors</dfn> are defined in
197199
Selectors. <span data-anolis-ref>SELECTORS</span>
@@ -2727,16 +2729,16 @@ <h3>The <code title>GetStyleUtils</code> Interface</h3>
27272729

27282730
<pre class=idl>[NoInterfaceObject]
27292731
interface <dfn>GetStyleUtils</dfn> {
2730-
readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-GetStyleUtils-specifiedStyle>specifiedStyle</span>;
2732+
readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-GetStyleUtils-cascadedStyle>cascadedStyle</span>;
27312733
<!--readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-GetStyleUtils-defaultStyle>defaultStyle</span>;
27322734
-->readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-GetStyleUtils-computedStyle>computedStyle</span>;
27332735
readonly attribute <span>CSSStyleDeclaration</span> <span title=dom-GetStyleUtils-usedStyle>usedStyle</span>;
27342736
};</pre>
27352737

2736-
<p class=atrisk>The <dfn title=dom-GetStyleUtils-specifiedStyle><code>specifiedStyle</code></dfn> attribute must return a <span>CSS declaration block</span>
2738+
<p class=atrisk>The <dfn title=dom-GetStyleUtils-cascadedStyle><code>cascadedStyle</code></dfn> attribute must return a <span>CSS declaration block</span>
27372739
with the <span title=concept-css-declaration-block-readonly-flag>readonly flag</span> set and the
27382740
<span title=concept-css-declaration-block-declarations>declarations</span> set to all longhand properties
2739-
that are <span title="supported CSS property">supported CSS properties</span> with the value being the <span>specified value</span>
2741+
that are <span title="supported CSS property">supported CSS properties</span> with the value being the <span>cascaded value</span>
27402742
computed for the <span data-anolis-spec=dom>context object</span> using the style rules associated
27412743
with the <span data-anolis-spec=dom>context object</span>'s <span>associated document</span>.</p>
27422744

@@ -2762,7 +2764,7 @@ <h3>The <code title>GetStyleUtils</code> Interface</h3>
27622764
computed for the <span data-anolis-spec=dom>context object</span> using the style rules associated
27632765
with the <span data-anolis-spec=dom>context object</span>'s <span>associated document</span>.</p>
27642766

2765-
<p class=warning>The <code title=dom-GetStyleUtils-specifiedStyle>specifiedStyle</code>, <code title=dom-GetStyleUtils-computedStyle>computedStyle</code> and
2767+
<p class=warning>The <code title=dom-GetStyleUtils-cascadedStyle>cascadedStyle</code>, <code title=dom-GetStyleUtils-computedStyle>computedStyle</code> and
27662768
<code title=dom-GetStyleUtils-usedStyle>usedStyle</code> methods expose information from <span title="CSS style sheet">CSS style sheets</span> with the
27672769
<span title=concept-css-style-sheet-origin-clean-flag>origin-clean flag</span> unset.
27682770

0 commit comments

Comments
 (0)