[html5] r2920 - [gw] (2) Define the interaction of the appcache feature and the workers feature.

[whatwg at whatwg.org]

Author: ianh
Date: 2009-03-27 18:23:53 -0700 (Fri, 27 Mar 2009)
New Revision: 2920

Modified:
   index
   source
Log:
[gw] (2) Define the interaction of the appcache feature and the workers feature.

Modified: index
===================================================================
--- index	2009-03-28 00:35:07 UTC (rev 2919)
+++ index	2009-03-28 01:23:53 UTC (rev 2920)
@@ -724,11 +724,10 @@
        <li><a href=#parsing-cache-manifests><span class=secno>5.8.3.3 </span>Parsing cache manifests</a></ol></li>
      <li><a href=#updating-an-application-cache><span class=secno>5.8.4 </span>Updating an application cache</a></li>
      <li><a href=#matching-a-fallback-namespace><span class=secno>5.8.5 </span>Matching a fallback namespace</a></li>
-     <li><a href=#the-application-cache-selection-algorithm><span class=secno>5.8.6 </span>The application cache selection algorithm</a>
-      <ol>
-       <li><a href=#changesToNetworkingModel><span class=secno>5.8.6.1 </span>Changes to the networking model</a></ol></li>
-     <li><a href=#application-cache-api><span class=secno>5.8.7 </span>Application cache API</a></li>
-     <li><a href=#browser-state><span class=secno>5.8.8 </span>Browser state</a></ol></li>
+     <li><a href=#the-application-cache-selection-algorithm><span class=secno>5.8.6 </span>The application cache selection algorithm</a></li>
+     <li><a href=#changesToNetworkingModel><span class=secno>5.8.7 </span>Changes to the networking model</a></li>
+     <li><a href=#application-cache-api><span class=secno>5.8.8 </span>Application cache API</a></li>
+     <li><a href=#browser-state><span class=secno>5.8.9 </span>Browser state</a></ol></li>
    <li><a href=#history><span class=secno>5.9 </span>Session history and navigation</a>
     <ol>
      <li><a href=#the-session-history-of-browsing-contexts><span class=secno>5.9.1 </span>The session history of browsing contexts</a></li>
@@ -43279,7 +43278,7 @@
 
    </dd>
 
-  </dl><h5 id=changesToNetworkingModel><span class=secno>5.8.6.1 </span>Changes to the networking model</h5>
+  </dl><h4 id=changesToNetworkingModel><span class=secno>5.8.7 </span>Changes to the networking model</h4>
 
   <p>When a <a href=#cache-host>cache host</a> is associated with an
   <a href=#application-cache>application cache</a> whose <a href=#concept-appcache-completeness title=concept-appcache-completeness>completeness flag</a> is
@@ -43338,7 +43337,7 @@
 
 
 
