⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 269796 in webkit


Ignore:
Timestamp:
Nov 13, 2020, 2:17:02 PM (6 years ago)
Author:
Russell Epstein
Message:

Cherry-pick r269208. rdar://problem/71378171

AX: Incorrect list of voices being displayed on iOS
​https://bugs.webkit.org/show_bug.cgi?id=218293

Reviewed by Per Arne Vollan.

Source/WebCore:

Limit the voices that we display in WebSpeech to only built-in system voices. This was the intention of the "compact"
decision, but some mobile assets have compact voices, which are not available WebContent.

  • platform/ios/PlatformSpeechSynthesizerIOS.mm: (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):

Source/WebCore/PAL:

  • PAL.xcodeproj/project.pbxproj:
  • pal/PlatformMac.cmake:
  • pal/spi/cocoa/AXSpeechManagerSPI.h: Added.

Source/WTF:

  • wtf/PlatformHave.h:

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

Location:
branches/safari-610-branch/Source
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-610-branch/Source/WTF/ChangeLog

    r269091 r269796  
     12020-11-13  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r269208. rdar://problem/71378171
     4
     5    AX: Incorrect list of voices being displayed on iOS
     6    https://bugs.webkit.org/show_bug.cgi?id=218293
     7   
     8    Reviewed by Per Arne Vollan.
     9   
     10    Source/WebCore:
     11   
     12    Limit the voices that we display in WebSpeech to only built-in system voices. This was the intention of the "compact"
     13    decision, but some mobile assets have compact voices, which are not available WebContent.
     14   
     15    * platform/ios/PlatformSpeechSynthesizerIOS.mm:
     16    (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
     17   
     18    Source/WebCore/PAL:
     19   
     20    * PAL.xcodeproj/project.pbxproj:
     21    * pal/PlatformMac.cmake:
     22    * pal/spi/cocoa/AXSpeechManagerSPI.h: Added.
     23   
     24    Source/WTF:
     25   
     26    * wtf/PlatformHave.h:
     27   
     28    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269208 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     29
     30    2020-10-30  Chris Fleizach  <cfleizach@apple.com>
     31
     32            AX: Incorrect list of voices being displayed on iOS
     33            https://bugs.webkit.org/show_bug.cgi?id=218293
     34
     35            Reviewed by Per Arne Vollan.
     36
     37            * wtf/PlatformHave.h:
     38
    1392020-10-27  Russell Epstein  <repstein@apple.com>
    240

  • branches/safari-610-branch/Source/WTF/wtf/PlatformHave.h

    r268480 r269796  
    706706#define HAVE_CATALYST_USER_INTERFACE_IDIOM_AND_SCALE_FACTOR 1
    707707#endif
     708
     709#if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140300
     710#if !defined(HAVE_AVSPEECHSYNTHESIS_SYSTEMVOICE)
     711#define HAVE_AVSPEECHSYNTHESIS_SYSTEMVOICE 1
     712#endif
     713#endif

  • branches/safari-610-branch/Source/WebCore/ChangeLog

    r269795 r269796  
     12020-11-13  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r269208. rdar://problem/71378171
     4
     5    AX: Incorrect list of voices being displayed on iOS
     6    https://bugs.webkit.org/show_bug.cgi?id=218293
     7   
     8    Reviewed by Per Arne Vollan.
     9   
     10    Source/WebCore:
     11   
     12    Limit the voices that we display in WebSpeech to only built-in system voices. This was the intention of the "compact"
     13    decision, but some mobile assets have compact voices, which are not available WebContent.
     14   
     15    * platform/ios/PlatformSpeechSynthesizerIOS.mm:
     16    (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
     17   
     18    Source/WebCore/PAL:
     19   
     20    * PAL.xcodeproj/project.pbxproj:
     21    * pal/PlatformMac.cmake:
     22    * pal/spi/cocoa/AXSpeechManagerSPI.h: Added.
     23   
     24    Source/WTF:
     25   
     26    * wtf/PlatformHave.h:
     27   
     28    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269208 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     29
     30    2020-10-30  Chris Fleizach  <cfleizach@apple.com>
     31
     32            AX: Incorrect list of voices being displayed on iOS
     33            https://bugs.webkit.org/show_bug.cgi?id=218293
     34
     35            Reviewed by Per Arne Vollan.
     36
     37            Limit the voices that we display in WebSpeech to only built-in system voices. This was the intention of the "compact"
     38            decision, but some mobile assets have compact voices, which are not available WebContent.
     39
     40            * platform/ios/PlatformSpeechSynthesizerIOS.mm:
     41            (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
     42
    1432020-11-13  Russell Epstein  <repstein@apple.com>
    244

  • branches/safari-610-branch/Source/WebCore/PAL/ChangeLog

    r268533 r269796  
     12020-11-13  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r269208. rdar://problem/71378171
     4
     5    AX: Incorrect list of voices being displayed on iOS
     6    https://bugs.webkit.org/show_bug.cgi?id=218293
     7   
     8    Reviewed by Per Arne Vollan.
     9   
     10    Source/WebCore:
     11   
     12    Limit the voices that we display in WebSpeech to only built-in system voices. This was the intention of the "compact"
     13    decision, but some mobile assets have compact voices, which are not available WebContent.
     14   
     15    * platform/ios/PlatformSpeechSynthesizerIOS.mm:
     16    (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
     17   
     18    Source/WebCore/PAL:
     19   
     20    * PAL.xcodeproj/project.pbxproj:
     21    * pal/PlatformMac.cmake:
     22    * pal/spi/cocoa/AXSpeechManagerSPI.h: Added.
     23   
     24    Source/WTF:
     25   
     26    * wtf/PlatformHave.h:
     27   
     28    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269208 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     29
     30    2020-10-30  Chris Fleizach  <cfleizach@apple.com>
     31
     32            AX: Incorrect list of voices being displayed on iOS
     33            https://bugs.webkit.org/show_bug.cgi?id=218293
     34
     35            Reviewed by Per Arne Vollan.
     36
     37            * PAL.xcodeproj/project.pbxproj:
     38            * pal/PlatformMac.cmake:
     39            * pal/spi/cocoa/AXSpeechManagerSPI.h: Added.
     40
    1412020-10-15  Russell Epstein  <repstein@apple.com>
    242

  • branches/safari-610-branch/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

    r268105 r269796  
    116116                293EE4A824154F8F0047493D /* AccessibilitySupportSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 293EE4A624154F8F0047493D /* AccessibilitySupportSoftLink.cpp */; };
    117117                293EE4A924154F8F0047493D /* AccessibilitySupportSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 293EE4A724154F8F0047493D /* AccessibilitySupportSoftLink.h */; };
     118                29CDEBA62548D57F007C07B7 /* AXSpeechManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CDEB9E2548D055007C07B7 /* AXSpeechManagerSPI.h */; };
    118119                2D02E93C2056FAA700A13797 /* AudioToolboxSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */; };
    119120                2E1342CC215AA10A007199D2 /* UIKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */; };
    … …  
    305306                293EE4A624154F8F0047493D /* AccessibilitySupportSoftLink.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilitySupportSoftLink.cpp; sourceTree = "<group>"; };
    306307                293EE4A724154F8F0047493D /* AccessibilitySupportSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccessibilitySupportSoftLink.h; sourceTree = "<group>"; };
     308                29CDEB9E2548D055007C07B7 /* AXSpeechManagerSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AXSpeechManagerSPI.h; sourceTree = "<group>"; };
    307309                2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioToolboxSPI.h; sourceTree = "<group>"; };
    308310                2E1342CA215AA10A007199D2 /* UIKitSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSoftLink.h; sourceTree = "<group>"; };
    … …  
    455457                                0C7785701F45130F00F4EBB6 /* AVFoundationSPI.h */,
    456458                                0C2DA1221F3BEB4900DBC317 /* AVKitSPI.h */,
     459                                29CDEB9E2548D055007C07B7 /* AXSpeechManagerSPI.h */,
    457460                                0C2DA1231F3BEB4900DBC317 /* CFNSURLConnectionSPI.h */,
    458461                                7A36D0F8223AD9AB00B0522E /* CommonCryptoSPI.h */,
    … …  
    899902                                07611DB6243FA5BF00D80704 /* UsageTrackingSoftLink.h in Headers */,
    900903                                0C2DA1591F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h in Headers */,
     904                                29CDEBA62548D57F007C07B7 /* AXSpeechManagerSPI.h in Headers */,
    901905                                A10826F91F576292004772AC /* WebPanel.h in Headers */,
    902906                        );

  • branches/safari-610-branch/Source/WebCore/PAL/pal/PlatformMac.cmake

    r267980 r269796  
    2424    spi/cocoa/AVFoundationSPI.h
    2525    spi/cocoa/AVKitSPI.h
     26    spi/cocoa/AXSpeechManagerSPI.h
    2627    spi/cocoa/AccessibilitySupportSPI.h
    2728    spi/cocoa/AccessibilitySupportSoftLink.h

  • branches/safari-610-branch/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm

    r251960 r269796  
    3131#import "PlatformSpeechSynthesisVoice.h"
    3232#import <AVFoundation/AVSpeechSynthesis.h>
     33#import <pal/spi/cocoa/AXSpeechManagerSPI.h>
    3334#import <wtf/BlockObjCExceptions.h>
    3435#import <wtf/RetainPtr.h>
    … …  
    266267       
    267268        // Only show built-in voices when requesting through WebKit to reduce fingerprinting surface area.
     269#if HAVE(AVSPEECHSYNTHESIS_SYSTEMVOICE)
     270        if (voice.isSystemVoice)
     271#else
    268272        if (voice.quality == AVSpeechSynthesisVoiceQualityDefault)
     273#endif
    269274            m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
    270275    }
Note: See TracChangeset for help on using the changeset viewer.