[giow] (0) Improve the accuracy of the <meta> refresh stuff.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=11102 git-svn-id: http://svn.whatwg.org/webapps@5776 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 11, 2011 · 6d95353 · 6d95353
1 parent 463043e
commit 6d95353
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 34 deletions.
diff --git a/complete.html b/complete.html
@@ -13925,7 +13925,7 @@ <h5 id=pragma-directives><span class=secno>4.2.5.3 </span>Pragma directives</h5>
 
     <div class=impl>
 
-    <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><li><p>If another <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+    <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/734 --><li><p>If another <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
      <a href=#attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</a>
      has already been successfully processed (i.e. when it was
      inserted the user agent processed it and reached the last step of
@@ -14022,16 +14022,36 @@ <h5 id=pragma-directives><span class=secno>4.2.5.3 </span>Pragma directives</h5>
 
       <p>Perform one or more of the following steps:</p>
 
-      <ul><li><p>Set a timer so that in <var title="">time</var> seconds,
-       adjusted to take into account user or user agent preferences,
-       if the user has not canceled the redirect and if the
-       <code><a href=#meta>meta</a></code> element's <code><a href=#document>Document</a></code>'s
-       <a href=#browsing-context>browsing context</a> did not have the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed
-       automatic features browsing context flag</a> set when the
-       <code><a href=#document>Document</a></code> was created, the user agent <a href=#navigate title=navigate>navigates</a><!--DONAV meta refresh--> the
-       <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with <a href=#replacement-enabled>replacement enabled</a>, and
-       with the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
-       as the <a href=#source-browsing-context>source browsing context</a>.</li>
+      <ul><li>
+
+        <p>After the refresh has come due (as defined below), if the
+        user has not canceled the redirect and if the
+        <code><a href=#meta>meta</a></code> element's <code><a href=#document>Document</a></code>'s
+        <a href=#browsing-context>browsing context</a> did not have the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed
+        automatic features browsing context flag</a> set when the
+        <code><a href=#document>Document</a></code> was created, <a href=#navigate title=navigate>navigate</a><!--DONAV meta refresh--> the
+        <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with <a href=#replacement-enabled>replacement enabled</a>, and
+        with the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
+        as the <a href=#source-browsing-context>source browsing context</a>.</p>
+
+        <p>For the purposes of the previous paragraph, a refresh is
+        said to have come due as soon as the <em>later</em> of the
+        following two conditions occurs:</p>
+
+        <ul><li>At least <var title="">time</var> seconds have elapsed
+         since the document has <a href=#completely-loaded>completely loaded</a>,
+         adjusted to take into account user or user agent
+         preferences.</li>
+         <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/774 -->
+
+         <li>At least <var title="">time</var> seconds have elapsed
+         since the <code><a href=#meta>meta</a></code> element was <a href=#insert-an-element-into-a-document title="insert
+         an element into a document">inserted into the
+         <code>Document</code></a>, adjusted to take into account
+         user or user agent preferences.</li>
+         <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/772 -->
+
+        </ul></li>
 
        <li><p>Provide the user with an interface that, when selected,
        <a href=#navigate title=navigate>navigates</a><!--DONAV meta

diff --git a/index b/index
@@ -13904,7 +13904,7 @@ people expect to have work and what is necessary.
 
     <div class=impl>
 
-    <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><li><p>If another <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+    <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/734 --><li><p>If another <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
      <a href=#attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</a>
      has already been successfully processed (i.e. when it was
      inserted the user agent processed it and reached the last step of
@@ -14001,16 +14001,36 @@ people expect to have work and what is necessary.
 
       <p>Perform one or more of the following steps:</p>
 
-      <ul><li><p>Set a timer so that in <var title="">time</var> seconds,
-       adjusted to take into account user or user agent preferences,
-       if the user has not canceled the redirect and if the
-       <code><a href=#meta>meta</a></code> element's <code><a href=#document>Document</a></code>'s
-       <a href=#browsing-context>browsing context</a> did not have the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed
-       automatic features browsing context flag</a> set when the
-       <code><a href=#document>Document</a></code> was created, the user agent <a href=#navigate title=navigate>navigates</a><!--DONAV meta refresh--> the
-       <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with <a href=#replacement-enabled>replacement enabled</a>, and
-       with the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
-       as the <a href=#source-browsing-context>source browsing context</a>.</li>
+      <ul><li>
+
+        <p>After the refresh has come due (as defined below), if the
+        user has not canceled the redirect and if the
+        <code><a href=#meta>meta</a></code> element's <code><a href=#document>Document</a></code>'s
+        <a href=#browsing-context>browsing context</a> did not have the <a href=#sandboxed-automatic-features-browsing-context-flag>sandboxed
+        automatic features browsing context flag</a> set when the
+        <code><a href=#document>Document</a></code> was created, <a href=#navigate title=navigate>navigate</a><!--DONAV meta refresh--> the
+        <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a> to <var title="">url</var>, with <a href=#replacement-enabled>replacement enabled</a>, and
+        with the <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
+        as the <a href=#source-browsing-context>source browsing context</a>.</p>
+
+        <p>For the purposes of the previous paragraph, a refresh is
+        said to have come due as soon as the <em>later</em> of the
+        following two conditions occurs:</p>
+
+        <ul><li>At least <var title="">time</var> seconds have elapsed
+         since the document has <a href=#completely-loaded>completely loaded</a>,
+         adjusted to take into account user or user agent
+         preferences.</li>
+         <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/774 -->
+
+         <li>At least <var title="">time</var> seconds have elapsed
+         since the <code><a href=#meta>meta</a></code> element was <a href=#insert-an-element-into-a-document title="insert
+         an element into a document">inserted into the
+         <code>Document</code></a>, adjusted to take into account
+         user or user agent preferences.</li>
+         <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/772 -->
+
+        </ul></li>
 
        <li><p>Provide the user with an interface that, when selected,
        <a href=#navigate title=navigate>navigates</a><!--DONAV meta

diff --git a/source b/source
@@ -14702,6 +14702,7 @@ people expect to have work and what is necessary.
 
     <ol>
      <!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ -->
+     <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/734 -->
 
      <li><p>If another <code>meta</code> element with an <code
      title="attr-meta-http-equiv">http-equiv</code> attribute in the
@@ -14812,18 +14813,42 @@ people expect to have work and what is necessary.
 
       <ul>
 
-       <li><p>Set a timer so that in <var title="">time</var> seconds,
-       adjusted to take into account user or user agent preferences,
-       if the user has not canceled the redirect and if the
-       <code>meta</code> element's <code>Document</code>'s
-       <span>browsing context</span> did not have the <span>sandboxed
-       automatic features browsing context flag</span> set when the
-       <code>Document</code> was created, the user agent <span
-       title="navigate">navigates</span><!--DONAV meta refresh--> the
-       <code>Document</code>'s <span>browsing context</span> to <var
-       title="">url</var>, with <span>replacement enabled</span>, and
-       with the <code>Document</code>'s <span>browsing context</span>
-       as the <span>source browsing context</span>.</p></li>
+       <li>
+
+        <p>After the refresh has come due (as defined below), if the
+        user has not canceled the redirect and if the
+        <code>meta</code> element's <code>Document</code>'s
+        <span>browsing context</span> did not have the <span>sandboxed
+        automatic features browsing context flag</span> set when the
+        <code>Document</code> was created, <span
+        title="navigate">navigate</span><!--DONAV meta refresh--> the
+        <code>Document</code>'s <span>browsing context</span> to <var
+        title="">url</var>, with <span>replacement enabled</span>, and
+        with the <code>Document</code>'s <span>browsing context</span>
+        as the <span>source browsing context</span>.</p>
+
+        <p>For the purposes of the previous paragraph, a refresh is
+        said to have come due as soon as the <em>later</em> of the
+        following two conditions occurs:</p>
+
+        <ul>
+
+         <li>At least <var title="">time</var> seconds have elapsed
+         since the document has <span>completely loaded</span>,
+         adjusted to take into account user or user agent
+         preferences.</li>
+         <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/774 -->
+
+         <li>At least <var title="">time</var> seconds have elapsed
+         since the <code>meta</code> element was <span title="insert
+         an element into a document">inserted into the
+         <code>Document</code></span>, adjusted to take into account
+         user or user agent preferences.</li>
+         <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/772 -->
+
+        </ul>
+
+       </li>
 
        <li><p>Provide the user with an interface that, when selected,
        <span title="navigate">navigates</span><!--DONAV meta