[cgiow] (0) Exclude <input type=image> buttons from canvas fallback, …

…to avoid having to define pixel-level retargetting in hit regions Affected topics: Canvas git-svn-id: http://svn.whatwg.org/webapps@8545 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Mar 14, 2014 · b32d147 · b32d147
1 parent 9a438a9
commit b32d147
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/complete.html b/complete.html
@@ -54001,7 +54001,7 @@ <h4 id=the-canvas-element><span class=secno>4.12.4 </span>The <dfn id=canvas><co
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#embedded-content-category>embedded content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#transparent>Transparent</a>, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in 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, <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a>, <code><a href=#the-select-element>select</a></code> elements 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, <a href=#sorting-interface-th-element title="sorting interface th element">sorting interface <code>th</code> elements</a>, and elements that would not be <a href=#interactive-content>interactive content</a> except for having the <code title=attr-tabindex><a href=#attr-tabindex>tabindex</a></code> attribute specified.</dd>
+   <dd><a href=#transparent>Transparent</a>, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in 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, <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a> but whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are not in the <a href="#image-button-state-(type=image)" title=attr-input-type-image>Image Button</a> state, <code><a href=#the-select-element>select</a></code> elements 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, <a href=#sorting-interface-th-element title="sorting interface th element">sorting interface <code>th</code> elements</a>, and elements that would not be <a href=#interactive-content>interactive content</a> except for having the <code title=attr-tabindex><a href=#attr-tabindex>tabindex</a></code> attribute specified.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -58761,7 +58761,8 @@ <h6 id=hit-regions><span class=secno>4.12.4.2.15 </span>Hit regions</h6>
    <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>an <code><a href=#the-input-element>input</a></code> element that is a <a href=#concept-button title=concept-button>button</a> but
+   its <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is not in the <a href="#image-button-state-(type=image)" title=attr-input-type-image>Image Button</a> state</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>
 

diff --git a/index b/index
@@ -54001,7 +54001,7 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#embedded-content-category>embedded content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#transparent>Transparent</a>, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in 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, <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a>, <code><a href=#the-select-element>select</a></code> elements 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, <a href=#sorting-interface-th-element title="sorting interface th element">sorting interface <code>th</code> elements</a>, and elements that would not be <a href=#interactive-content>interactive content</a> except for having the <code title=attr-tabindex><a href=#attr-tabindex>tabindex</a></code> attribute specified.</dd>
+   <dd><a href=#transparent>Transparent</a>, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in 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, <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a> but whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are not in the <a href="#image-button-state-(type=image)" title=attr-input-type-image>Image Button</a> state, <code><a href=#the-select-element>select</a></code> elements 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, <a href=#sorting-interface-th-element title="sorting interface th element">sorting interface <code>th</code> elements</a>, and elements that would not be <a href=#interactive-content>interactive content</a> except for having the <code title=attr-tabindex><a href=#attr-tabindex>tabindex</a></code> attribute specified.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -58761,7 +58761,8 @@ v6DVT (also check for '- -' bits in the part above) --><p>The <dfn id=dom-contex
    <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>an <code><a href=#the-input-element>input</a></code> element that is a <a href=#concept-button title=concept-button>button</a> but
+   its <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is not in the <a href="#image-button-state-(type=image)" title=attr-input-type-image>Image Button</a> state</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>
 

diff --git a/source b/source
@@ -59756,7 +59756,7 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <dt><span data-x="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt><span data-x="element-dfn-content-model">Content model</span>:</dt>
-   <dd><span>Transparent</span>, but with no <span>interactive content</span> descendants except for <code>a</code> elements, <code>button</code> elements, <code>input</code> elements whose <code data-x="attr-input-type">type</code> attribute are in the <span data-x="attr-input-type-checkbox">Checkbox</span> or <span data-x="attr-input-type-radio">Radio Button</span> states, <code>input</code> elements that are <span data-x="concept-button">buttons</span>, <code>select</code> elements 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, <span data-x="sorting interface th element">sorting interface <code>th</code> elements</span>, and elements that would not be <span>interactive content</span> except for having the <code data-x="attr-tabindex">tabindex</code> attribute specified.</dd>
+   <dd><span>Transparent</span>, but with no <span>interactive content</span> descendants except for <code>a</code> elements, <code>button</code> elements, <code>input</code> elements whose <code data-x="attr-input-type">type</code> attribute are in the <span data-x="attr-input-type-checkbox">Checkbox</span> or <span data-x="attr-input-type-radio">Radio Button</span> states, <code>input</code> elements that are <span data-x="concept-button">buttons</span> but whose <code data-x="attr-input-type">type</code> attribute are not in the <span data-x="attr-input-type-image">Image Button</span> state, <code>select</code> elements 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, <span data-x="sorting interface th element">sorting interface <code>th</code> elements</span>, and elements that would not be <span>interactive content</span> except for having the <code data-x="attr-tabindex">tabindex</code> attribute specified.</dd>
    <dt><span data-x="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code data-x="attr-canvas-width">width</code></dd>
@@ -65387,8 +65387,9 @@ v6DVT (also check for '- -' bits in the part above) -->
    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>an <code>input</code> element that is a <span data-x="concept-button">button</span> but
+   its <code data-x="attr-input-type">type</code> attribute is not in the <span
+   data-x="attr-input-type-image">Image Button</span> state</p></li>
 
    <li><p>a <code>select</code> element with a <code
    data-x="attr-select-multiple">multiple</code> attribute or a <span