Export "generate and queue a report" instead of "queue a report". (#253)

* Export "generate a report" instead of "queue a report".
* Rename "generate a report" to "generate and queue a report" (exported), and rename "queue a report" to "generate a report" (not exported)

Author: jyasskin

index.src.html

@@ -298,7 +298,7 @@ <h3 id="queue-report" algorithm>
     Queue |data| as |type| for |destination|
   </h3>
 
-  To <dfn export for="reporting">queue</dfn> a <a>report</a> given a
+  To <dfn>generate a report</dfn> given a
   serializable object (|data|), a string (|type|), another string
   (|destination|), an optional <a>environment settings object</a>
   (|settings|), and an optional {{URL}} (|url|):
@@ -328,14 +328,6 @@ <h3 id="queue-report" algorithm>
   4.  Set |report|'s [=report/url=] to the result of executing the <a>URL
       serializer</a> on |url| with the <em>exclude fragment flag</em> set.
 
-  5.  If |settings| is given, then
-
-      1.  Let |scope| be |settings|'s [=environment settings object/global
-          object=].
-
-      2.  If |scope| is an object implementing {{WindowOrWorkerGlobalScope}},
-          then execute [[#notify-observers]] with |scope| and |report|.
-
   6.  Return |report|.
 
   Note: <a>reporting observers</a> can only observe reports from the
@@ -494,16 +486,24 @@ <h3 id="report-generation">Report Generation</h3>
   <h4 id="generate-report" export algorithm>Generate report of |type| with
   |data|</h4>
 
-  When the user agent is to <dfn>generate a report</dfn> for a <a>Document</a>
+  When the user agent is to <dfn export>generate and queue a report</dfn> for a <a>Document</a>
   or {{WorkerGlobalScope}} object (|context|), given a string (|type|), another
   string (|destination|), and a serializable object (|data|), it must run the
   following steps:
 
   1.  Let |settings| be |context|'s [=relevant settings object=].
 
-  2.  Let |report| be the result of running [[#queue-report]] with |data|,
+  2.  Let |report| be the result of running [=generate a report=] with |data|,
       |type|, |destination| and |settings|.
 
+  1.  If |settings| is given, then
+
+      1.  Let |scope| be |settings|'s [=environment settings object/global
+          object=].
+
+      1.  If |scope| is an object implementing {{WindowOrWorkerGlobalScope}},
+          then execute [[#notify-observers]] with |scope| and |report|.
+
   3. Append |report| to |context|'s [=reports=].
 
   <h3 id="report-delivery">Report Delivery</h3>
@@ -948,7 +948,7 @@ <h2 id="automation">Automation</h2>
 
   <h3 id="generate-test-report-command">Generate Test Report</h3>
 
-  The <dfn>Generate Test Report</dfn> <a>extension command</a> simulates the
+  The <dfn export>Generate Test Report</dfn> <a>extension command</a> simulates the
   generation of a <a>report</a> for the purposes of testing. This report will be
   observed by any <a>registered</a> <a>reporting observers</a>.
 
@@ -1003,7 +1003,7 @@ <h3 id="generate-test-report-command">Generate Test Report</h3>
   9. Let |settings| be the <a>environment settings object</a> of the
      <a>current browsing context</a>'s <a>active document</a>.
 
-  10. Execute [[#queue-report]] with |body|, "test", |group|, and |settings|.
+  10. Execute [=generate and queue a report=] with |body|, "test", |group|, and |settings|.
 
   11. Return <a>success</a> with data null.
 </section>