Title: [291657] branches/safari-613-branch
Revision
291657
Author
alanc...@apple.com
Date
2022-03-22 10:56:07 -0700 (Tue, 22 Mar 2022)

Log Message

Cherry-pick r291009. rdar://problem/89952347

    AX: Speech Synthesis no longer returning list of voices in macOS 12.3
    https://bugs.webkit.org/show_bug.cgi?id=237584
    <rdar://problem/89952347>

    Reviewed by Andres Gonzalez.

    Source/WTF:

    The minimum macOS version was meant to be 13 and above, but we started including 12.x releases inadvertently.

    * wtf/PlatformHave.h:

    LayoutTests:

    * fast/speechsynthesis/voices-non-mock-expected.txt: Added.
    * fast/speechsynthesis/voices-non-mock.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Added Paths

Diff

Modified: branches/safari-613-branch/LayoutTests/ChangeLog (291656 => 291657)


--- branches/safari-613-branch/LayoutTests/ChangeLog	2022-03-22 17:56:04 UTC (rev 291656)
+++ branches/safari-613-branch/LayoutTests/ChangeLog	2022-03-22 17:56:07 UTC (rev 291657)
@@ -1,5 +1,40 @@
 2022-03-21  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r291009. rdar://problem/89952347
+
+    AX: Speech Synthesis no longer returning list of voices in macOS 12.3
+    https://bugs.webkit.org/show_bug.cgi?id=237584
+    <rdar://problem/89952347>
+    
+    Reviewed by Andres Gonzalez.
+    
+    Source/WTF:
+    
+    The minimum macOS version was meant to be 13 and above, but we started including 12.x releases inadvertently.
+    
+    * wtf/PlatformHave.h:
+    
+    LayoutTests:
+    
+    * fast/speechsynthesis/voices-non-mock-expected.txt: Added.
+    * fast/speechsynthesis/voices-non-mock.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291009 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-08  Chris Fleizach  <cfleiz...@apple.com>
+
+            AX: Speech Synthesis no longer returning list of voices in macOS 12.3
+            https://bugs.webkit.org/show_bug.cgi?id=237584
+            <rdar://problem/89952347>
+
+            Reviewed by Andres Gonzalez.
+
+            * fast/speechsynthesis/voices-non-mock-expected.txt: Added.
+            * fast/speechsynthesis/voices-non-mock.html: Added.
+
+2022-03-21  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r290830. rdar://problem/89081463
 
     CSP report does not get sent to the document in the case of a detached element

Added: branches/safari-613-branch/LayoutTests/fast/speechsynthesis/voices-non-mock-expected.txt (0 => 291657)


--- branches/safari-613-branch/LayoutTests/fast/speechsynthesis/voices-non-mock-expected.txt	                        (rev 0)
+++ branches/safari-613-branch/LayoutTests/fast/speechsynthesis/voices-non-mock-expected.txt	2022-03-22 17:56:07 UTC (rev 291657)
@@ -0,0 +1,12 @@
+This tests that we can get synthesizer voices.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS voiceCount > 20 is true
+PASS foundEnglishVoice is true
+PASS foundDefaultVoice is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: branches/safari-613-branch/LayoutTests/fast/speechsynthesis/voices-non-mock.html (0 => 291657)


--- branches/safari-613-branch/LayoutTests/fast/speechsynthesis/voices-non-mock.html	                        (rev 0)
+++ branches/safari-613-branch/LayoutTests/fast/speechsynthesis/voices-non-mock.html	2022-03-22 17:56:07 UTC (rev 291657)
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+
+<script>
+    description("This tests that we can get synthesizer voices.");
+
+    var speech = window.speechSynthesis;
+    var list = speech.getVoices();
+
+    var foundDefaultVoice = false;
+    var foundEnglishVoice = false;
+    var voiceCount = list.length;
+
+    for (let k = 0; k < list.length; k++) {
+        let voice = list[k];
+        if (voice.lang == "en-US")
+            foundEnglishVoice = true;
+        if (voice.default)
+            foundDefaultVoice = true;
+    }
+
+    shouldBeTrue("voiceCount > 20");
+    shouldBeTrue("foundEnglishVoice");
+    shouldBeTrue("foundDefaultVoice");
+
+</script>
+
+</body>
+</html>

Modified: branches/safari-613-branch/Source/WTF/ChangeLog (291656 => 291657)


--- branches/safari-613-branch/Source/WTF/ChangeLog	2022-03-22 17:56:04 UTC (rev 291656)
+++ branches/safari-613-branch/Source/WTF/ChangeLog	2022-03-22 17:56:07 UTC (rev 291657)
@@ -1,5 +1,41 @@
 2022-03-21  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r291009. rdar://problem/89952347
+
+    AX: Speech Synthesis no longer returning list of voices in macOS 12.3
+    https://bugs.webkit.org/show_bug.cgi?id=237584
+    <rdar://problem/89952347>
+    
+    Reviewed by Andres Gonzalez.
+    
+    Source/WTF:
+    
+    The minimum macOS version was meant to be 13 and above, but we started including 12.x releases inadvertently.
+    
+    * wtf/PlatformHave.h:
+    
+    LayoutTests:
+    
+    * fast/speechsynthesis/voices-non-mock-expected.txt: Added.
+    * fast/speechsynthesis/voices-non-mock.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291009 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-08  Chris Fleizach  <cfleiz...@apple.com>
+
+            AX: Speech Synthesis no longer returning list of voices in macOS 12.3
+            https://bugs.webkit.org/show_bug.cgi?id=237584
+            <rdar://problem/89952347>
+
+            Reviewed by Andres Gonzalez.
+
+            The minimum macOS version was meant to be 13 and above, but we started including 12.x releases inadvertently.
+
+            * wtf/PlatformHave.h:
+
+2022-03-21  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r290969. rdar://problem/89638872
 
     Preconnecting after process swap is a page load time improvement on some devices

Modified: branches/safari-613-branch/Source/WTF/wtf/PlatformHave.h (291656 => 291657)


--- branches/safari-613-branch/Source/WTF/wtf/PlatformHave.h	2022-03-22 17:56:04 UTC (rev 291656)
+++ branches/safari-613-branch/Source/WTF/wtf/PlatformHave.h	2022-03-22 17:56:07 UTC (rev 291657)
@@ -767,7 +767,7 @@
 #endif
 #endif
 
-#if ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 120000)
+#if ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000)
 #if !defined(HAVE_AVSPEECHSYNTHESIS_SYSTEMVOICE)
 #define HAVE_AVSPEECHSYNTHESIS_SYSTEMVOICE 1
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to