Skip to content

Commit

Permalink
[e] (0) Move FileCallback into the spec rather than referencing File …
Browse files Browse the repository at this point in the history 
…System API just for that.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=20581
Affected topics: Canvas, DOM APIs, HTML

git-svn-id: http://svn.whatwg.org/webapps@7824 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Apr 12, 2013
1 parent f38af77 commit b4cf2fb
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 32 deletions.
21 changes: 11 additions & 10 deletions complete.html
View file
Expand Up @@ -382,7 +382,8 @@ <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 April 2013</h2
<li><a href=#domelementmap-0><span class=secno>2.7.4 </span>DOMElementMap</a></li>
<li><a href=#transferable-objects><span class=secno>2.7.5 </span>Transferable objects</a></li>
<li><a href=#safe-passing-of-structured-data><span class=secno>2.7.6 </span>Safe passing of structured data</a></li>
<li><a href=#garbage-collection><span class=secno>2.7.7 </span>Garbage collection</a></ol></li>
<li><a href=#callbacks><span class=secno>2.7.7 </span>Callbacks</a></li>
<li><a href=#garbage-collection><span class=secno>2.7.8 </span>Garbage collection</a></ol></li>
<li><a href=#namespaces><span class=secno>2.8 </span>Namespaces</a></ol></li>
<li><a href=#dom><span class=secno>3 </span>Semantics, structure, and APIs of HTML documents</a>
<ol>
Expand Down Expand Up @@ -3705,10 +3706,6 @@ <h4 id=dependencies><span class=secno>2.2.2 </span>Dependencies</h4>
<li><dfn id=blob.close()><code title=dom-Blob-close>Blob.close()</code></dfn></li>
<li><dfn id=blob.type><code title=dom-Blob-type>Blob.type</code></dfn></li>
<li>The concept of <dfn id=file-error-read title=file-error-read>read errors</dfn></li>
</ul><p>It also uses the following interface defined in the File System API specification: <a href=#refsFILESYSTEMAPI>[FILESYSTEMAPI]</a></p>

<ul class=brief><li><dfn id=filecallback><code>FileCallback</code></dfn></li>

</ul></dd>


Expand Down Expand Up @@ -8168,10 +8165,17 @@ <h4 id=safe-passing-of-structured-data><span class=secno>2.7.6 </span>Safe passi
</div>


<h4 id=callbacks><span class=secno>2.7.7 </span>Callbacks</h4>

<p>The following callback interface is used in various APIs that interact with <code><a href=#file>File</a></code>
objects:</p>

