- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 11 Aug 2010 20:37:43 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv31848
Modified Files:
embedded-content-1.html interactive-elements.html spec.html
the-canvas-element.html
Log Message:
Fix all the bits that referred to img.complete and assumed it was not returning 'true' when src was missing (that changed recently). (whatwg r5282)
[updated by splitter]
Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -d -r1.865 -r1.866
--- the-canvas-element.html 11 Aug 2010 03:56:46 -0000 1.865
+++ the-canvas-element.html 11 Aug 2010 20:37:41 -0000 1.866
@@ -344,7 +344,7 @@
DOMString <a href="#dom-canvas-todataurl" title="dom-canvas-toDataURL">toDataURL</a>(in optional DOMString type, in any... args);
- object <a href="#dom-canvas-getcontext" title="dom-canvas-getContext">getContext</a>(in DOMString contextId);
+ object <a href="#dom-canvas-getcontext" title="dom-canvas-getContext">getContext</a>(in DOMString contextId, in any... args);
};</pre>
</dd>
</dl><p>The <code><a href="#the-canvas-element">canvas</a></code> element provides scripts with a
@@ -427,12 +427,13 @@
context.fillRect(0,100,50,50);
canvas.width = canvas.width; // clears the canvas
context.fillRect(100,0,50,50); // only this square remains</pre>
- </div><hr><dl class="domintro"><dt><var title="">context</var> = <var title="">canvas</var> . <code title="dom-canvas-getContext"><a href="#dom-canvas-getcontext">getContext</a></code>(<var title="">contextId</var>)</dt>
+ </div><hr><dl class="domintro"><dt><var title="">context</var> = <var title="">canvas</var> . <code title="dom-canvas-getContext"><a href="#dom-canvas-getcontext">getContext</a></code>(<var title="">contextId</var> [, ... ])</dt>
<dd>
<p>Returns an object that exposes an API for drawing on the
- canvas. The argument specifies the desired API.</p>
+ canvas. The first argument specifies the desired API. Subsequent
+ arguments are handled by that API.</p>
<p>The list of defined contexts is given on the <a href="http://wiki.whatwg.org/wiki/CanvasContexts">WHATWG Wiki
@@ -452,12 +453,12 @@
that element. When created, a <code><a href="#the-canvas-element">canvas</a></code> element must not
have a <a href="#primary-context">primary context</a>.</p>
- <p>The <dfn id="dom-canvas-getcontext" title="dom-canvas-getContext"><code>getContext(<var title="">contextId</var>)</code></dfn> method of the
- <code><a href="#the-canvas-element">canvas</a></code> element, when invoked, must run the following
- steps:</p>
+ <p>The <dfn id="dom-canvas-getcontext" title="dom-canvas-getContext"><code>getContext(<var title="">contextId</var>, <var title="">args...</var>)</code></dfn>
+ method of the <code><a href="#the-canvas-element">canvas</a></code> element, when invoked, must run
+ the following steps:</p>
- <ol><li><p>Let <var title="">contextId</var> be the argument to the
- method.</p></li>
+ <ol><li><p>Let <var title="">contextId</var> be the first argument to
+ the method.</p></li>
<li><p>If <var title="">contextId</var> is not the name of a
context supported by the user agent, return null and abort these
@@ -474,7 +475,8 @@
<li><p>If the <code title="dom-canvas-getContext"><a href="#dom-canvas-getcontext">getContext()</a></code> method has
already been invoked on this element for the same <var title="">contextId</var>, return the same object as was returned
- that time, and abort these steps.</p></li>
+ that time, and abort these steps. The additional arguments are
+ ignored.</p></li>
<li><p><dfn id="getcontext-return" title="getContext-return">Return a new object for <var title="">contextId</var></dfn>, as defined by the specification
given for <var title="">contextId</var>'s entry in the <a href="http://wiki.whatwg.org/wiki/CanvasContexts">WHATWG Wiki
Index: embedded-content-1.html
===================================================================
RCS file: /sources/public/html5/spec/embedded-content-1.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- embedded-content-1.html 11 Aug 2010 03:56:44 -0000 1.14
+++ embedded-content-1.html 11 Aug 2010 20:37:41 -0000 1.15
@@ -692,14 +692,13 @@
else 0. <a href="references.html#refsCSS">[CSS]</a></p>
<p>The IDL attribute <dfn id="dom-img-complete" title="dom-img-complete"><code>complete</code></dfn> must return
- true if the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute's value
- is the empty string or if the user agent has fetched the image
- specified in the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute,
- and it is in a supported image type (i.e. it was decoded without
- fatal errors), even if the final <a href="webappapis.html#concept-task" title="concept-task">task</a> queued by the <a href="webappapis.html#networking-task-source">networking task
- source</a> for the <a href="fetching-resources.html#fetch" title="fetch">fetching</a> of the
- image resource has not yet been processed. Otherwise, the attribute
- must return false.</p>
+ true if either the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute
+ is omitted, or its value is the empty string, or if the user agent
+ has fetched the image specified in the <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute and it is in a supported
+ image type (i.e. it was decoded without fatal errors), even if the
+ final <a href="webappapis.html#concept-task" title="concept-task">task</a> queued by the
+ <a href="webappapis.html#networking-task-source">networking task source</a> for the <a href="fetching-resources.html#fetch" title="fetch">fetching</a> of the image resource has not yet been
+ processed. Otherwise, the attribute must return false.</p>
<p class="note">The value of <code title="dom-img-complete"><a href="#dom-img-complete">complete</a></code> can thus change while a
<a href="webappapis.html#concept-script" title="concept-script">script</a> is executing.</p>
Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec/interactive-elements.html,v
retrieving revision 1.997
retrieving revision 1.998
diff -u -d -r1.997 -r1.998
--- interactive-elements.html 11 Aug 2010 03:56:44 -0000 1.997
+++ interactive-elements.html 11 Aug 2010 20:37:41 -0000 1.998
@@ -1018,8 +1018,9 @@
<li><p>If the <var title="">icon</var> argument is present and not
null, but the given <code>img</code> element's <code
- title="dom-img-complete">complete</code> attribute is false, then
- let <var title="">icon</var> be null.</p></li>
+ title="dom-img-complete">complete</code> attribute is false or its
+ <code title="attr-img-src">src</code> attribute is omitted or
+ empty, then let <var title="">icon</var> be null.</p></li>
<li><p>If the <var title="">icon</var> argument is present and not
null, then copy the image data from that <code>img</code> element,
@@ -1694,7 +1695,9 @@
an <code>img</code> element.</p>
<p>If there is an <code>img</code> element specified, its <code
- title="dom-img-complete">complete</code> attribute is true.</p>
+ title="dom-img-complete">complete</code> attribute is true and
+ its <code title="attr-img-src">src</code> attribute is neither
+ omitted nor empty.</p>
</dd>
@@ -1708,7 +1711,9 @@
<code>img</code> element.</p>
<p>If there is an <code>img</code> element specified, its <code
- title="dom-img-complete">complete</code> attribute is true.</p>
+ title="dom-img-complete">complete</code> attribute is true and
+ its <code title="attr-img-src">src</code> attribute is neither
+ omitted nor empty.</p>
</dd>
@@ -1722,7 +1727,9 @@
<code>img</code> element.</p>
<p>If there is an <code>img</code> element specified, its <code
- title="dom-img-complete">complete</code> attribute is true.</p>
+ title="dom-img-complete">complete</code> attribute is true and
+ its <code title="attr-img-src">src</code> attribute is neither
+ omitted nor empty.</p>
</dd>
@@ -1735,7 +1742,9 @@
<code>img</code> element.</p>
<p>If there is an <code>img</code> element specified, its <code
- title="dom-img-complete">complete</code> attribute is true.</p>
+ title="dom-img-complete">complete</code> attribute is true and
+ its <code title="attr-img-src">src</code> attribute is neither
+ omitted nor empty.</p>
</dd>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -d -r1.1131 -r1.1132
--- spec.html 11 Aug 2010 03:56:45 -0000 1.1131
+++ spec.html 11 Aug 2010 20:37:41 -0000 1.1132
@@ -336,7 +336,7 @@
<a href="Overview.html">single page HTML</a>,
<a href="spec.html">multipage HTML</a>,
<a href="author/">author edition</a>.
-This is revision 1.4206.
+This is revision 1.4208.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2010 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Wednesday, 11 August 2010 20:37:45 UTC