-  <h4 id=application-cache-api><span class=secno>5.8.7 </span>Application cache API</h4>
+  <h4 id=application-cache-api><span class=secno>5.8.8 </span>Application cache API</h4>
 
   <pre class=idl>interface <dfn id=applicationcache>ApplicationCache</dfn> {
 
@@ -43413,7 +43412,7 @@
   hosts</a> to <code><a href=#applicationcache>ApplicationCache</a></code> objects. The <dfn id=dom-applicationcache title=dom-applicationCache><code>applicationCache</code></dfn>
   attribute on <code><a href=#window>Window</a></code> objects must return the
   <code><a href=#applicationcache>ApplicationCache</a></code> object associated with the
-  <code><a href=#window>Window</a></code> object's <a href=#active-document>active document</a>. The <dfn id=dom-worker-applicationcache title=dom-worker-applicationCache><code>applicationCache</code></dfn>
+  <code><a href=#window>Window</a></code> object's <a href=#active-document>active document</a>. The <dfn id=dom-sharedworkerglobalscope-applicationcache title=dom-SharedWorkerGlobalScope-applicationCache><code>applicationCache</code></dfn>
   attribute on <code>SharedWorkerGlobalScope</code> objects must
   return the <code><a href=#applicationcache>ApplicationCache</a></code> object associated with the
   worker.</p>
@@ -43581,7 +43580,7 @@
   </dl></div>
 
 
-  <h4 id=browser-state><span class=secno>5.8.8 </span>Browser state</h4>
+  <h4 id=browser-state><span class=secno>5.8.9 </span>Browser state</h4>
 
   <dl class=domintro><dt><var title="">window</var> . <code title=dom-navigator><a href=#dom-navigator>navigator</a></code> . <code title=dom-navigator-onLine><a href=#dom-navigator-online>onLine</a></code></dt>
 

Modified: source
===================================================================
--- source	2009-03-28 00:35:07 UTC (rev 2919)
+++ source	2009-03-28 01:23:53 UTC (rev 2920)
@@ -49205,7 +49205,7 @@
 
 
 
-  <h5 id="changesToNetworkingModel">Changes to the networking model</h5>
+  <h4 id="changesToNetworkingModel">Changes to the networking model</h4>
 
   <p>When a <span>cache host</span> is associated with an
   <span>application cache</span> whose <span
@@ -49355,7 +49355,7 @@
   attribute on <code>Window</code> objects must return the
   <code>ApplicationCache</code> object associated with the
   <code>Window</code> object's <span>active document</span>. The <dfn
-  title="dom-worker-applicationCache"><code>applicationCache</code></dfn>
+  title="dom-SharedWorkerGlobalScope-applicationCache"><code>applicationCache</code></dfn>
   attribute on <code>SharedWorkerGlobalScope</code> objects must
   return the <code>ApplicationCache</code> object associated with the
   worker.</p>
@@ -58458,13 +58458,18 @@
 
   </dl>
 
+  <p>For the purposes of the <span>offline application cache</span>
+  networking model, a dedicated worker is an extension of the
+  <span>cache host</span> from which it was created.</p>
 
 
+
   <h5>Shared workers and the <code>SharedWorkerGlobalScope</code> inteface</h5>
 
   <!-- the XXX below is for collapsing this interface onto WorkerGlobalScope so it looks like just one interface - the inheritance is a spec fiction only -->
   <pre class="idl">[NoInterfaceObject, XXX] interface <dfn>SharedWorkerGlobalScope</dfn> : <span>WorkerGlobalScope</span> {
   readonly attribute DOMString <span title="dom-SharedWorkerGlobalScope-name">name</span>;
+  readonly attribute <span>ApplicationCache</span> <span title="dom-SharedWorkerGlobalScope-applicationCache">applicationCache</span>;
            attribute <span>EventListener</span> <span title="handler-SharedWorkerGlobalScope-onconnect">onconnect</span>;
 };</pre>
 
@@ -58494,7 +58499,18 @@
 
   </dl>
 
+  <p>For the purposes of the <span>offline application cache</span>
+  networking model, a shared worker is its own <span>cache
+  host</span>. The <span>run a worker</span> algorithm takes care of
+  associating the worker with an <span>application cache</span>.</p>
 
+  <p class="note">The <dfn
+  title="dom-SharedWorkerGlobalScope-applicationCache"><code>applicationCache</code></dfn>
+  returns the <code>ApplicationCache</code> object for the
+  worker.</p><!-- normative conf criteria is in the appcache section
+  -->
+
+
   <h4>Base URLs and origins of workers</h4>
 
   <p>Both the <span>origin</span> and <span>effective script
@@ -58741,6 +58757,18 @@
 
    </li>
 
+   <li><p>If <var title="">worker global scope</var> is actually a
+   <code>SharedWorkerGlobalScope</code> object (i.e. the worker is a
+   shared worker), and there are any <span title="relevant application
+   cache">relevant application caches</span> that are identified by a
+   manifest URL with the <span>same origin</span> as <var
+   title="">url</var> and that have <var title="">url</var> as one of
+   their entries, <em>not</em> excluding entries marked as <span
+   title="concept-appcache-foreign">foreign</span>, then associate the
+   <var title="">worker global scope</var> with the <span
+   title="concept-appcache-selection">most appropriate application
+   cache</span> of those that match.</p></li>
+
    <li>
 
     <p>Attempt to <span>fetch</span> the resource identified by <var