Rename observer to monitor, move to FetchInit rather than RequestInit.

Author: lukewarlow

fetch.bs

@@ -7559,14 +7559,6 @@ dictionary RequestInit {
   RequestDuplex duplex;
   RequestPriority priority;
   any window; // can only be set to null
-  FetchObserverCallback observer;
-};
-
-callback FetchObserverCallback = undefined (FetchObserver requestObserver, FetchObserver responseObserver);
-
-[Exposed=(Window,Worker)]
-interface FetchObserver : EventTarget {
-  attribute EventHandler onprogress;
 };
 
 enum RequestDestination { "", "audio", "audioworklet", "document", "embed", "font", "frame", "iframe", "image", "json", "manifest", "object", "paintworklet", "report", "script", "sharedworker", "style",  "track", "video", "worker", "xslt" };
@@ -8521,7 +8513,18 @@ otherwise false.
 
 <pre class=idl>
 partial interface mixin WindowOrWorkerGlobalScope {
-  [NewObject] Promise&lt;Response> fetch(RequestInfo input, optional RequestInit init = {});
+  [NewObject] Promise&lt;Response> fetch(RequestInfo input, optional FetchInit init = {});
+};
+
+dictionary FetchInit : RequestInit {
+  FetchMonitorCallback monitor;
+};
+
+callback FetchMonitorCallback = undefined (FetchMonitor requestMonitor, FetchMonitor responseMonitor);
+
+[Exposed=(Window,Worker)]
+interface FetchMonitor : EventTarget {
+  attribute EventHandler onprogress;
 };
 </pre>
 
@@ -8595,28 +8598,28 @@ method steps are:
 
  <li><p>Let <var>hasUploadListeners</var> be false.
 
- <li><p>Let <var>requestObserver</var> be null.
+ <li><p>Let <var>requestMonitor</var> be null.
 
- <li><p>Let <var>responseObserver</var> be null.
+ <li><p>Let <var>responseMonitor</var> be null.
 
  <li>
-  <p>If <var>init</var>["{{RequestInit/observer}}"] <a for=map>exists</a>, then:
+  <p>If <var>init</var>["{{FetchInit/monitor}}"] <a for=map>exists</a>, then:
 
   <ol>
-   <li><p>Let <var>observerCallback</var> be <var>init</var>["{{RequestInit/observer}}"].
+   <li><p>Let <var>monitorCallback</var> be <var>init</var>["{{FetchInit/monitor}}"].
 
-   <li><p>Set <var>requestObserver</var> to a {{FetchObserver}}.
+   <li><p>Set <var>requestMonitor</var> to a {{FetchMonitor}}.
 
-   <li><p>Set <var>responseObserver</var> to a {{FetchObserver}}.
+   <li><p>Set <var>responseMonitor</var> to a {{FetchMonitor}}.
 
-   <li><p>Let <var>args</var> be « <var>requestObserver</var>, <var>responseObserver</var> ».
+   <li><p>Let <var>args</var> be « <var>requestMonitor</var>, <var>responseMonitor</var> ».
 
-   <li><p>[=invoke|Invoke=] <var>observerCallback</var> with <var>args</var>
+   <li><p>[=invoke|Invoke=] <var>monitorCallback</var> with <var>args</var>
    and <code>"rethrow"</code>. If this throws an exception, <a for=/>reject</a> <var>p</var> with it
    and return <var>p</var>.
 
    <li><p>If one or more <a event><code>progress</code></a> event listeners were added to
-   <var>requestObserver</var>, then set <var>hasUploadListeners</var> to true.
+   <var>requestMonitor</var>, then set <var>hasUploadListeners</var> to true.
   </ol>
 
  <li><p>Let <var>requestBodyTransmitted</var> be 0.
@@ -8636,7 +8639,7 @@ method steps are:
    <li><p>If not roughly 50ms has passed since these steps were last invoked, then return.
 
    <li><p>If <var>hasUploadListeners</var> is true, then <a>fire a progress event</a> named
-   <a event><code>progress</code></a> at <var>requestObserver</var> with <var>requestBodyTransmitted</var>
+   <a event><code>progress</code></a> at <var>requestMonitor</var> with <var>requestBodyTransmitted</var>
    and <var>requestBodyLength</var>.
   </ol>
 
@@ -8646,7 +8649,7 @@ method steps are:
   <ol>
    <li><p>If <var>hasUploadListeners</var> is false, then return.
 
-   <li><p><a>Fire a progress event</a> named <a event><code>progress</code></a> at <var>requestObserver</var>
+   <li><p><a>Fire a progress event</a> named <a event><code>progress</code></a> at <var>requestMonitor</var>
    with <var>requestBodyTransmitted</var> and <var>requestBodyLength</var>.
   </ol>
 
@@ -8688,7 +8691,7 @@ method steps are:
 </ol>
 </div>
 
-TEMPORARY <dfn id=event-fetchobserver-progress event for=FetchObserver><code>progress</code></dfn>
+TEMPORARY <dfn id=event-fetchmonitor-progress event for=FetchMonitor><code>progress</code></dfn>
 
 <div algorithm>
 <p>To <dfn lt="Abort the fetch() call" export id=abort-fetch>abort a <code>fetch()</code> call</dfn>