Merge pull request #1492 from WebPlatformForEmbedded/pgorszkowski/2.38/SpeechSynthesis-Emit-error-event-for-all-cancelled-utterances

[SpeechSynthesis] Emit error event for all cancelled utterances

Author: pgorszkowski-igalia

LayoutTests/fast/speechsynthesis/speech-synthesis-cancel-expected.txt

@@ -7,6 +7,8 @@ Speech started
 PASS speechSynthesis.pending is true
 Speech error received because we cancelled and speech should no longer be pending.
 PASS speechSynthesis.pending is false
+Speech error received because we cancelled and speech should no longer be pending.
+Speech error received because we cancelled and speech should no longer be pending.
 PASS successfullyParsed is true
 
 TEST COMPLETE

LayoutTests/fast/speechsynthesis/speech-synthesis-cancel.html

@@ -27,18 +27,24 @@
     u.onerror = function(event) {
        debug("Speech error received because we cancelled and speech should no longer be pending.");
        shouldBeFalse("speechSynthesis.pending");
-       finishJSTest();
     }
 
     // Queue the first job which will start speaking immediately.
     speechSynthesis.speak(u);
 
     // Make a few more jobs, so that when we cancel, it will clear the entire queue.
     var u2 = new SpeechSynthesisUtterance("this is a second test");
+    u2.onerror = function(event) {
+       debug("Speech error received because we cancelled and speech should no longer be pending.");
+    }
     speechSynthesis.speak(u2);
 
     // Make a few more jobs, so that when we cancel, it will clear the entire queue.
     var u3 = new SpeechSynthesisUtterance("this is a third test");
+    u3.onerror = function(event) {
+       debug("Speech error received because we cancelled and speech should no longer be pending.");
+       finishJSTest();
+    }
     speechSynthesis.speak(u3);
 
     // While we have two jobs, speech synthesis should report that it's pending.

Source/WebCore/Modules/speech/SpeechSynthesis.cpp

@@ -162,17 +162,24 @@ void SpeechSynthesis::cancel()
     // Remove all the items from the utterance queue.
     // Hold on to the current utterance so the platform synthesizer can have a chance to clean up.
     RefPtr<SpeechSynthesisUtterance> current = m_currentSpeechUtterance;
-    m_utteranceQueue.clear();
+    // Clear m_utteranceQueue before calling cancel to avoid picking up new utterances
+    // on completion callback
+    auto utteranceQueue = WTFMove(m_utteranceQueue);
     if (m_speechSynthesisClient) {
         m_speechSynthesisClient->cancel();
         // If we wait for cancel to callback speakingErrorOccurred, then m_currentSpeechUtterance will be null
         // and the event won't be processed. Instead we process the error immediately.
         speakingErrorOccurred(SpeechSynthesisErrorCode::Canceled);
         m_currentSpeechUtterance = nullptr;
-    } else if (m_platformSpeechSynthesizer) {
+    } else if (m_platformSpeechSynthesizer)
         m_platformSpeechSynthesizer->cancel();
-        // The platform should have called back immediately and cleared the current utterance.
-        ASSERT(!m_currentSpeechUtterance);
+
+    // Trigger canceled events for queued utterances
+    while (!utteranceQueue.isEmpty()) {
+        const auto utterance = utteranceQueue.takeFirst();
+        // Current utterance is handled in platform cancel()
+        if (current.get() != utterance.ptr())
+            utterance.get().errorEventOccurred(eventNames().errorEvent, SpeechSynthesisErrorCode::Canceled);
     }
     current = nullptr;
 }