<pre class=idl>callback <dfn id=filecallback>FileCallback</dfn> = void (<a href=#file>File</a> file);</pre>


<div class=impl>

<h4 id=garbage-collection><span class=secno>2.7.7 </span>Garbage collection</h4>
<h4 id=garbage-collection><span class=secno>2.7.8 </span>Garbage collection</h4>

<p>There is an <dfn id=implied-strong-reference>implied strong reference</dfn> from any IDL
attribute that returns a pre-existing object to that object.</p>
Expand Down Expand Up @@ -32874,7 +32878,7 @@ <h4 id=the-canvas-element><span class=secno>4.8.11 </span>The <dfn id=canvas><co
<li><p>If <var title="">callback</var> is null, abort these steps.</li>

<li><p><a href=#queue-a-task>Queue a task</a> to invoke the <code><a href=#filecallback>FileCallback</a></code> <var title="">callback</var> with <var title="">result</var> as its argument. The <a href=#task-source>task
source</a> for this task is the <dfn id=canvas-blob-serialization-task-source>canvas blob serialization task source</dfn>. <a href=#refsFILESYSTEMAPI>[FILESYSTEMAPI]</a></li>
source</a> for this task is the <dfn id=canvas-blob-serialization-task-source>canvas blob serialization task source</dfn>.</li>

</ol></div>
<!--REMOVE-TOPIC:DOM APIs-->
Expand Down Expand Up @@ -100695,9 +100699,6 @@ <h2 class=no-num id=references>References</h2><!--REFS-->
<dt id=refsFILEAPI>[FILEAPI]</dt>
<dd><cite><a href=http://dev.w3.org/2006/webapi/FileUpload/publish/FileAPI.html>File API</a></cite>, A. Ranganathan. W3C.</dd>

<dt id=refsFILESYSTEMAPI>[FILESYSTEMAPI]</dt>
<dd><cite><a href=http://dev.w3.org/2009/dap/file-system/file-dir-sys.html>File API: Directories and System</a></cite>, E. Uhrhane. W3C.</dd>

<dt id=refsFULLSCREEN>[FULLSCREEN]</dt>
<dd><cite><a href=http://fullscreen.spec.whatwg.org/>Fullscreen</a></cite>, A. van Kesteren, T. &Ccedil;elik. WHATWG.</dd>

Expand Down
21 changes: 11 additions & 10 deletions index
View file
Expand Up @@ -382,7 +382,8 @@
<li><a href=#domelementmap-0><span class=secno>2.7.4 </span>DOMElementMap</a></li>
<li><a href=#transferable-objects><span class=secno>2.7.5 </span>Transferable objects</a></li>
<li><a href=#safe-passing-of-structured-data><span class=secno>2.7.6 </span>Safe passing of structured data</a></li>
<li><a href=#garbage-collection><span class=secno>2.7.7 </span>Garbage collection</a></ol></li>
<li><a href=#callbacks><span class=secno>2.7.7 </span>Callbacks</a></li>
<li><a href=#garbage-collection><span class=secno>2.7.8 </span>Garbage collection</a></ol></li>
<li><a href=#namespaces><span class=secno>2.8 </span>Namespaces</a></ol></li>
<li><a href=#dom><span class=secno>3 </span>Semantics, structure, and APIs of HTML documents</a>
<ol>
Expand Down Expand Up @@ -3705,10 +3706,6 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
<li><dfn id=blob.close()><code title=dom-Blob-close>Blob.close()</code></dfn></li>
<li><dfn id=blob.type><code title=dom-Blob-type>Blob.type</code></dfn></li>
<li>The concept of <dfn id=file-error-read title=file-error-read>read errors</dfn></li>
</ul><p>It also uses the following interface defined in the File System API specification: <a href=#refsFILESYSTEMAPI>[FILESYSTEMAPI]</a></p>

<ul class=brief><li><dfn id=filecallback><code>FileCallback</code></dfn></li>

</ul></dd>


Expand Down Expand Up @@ -8168,10 +8165,17 @@ interface <dfn id=transferable>Transferable</dfn> { };</pre>
</div>


<h4 id=callbacks><span class=secno>2.7.7 </span>Callbacks</h4>

<p>The following callback interface is used in various APIs that interact with <code><a href=#file>File</a></code>
objects:</p>

<pre class=idl>callback <dfn id=filecallback>FileCallback</dfn> = void (<a href=#file>File</a> file);</pre>


<div class=impl>

<h4 id=garbage-collection><span class=secno>2.7.7 </span>Garbage collection</h4>
<h4 id=garbage-collection><span class=secno>2.7.8 </span>Garbage collection</h4>

<p>There is an <dfn id=implied-strong-reference>implied strong reference</dfn> from any IDL
attribute that returns a pre-existing object to that object.</p>
Expand Down Expand Up @@ -32874,7 +32878,7 @@ interface <dfn id=htmlcanvaselement>HTMLCanvasElement</dfn> : <a href=#htmleleme
<li><p>If <var title="">callback</var> is null, abort these steps.</li>

<li><p><a href=#queue-a-task>Queue a task</a> to invoke the <code><a href=#filecallback>FileCallback</a></code> <var title="">callback</var> with <var title="">result</var> as its argument. The <a href=#task-source>task
source</a> for this task is the <dfn id=canvas-blob-serialization-task-source>canvas blob serialization task source</dfn>. <a href=#refsFILESYSTEMAPI>[FILESYSTEMAPI]</a></li>
source</a> for this task is the <dfn id=canvas-blob-serialization-task-source>canvas blob serialization task source</dfn>.</li>

</ol></div>
<!--REMOVE-TOPIC:DOM APIs-->
Expand Down Expand Up @@ -100695,9 +100699,6 @@ if (s = prompt('What is your name?')) {
<dt id=refsFILEAPI>[FILEAPI]</dt>
<dd><cite><a href=http://dev.w3.org/2006/webapi/FileUpload/publish/FileAPI.html>File API</a></cite>, A. Ranganathan. W3C.</dd>

<dt id=refsFILESYSTEMAPI>[FILESYSTEMAPI]</dt>
<dd><cite><a href=http://dev.w3.org/2009/dap/file-system/file-dir-sys.html>File API: Directories and System</a></cite>, E. Uhrhane. W3C.</dd>

<dt id=refsFULLSCREEN>[FULLSCREEN]</dt>
<dd><cite><a href=http://fullscreen.spec.whatwg.org/>Fullscreen</a></cite>, A. van Kesteren, T. &Ccedil;elik. WHATWG.</dd>

Expand Down
20 changes: 8 additions & 12 deletions source
View file
Expand Up @@ -18,7 +18,6 @@
interface URL { }; // URL API
interface Blob { }; // File API
interface File : Blob { }; // File API
interface FileCallback { }; // File API
interface FileList { }; // File API
interface WebGLRenderingContext { }; // WebGL
interface ArrayBuffer { }; // TypedArray
Expand Down Expand Up @@ -2550,15 +2549,6 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
<li>The concept of <dfn title="file-error-read">read errors</dfn></li>
</ul>

<p>It also uses the following interface defined in the File System API specification: <a
href="#refsFILESYSTEMAPI">[FILESYSTEMAPI]</a></p>

<ul class="brief">

<li><dfn><code>FileCallback</code></dfn></li>

</ul>

</dd>


Expand Down Expand Up @@ -7853,6 +7843,13 @@ interface <dfn>Transferable</dfn> { };</pre>
</div>


<h4>Callbacks</h4>

<p>The following callback interface is used in various APIs that interact with <code>File</code>
objects:</p>

<pre class="idl">callback <dfn>FileCallback</dfn> = void (<span>File</span> file);</pre>


<div class="impl">

Expand Down Expand Up @@ -39789,8 +39786,7 @@ interface <dfn>HTMLCanvasElement</dfn> : <span>HTMLElement</span> {

<li><p><span>Queue a task</span> to invoke the <code>FileCallback</code> <var
title="">callback</var> with <var title="">result</var> as its argument. The <span>task
source</span> for this task is the <dfn>canvas blob serialization task source</dfn>. <a
href="#refsFILESYSTEMAPI">[FILESYSTEMAPI]</a></p></li>
source</span> for this task is the <dfn>canvas blob serialization task source</dfn>.</p></li>

</ol>

Expand Down

0 comments on commit b4cf2fb

Please sign in to comment.