[] (0) Clarify how registered handlers work a little. (bug 6457)

git-svn-id: http://svn.whatwg.org/webapps@3125 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · May 25, 2009 · 5dfc815 · 5dfc815
1 parent 8103813
commit 5dfc815
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 37 deletions.
diff --git a/index b/index
@@ -49008,9 +49008,10 @@ interface <dfn id=function>Function</dfn> {
     a url">resolve</a> the resulting URL, relative to the <a href="#script's-base-url" title="script's base URL">base URL</a> of the <a href=#first-script>first
     script</a> at the time the <code title=dom-navigator-registerContentHandler><a href=#dom-navigator-registercontenthandler>registerContentHandler()</a></code>
     or <code title=dom-navigator-registerProtocolHandler><a href=#dom-navigator-registerprotocolhandler>registerProtocolHandler()</a></code>
-    methods were invoked, and then <a href=#fetch>fetch</a> the resulting
-    URL using the GET method (<a href=#concept-http-equivalent-get title=concept-http-equivalent-get>or equivalent</a> for
-    non-HTTP URLs).</p>
+    methods were invoked, and then <a href=#navigate>navigate</a> an
+    appropriate <a href=#browsing-context>browsing context</a> to the resulting URL
+    using the GET method (<a href=#concept-http-equivalent-get title=concept-http-equivalent-get>or
+    equivalent</a> for non-HTTP URLs).</p>
 
     <p>To get the escaped version of the <a href=#absolute-url>absolute URL</a> of
     the content in question, the user agent must replace every
@@ -51511,12 +51512,20 @@ user reload must be equivalent to .reload()
    equivalent</a>, then <a href=#scroll-to-fragid title=navigate-fragid>navigate to
    that fragment identifier</a> and abort these steps.</li>
 
-   <li><p>If the new resource is to be handled by displaying some sort
-   of inline content, e.g. an error message because the specified
-   scheme is not one of the supported protocols, or an inline prompt
-   to allow the user to select <a href=#dom-navigator-registerprotocolhandler title=dom-navigator-registerProtocolHandler>a registered
-   handler</a> for the given scheme, then <a href=#read-ua-inline title=navigate-ua-inline>display the inline content</a> and
-   abort these steps.</li>
+   <li>
+
+    <p>If the new resource is to be handled by displaying some sort of
+    inline content, e.g. an error message because the specified scheme
+    is not one of the supported protocols, or an inline prompt to
+    allow the user to select <a href=#dom-navigator-registerprotocolhandler title=dom-navigator-registerProtocolHandler>a registered
+    handler</a> for the given scheme, then <a href=#read-ua-inline title=navigate-ua-inline>display the inline content</a> and
+    abort these steps.</p>
+
+    <p class=note>In the case of a registered handler being used,
+    the algorithm will be reinvoked with a new URL to handle the
+    request.</p>
+
+   </li>
 
    <li><p>If the new resource is to be handled using a mechanism that
    does not affect the browsing context, e.g. ignoring the navigation
@@ -51718,13 +51727,20 @@ user reload must be equivalent to .reload()
 
    </li>
 
-   <li id=navigate-non-Document><p><i>Non-document content</i>: If,
-   given <var title="">type</var>, the new resource is to be handled
-   by displaying some sort of inline content, e.g. a native rendering
-   of the content, an error message because the specified type is not
-   supported, or an inline prompt to allow the user to select <a href=#dom-navigator-registercontenthandler title=dom-navigator-registerContentHandler>a registered
-   handler</a> for the given type, then <a href=#read-ua-inline title=navigate-ua-inline>display the inline content</a> and
-   abort these steps.</li>
+   <li id=navigate-non-Document>
+
+    <p><i>Non-document content</i>: If, given <var title="">type</var>, the new resource is to be handled by
+    displaying some sort of inline content, e.g. a native rendering of
+    the content, an error message because the specified type is not
+    supported, or an inline prompt to allow the user to select <a href=#dom-navigator-registercontenthandler title=dom-navigator-registerContentHandler>a registered
+    handler</a> for the given type, then <a href=#read-ua-inline title=navigate-ua-inline>display the inline content</a> and
+    abort these steps.</p>
+
+    <p class=note>In the case of a registered handler being used,
+    the algorithm will be reinvoked with a new URL to handle the
+    request.</p>
+
+   </li>
 
    <li><p>Otherwise, the document's <var title="">type</var> is such
    that the resource will not affect the browsing context,

diff --git a/source b/source
@@ -55896,10 +55896,10 @@ interface <dfn>Function</dfn> {
     title="dom-navigator-registerContentHandler">registerContentHandler()</code>
     or <code
     title="dom-navigator-registerProtocolHandler">registerProtocolHandler()</code>
-    methods were invoked, and then <span>fetch</span> the resulting
-    URL using the GET method (<span
-    title="concept-http-equivalent-get">or equivalent</span> for
-    non-HTTP URLs).</p>
+    methods were invoked, and then <span>navigate</span> an
+    appropriate <span>browsing context</span> to the resulting URL
+    using the GET method (<span title="concept-http-equivalent-get">or
+    equivalent</span> for non-HTTP URLs).</p>
 
     <p>To get the escaped version of the <span>absolute URL</span> of
     the content in question, the user agent must replace every
@@ -58823,14 +58823,22 @@ user reload must be equivalent to .reload()
    equivalent</span>, then <span title="navigate-fragid">navigate to
    that fragment identifier</span> and abort these steps.</p></li>
 
-   <li><p>If the new resource is to be handled by displaying some sort
-   of inline content, e.g. an error message because the specified
-   scheme is not one of the supported protocols, or an inline prompt
-   to allow the user to select <span
-   title="dom-navigator-registerProtocolHandler">a registered
-   handler</span> for the given scheme, then <span
-   title="navigate-ua-inline">display the inline content</span> and
-   abort these steps.</p></li>
+   <li>
+
+    <p>If the new resource is to be handled by displaying some sort of
+    inline content, e.g. an error message because the specified scheme
+    is not one of the supported protocols, or an inline prompt to
+    allow the user to select <span
+    title="dom-navigator-registerProtocolHandler">a registered
+    handler</span> for the given scheme, then <span
+    title="navigate-ua-inline">display the inline content</span> and
+    abort these steps.</p>
+
+    <p class="note">In the case of a registered handler being used,
+    the algorithm will be reinvoked with a new URL to handle the
+    request.</p>
+
+   </li>
 
    <li><p>If the new resource is to be handled using a mechanism that
    does not affect the browsing context, e.g. ignoring the navigation
@@ -59060,15 +59068,23 @@ user reload must be equivalent to .reload()
 
    </li>
 
-   <li id="navigate-non-Document"><p><i>Non-document content</i>: If,
-   given <var title="">type</var>, the new resource is to be handled
-   by displaying some sort of inline content, e.g. a native rendering
-   of the content, an error message because the specified type is not
-   supported, or an inline prompt to allow the user to select <span
-   title="dom-navigator-registerContentHandler">a registered
-   handler</span> for the given type, then <span
-   title="navigate-ua-inline">display the inline content</span> and
-   abort these steps.</p></li>
+   <li id="navigate-non-Document">
+
+    <p><i>Non-document content</i>: If, given <var
+    title="">type</var>, the new resource is to be handled by
+    displaying some sort of inline content, e.g. a native rendering of
+    the content, an error message because the specified type is not
+    supported, or an inline prompt to allow the user to select <span
+    title="dom-navigator-registerContentHandler">a registered
+    handler</span> for the given type, then <span
+    title="navigate-ua-inline">display the inline content</span> and
+    abort these steps.</p>
+
+    <p class="note">In the case of a registered handler being used,
+    the algorithm will be reinvoked with a new URL to handle the
+    request.</p>
+
+   </li>
 
    <li><p>Otherwise, the document's <var title="">type</var> is such
    that the resource will not affect the browsing context,