[html5] r8485 - [giow] (3) Fix the condition for the <option> in the previous checkin, and rewor [...]
whatwg at whatwg.org
whatwg at whatwg.org
Thu Feb 20 14:39:01 PST 2014
Author: ianh
Date: 2014-02-20 14:39:00 -0800 (Thu, 20 Feb 2014)
New Revision: 8485
Modified:
complete.html
index
source
Log:
[giow] (3) Fix the condition for the <option> in the previous checkin, and reword this into a list so it's clearer
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=24749
Affected topics: Canvas
Modified: complete.html
===================================================================
--- complete.html 2014-02-20 22:34:24 UTC (rev 8484)
+++ complete.html 2014-02-20 22:39:00 UTC (rev 8485)
@@ -58592,35 +58592,50 @@
and abort these steps.</p>
<ul class=brief><!--
- <li>The <var title="">arguments</var> object's <code
+ <li><p>The <var title="">arguments</var> object's <code
title="dom-HitRegionOptions-path">path</code> member is null, but its <code
- title="dom-HitRegionOptions-transform">transform</code> member is not.</li>
---><li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-label>label</code> members are both non-null.</li>
+ title="dom-HitRegionOptions-transform">transform</code> member is not.</p></li>
+--><li><p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-label>label</code> members are both non-null.</li>
- <li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-role>role</code> members are both non-null.</li>
+ <li><p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-role>role</code> members are both non-null.</li>
- <li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-role>role</code> member's value is the empty string, and the <code title=dom-HitRegionOptions-label>label</code> member's value is either null or the empty
+<!--CLEANUP-->
+ <li><p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-role>role</code> member's value is the empty string, and the <code title=dom-HitRegionOptions-label>label</code> member's value is either null or the empty
string.</li>
- <li>The <var title="">specified pixels</var> has no pixels.</li>
+ <li><p>The <var title="">specified pixels</var> has no pixels.</li>
- <li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> member is not null but is neither an
- <code><a href=#the-a-element>a</a></code> element that <a href=#represents>represents</a> a <a href=#hyperlink>hyperlink</a>, a
- <code><a href=#the-button-element>button</a></code> element, an <code><a href=#the-input-element>input</a></code> element whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in one of the <a href="#checkbox-state-(type=checkbox)" title=attr-input-type-checkbox>Checkbox</a> or <a href="#radio-button-state-(type=radio)" title=attr-input-type-radio>Radio
- Button</a> states, an <code><a href=#the-input-element>input</a></code> element that is a <a href=#concept-button title=concept-button>button</a>, a <code><a href=#the-select-element>select</a></code> element with a <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code> attribute or a <a href=#concept-select-size title=concept-select-size>display size</a> greater than 1, nor an <code><a href=#the-option-element>option</a></code>
- element that is in a <a href=#concept-select-option-list title=concept-select-option-list>list of options</a> of a
- <code><a href=#the-select-element>select</a></code> element with no <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code>
- attribute and with a <a href=#concept-select-size title=concept-select-size>display size</a> equal to
- 1.</li>
+ <li>
- <li>The <var title="">parent region</var> is not null but has a <a href="#hit-region's-control" title="hit region's
+ <p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> member is not one of the following:</p>
+
+ <ul class=brief><li><p>null</li>
+
+ <li><p>an <code><a href=#the-a-element>a</a></code> element that <a href=#represents>represents</a> a
+ <a href=#hyperlink>hyperlink</a></li>
+
+ <li><p>a <code><a href=#the-button-element>button</a></code> element</li>
+
+ <li><p>an <code><a href=#the-input-element>input</a></code> element whose <code title=attr-input-type><a href=#attr-input-type>type</a></code>
+ attribute is in one of the <a href="#checkbox-state-(type=checkbox)" title=attr-input-type-checkbox>Checkbox</a> or <a href="#radio-button-state-(type=radio)" title=attr-input-type-radio>Radio Button</a> states</li>
+
+ <li><p>an <code><a href=#the-input-element>input</a></code> element that is a <a href=#concept-button title=concept-button>button</a></li>
+
+ <li><p>a <code><a href=#the-select-element>select</a></code> element with a <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code> attribute or a <a href=#concept-select-size title=concept-select-size>display size</a> greater than 1</li>
+
+ <li><p>an <code><a href=#the-option-element>option</a></code> element that is in a <a href=#concept-select-option-list title=concept-select-option-list>list of options</a> of a <code><a href=#the-select-element>select</a></code> element
+ with a <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code> attribute or a <a href=#concept-select-size title=concept-select-size>display size</a> greater than 1</li>
+
+ </ul></li>
+
+ <li><p>The <var title="">parent region</var> is not null but has a <a href="#hit-region's-control" title="hit region's
control">control</a>.</li>
- <li>The <var title="">previous region for this ID</var> is the same <a href=#hit-region>hit region</a> as
+ <li><p>The <var title="">previous region for this ID</var> is the same <a href=#hit-region>hit region</a> as
the <var title="">parent region</var>.</li>
- <li>The <var title="">previous region for this ID</var> is an <a href=#ancestor-region>ancestor region</a> of
- the <var title="">parent region</var>.</li>
+ <li><p>The <var title="">previous region for this ID</var> is an <a href=#ancestor-region>ancestor region</a>
+ of the <var title="">parent region</var>.</li>
</ul></li>
Modified: index
===================================================================
--- index 2014-02-20 22:34:24 UTC (rev 8484)
+++ index 2014-02-20 22:39:00 UTC (rev 8485)
@@ -58592,35 +58592,50 @@
and abort these steps.</p>
<ul class=brief><!--
- <li>The <var title="">arguments</var> object's <code
+ <li><p>The <var title="">arguments</var> object's <code
title="dom-HitRegionOptions-path">path</code> member is null, but its <code
- title="dom-HitRegionOptions-transform">transform</code> member is not.</li>
---><li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-label>label</code> members are both non-null.</li>
+ title="dom-HitRegionOptions-transform">transform</code> member is not.</p></li>
+--><li><p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-label>label</code> members are both non-null.</li>
- <li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-role>role</code> members are both non-null.</li>
+ <li><p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> and <code title=dom-HitRegionOptions-role>role</code> members are both non-null.</li>
- <li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-role>role</code> member's value is the empty string, and the <code title=dom-HitRegionOptions-label>label</code> member's value is either null or the empty
+<!--CLEANUP-->
+ <li><p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-role>role</code> member's value is the empty string, and the <code title=dom-HitRegionOptions-label>label</code> member's value is either null or the empty
string.</li>
- <li>The <var title="">specified pixels</var> has no pixels.</li>
+ <li><p>The <var title="">specified pixels</var> has no pixels.</li>
- <li>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> member is not null but is neither an
- <code><a href=#the-a-element>a</a></code> element that <a href=#represents>represents</a> a <a href=#hyperlink>hyperlink</a>, a
- <code><a href=#the-button-element>button</a></code> element, an <code><a href=#the-input-element>input</a></code> element whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is in one of the <a href="#checkbox-state-(type=checkbox)" title=attr-input-type-checkbox>Checkbox</a> or <a href="#radio-button-state-(type=radio)" title=attr-input-type-radio>Radio
- Button</a> states, an <code><a href=#the-input-element>input</a></code> element that is a <a href=#concept-button title=concept-button>button</a>, a <code><a href=#the-select-element>select</a></code> element with a <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code> attribute or a <a href=#concept-select-size title=concept-select-size>display size</a> greater than 1, nor an <code><a href=#the-option-element>option</a></code>
- element that is in a <a href=#concept-select-option-list title=concept-select-option-list>list of options</a> of a
- <code><a href=#the-select-element>select</a></code> element with no <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code>
- attribute and with a <a href=#concept-select-size title=concept-select-size>display size</a> equal to
- 1.</li>
+ <li>
- <li>The <var title="">parent region</var> is not null but has a <a href="#hit-region's-control" title="hit region's
+ <p>The <var title="">arguments</var> object's <code title=dom-HitRegionOptions-control>control</code> member is not one of the following:</p>
+
+ <ul class=brief><li><p>null</li>
+
+ <li><p>an <code><a href=#the-a-element>a</a></code> element that <a href=#represents>represents</a> a
+ <a href=#hyperlink>hyperlink</a></li>
+
+ <li><p>a <code><a href=#the-button-element>button</a></code> element</li>
+
+ <li><p>an <code><a href=#the-input-element>input</a></code> element whose <code title=attr-input-type><a href=#attr-input-type>type</a></code>
+ attribute is in one of the <a href="#checkbox-state-(type=checkbox)" title=attr-input-type-checkbox>Checkbox</a> or <a href="#radio-button-state-(type=radio)" title=attr-input-type-radio>Radio Button</a> states</li>
+
+ <li><p>an <code><a href=#the-input-element>input</a></code> element that is a <a href=#concept-button title=concept-button>button</a></li>
+
+ <li><p>a <code><a href=#the-select-element>select</a></code> element with a <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code> attribute or a <a href=#concept-select-size title=concept-select-size>display size</a> greater than 1</li>
+
+ <li><p>an <code><a href=#the-option-element>option</a></code> element that is in a <a href=#concept-select-option-list title=concept-select-option-list>list of options</a> of a <code><a href=#the-select-element>select</a></code> element
+ with a <code title=attr-select-multiple><a href=#attr-select-multiple>multiple</a></code> attribute or a <a href=#concept-select-size title=concept-select-size>display size</a> greater than 1</li>
+
+ </ul></li>
+
+ <li><p>The <var title="">parent region</var> is not null but has a <a href="#hit-region's-control" title="hit region's
control">control</a>.</li>
- <li>The <var title="">previous region for this ID</var> is the same <a href=#hit-region>hit region</a> as
+ <li><p>The <var title="">previous region for this ID</var> is the same <a href=#hit-region>hit region</a> as
the <var title="">parent region</var>.</li>
- <li>The <var title="">previous region for this ID</var> is an <a href=#ancestor-region>ancestor region</a> of
- the <var title="">parent region</var>.</li>
+ <li><p>The <var title="">previous region for this ID</var> is an <a href=#ancestor-region>ancestor region</a>
+ of the <var title="">parent region</var>.</li>
</ul></li>
Modified: source
===================================================================
--- source 2014-02-20 22:34:24 UTC (rev 8484)
+++ source 2014-02-20 22:39:00 UTC (rev 8485)
@@ -65200,50 +65200,70 @@
<ul class="brief">
<!--
- <li>The <var data-x="">arguments</var> object's <code
+ <li><p>The <var data-x="">arguments</var> object's <code
data-x="dom-HitRegionOptions-path">path</code> member is null, but its <code
- data-x="dom-HitRegionOptions-transform">transform</code> member is not.</li>
+ data-x="dom-HitRegionOptions-transform">transform</code> member is not.</p></li>
-->
- <li>The <var data-x="">arguments</var> object's <code
+ <li><p>The <var data-x="">arguments</var> object's <code
data-x="dom-HitRegionOptions-control">control</code> and <code
- data-x="dom-HitRegionOptions-label">label</code> members are both non-null.</li>
+ data-x="dom-HitRegionOptions-label">label</code> members are both non-null.</p></li>
- <li>The <var data-x="">arguments</var> object's <code
+ <li><p>The <var data-x="">arguments</var> object's <code
data-x="dom-HitRegionOptions-control">control</code> and <code
- data-x="dom-HitRegionOptions-role">role</code> members are both non-null.</li>
+ data-x="dom-HitRegionOptions-role">role</code> members are both non-null.</p></li>
- <li>The <var data-x="">arguments</var> object's <code
+<!--CLEANUP-->
+ <li><p>The <var data-x="">arguments</var> object's <code
data-x="dom-HitRegionOptions-role">role</code> member's value is the empty string, and the <code
data-x="dom-HitRegionOptions-label">label</code> member's value is either null or the empty
- string.</li>
+ string.</p></li>
- <li>The <var data-x="">specified pixels</var> has no pixels.</li>
+ <li><p>The <var data-x="">specified pixels</var> has no pixels.</p></li>
- <li>The <var data-x="">arguments</var> object's <code
- data-x="dom-HitRegionOptions-control">control</code> member is not null but is neither an
- <code>a</code> element that <span>represents</span> a <span>hyperlink</span>, a
- <code>button</code> element, an <code>input</code> element whose <code
- data-x="attr-input-type">type</code> attribute is in one of the <span
- data-x="attr-input-type-checkbox">Checkbox</span> or <span data-x="attr-input-type-radio">Radio
- Button</span> states, an <code>input</code> element that is a <span
- data-x="concept-button">button</span>, a <code>select</code> element with a <code
- data-x="attr-select-multiple">multiple</code> attribute or a <span
- data-x="concept-select-size">display size</span> greater than 1, nor an <code>option</code>
- element that is in a <span data-x="concept-select-option-list">list of options</span> of a
- <code>select</code> element with no <code data-x="attr-select-multiple">multiple</code>
- attribute and with a <span data-x="concept-select-size">display size</span> equal to
- 1.</li>
+ <li>
- <li>The <var data-x="">parent region</var> is not null but has a <span data-x="hit region's
- control">control</span>.</li>
+ <p>The <var data-x="">arguments</var> object's <code
+ data-x="dom-HitRegionOptions-control">control</code> member is not one of the following:</p>
- <li>The <var data-x="">previous region for this ID</var> is the same <span>hit region</span> as
- the <var data-x="">parent region</var>.</li>
+ <ul class="brief">
- <li>The <var data-x="">previous region for this ID</var> is an <span>ancestor region</span> of
- the <var data-x="">parent region</var>.</li>
+ <li><p>null</p></li>
+ <li><p>an <code>a</code> element that <span>represents</span> a
+ <span>hyperlink</span></p></li>
+
+ <li><p>a <code>button</code> element</p></li>
+
+ <li><p>an <code>input</code> element whose <code data-x="attr-input-type">type</code>
+ attribute is in one of the <span data-x="attr-input-type-checkbox">Checkbox</span> or <span
+ data-x="attr-input-type-radio">Radio Button</span> states</p></li>
+
+ <li><p>an <code>input</code> element that is a <span
+ data-x="concept-button">button</span></p></li>
+
+ <li><p>a <code>select</code> element with a <code
+ data-x="attr-select-multiple">multiple</code> attribute or a <span
+ data-x="concept-select-size">display size</span> greater than 1</p></li>
+
+ <li><p>an <code>option</code> element that is in a <span
+ data-x="concept-select-option-list">list of options</span> of a <code>select</code> element
+ with a <code data-x="attr-select-multiple">multiple</code> attribute or a <span
+ data-x="concept-select-size">display size</span> greater than 1</p></li>
+
+ </ul>
+
+ </li>
+
+ <li><p>The <var data-x="">parent region</var> is not null but has a <span data-x="hit region's
+ control">control</span>.</p></li>
+
+ <li><p>The <var data-x="">previous region for this ID</var> is the same <span>hit region</span> as
+ the <var data-x="">parent region</var>.</p></li>
+
+ <li><p>The <var data-x="">previous region for this ID</var> is an <span>ancestor region</span>
+ of the <var data-x="">parent region</var>.</p></li>
+
</ul>
</li>
More information about the Commit-Watchers
mailing list