Diff
Modified: trunk/Source/WebCore/ChangeLog (149155 => 149156)
--- trunk/Source/WebCore/ChangeLog 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebCore/ChangeLog 2013-04-26 00:27:56 UTC (rev 149156)
@@ -1,5 +1,20 @@
2013-04-25 Chris Fleizach <[email protected]>
+ WEB SPEECH: language support does not work as expected
+ https://bugs.webkit.org/show_bug.cgi?id=115119
+
+ Reviewed by Alexey Proskuryakov.
+
+ Make the Mac platform synthesizer have access to all the voices installed on the system.
+
+ * WebCore.exp.in:
+ * platform/mac/PlatformSpeechSynthesizerMac.mm:
+ (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
+2013-04-25 Chris Fleizach <[email protected]>
+
<meter> element not exposed to accessibility
https://bugs.webkit.org/show_bug.cgi?id=109023
rdar://problem/13658964
Modified: trunk/Source/WebCore/WebCore.exp.in (149155 => 149156)
--- trunk/Source/WebCore/WebCore.exp.in 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-04-26 00:27:56 UTC (rev 149156)
@@ -1941,6 +1941,7 @@
_wkSetDragImage
_wkSetMetadataURL
_wkSignedPublicKeyAndChallengeString
+_wkSpeechSynthesisGetVoiceIdentifiers
_wkUnregisterUniqueIdForElement
_wkWindowSetAlpha
_wkWindowSetScaledFrame
Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (149155 => 149156)
--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm 2013-04-26 00:27:56 UTC (rev 149156)
@@ -28,6 +28,7 @@
#include "PlatformSpeechSynthesisUtterance.h"
#include "PlatformSpeechSynthesisVoice.h"
+#include "WebCoreSystemInterface.h"
#include <AppKit/NSSpeechSynthesizer.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RetainPtr.h>
@@ -210,7 +211,7 @@
void PlatformSpeechSynthesizer::initializeVoiceList()
{
NSString *defaultVoiceURI = [NSSpeechSynthesizer defaultVoice];
- NSArray *availableVoices = [NSSpeechSynthesizer availableVoices];
+ NSArray *availableVoices = wkSpeechSynthesisGetVoiceIdentifiers();
NSUInteger count = [availableVoices count];
for (NSUInteger k = 0; k < count; k++) {
NSString *voiceName = [availableVoices objectAtIndex:k];
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (149155 => 149156)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-04-26 00:27:56 UTC (rev 149156)
@@ -273,6 +273,10 @@
extern NSCursor *(*wkCursor)(const char*);
#endif
+
+#if PLATFORM(MAC)
+extern NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
+#endif
extern void (*wkUnregisterUniqueIdForElement)(id element);
extern void (*wkAccessibilityHandleFocusChanged)(void);
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (149155 => 149156)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-04-26 00:27:56 UTC (rev 149156)
@@ -164,6 +164,10 @@
#endif
+#if PLATFORM(MAC)
+NSArray *(*wkSpeechSynthesisGetVoiceIdentifiers)(void);
+#endif
+
void (*wkUnregisterUniqueIdForElement)(id element);
void (*wkAccessibilityHandleFocusChanged)(void);
CFTypeID (*wkGetAXTextMarkerTypeID)(void);
Modified: trunk/Source/WebKit/mac/ChangeLog (149155 => 149156)
--- trunk/Source/WebKit/mac/ChangeLog 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-04-26 00:27:56 UTC (rev 149156)
@@ -1,3 +1,13 @@
+2013-04-25 Chris Fleizach <[email protected]>
+
+ WEB SPEECH: language support does not work as expected
+ https://bugs.webkit.org/show_bug.cgi?id=115119
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2013-04-25 Simon Fraser <[email protected]>
Build fix for smart compliers.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (149155 => 149156)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-04-26 00:27:56 UTC (rev 149156)
@@ -154,6 +154,9 @@
INIT(SetRequestStorageSession);
#endif
+#if PLATFORM(MAC)
+ INIT(SpeechSynthesisGetVoiceIdentifiers);
+#endif
INIT(GetAXTextMarkerTypeID);
INIT(GetAXTextMarkerRangeTypeID);
INIT(CreateAXTextMarker);
Modified: trunk/Source/WebKit2/ChangeLog (149155 => 149156)
--- trunk/Source/WebKit2/ChangeLog 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-26 00:27:56 UTC (rev 149156)
@@ -1,3 +1,13 @@
+2013-04-24 Chris Fleizach <[email protected]>
+
+ WEB SPEECH: language support does not work as expected
+ https://bugs.webkit.org/show_bug.cgi?id=115119
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2013-04-25 Anders Carlsson <[email protected]>
Rename DecidePolicyForResponse message to DecidePolicyForResponseSync
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (149155 => 149156)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-04-26 00:27:56 UTC (rev 149156)
@@ -142,6 +142,9 @@
INIT(SetRequestStorageSession);
#endif
+#if PLATFORM(MAC)
+ INIT(SpeechSynthesisGetVoiceIdentifiers);
+#endif
INIT(GetAXTextMarkerTypeID);
INIT(GetAXTextMarkerRangeTypeID);
INIT(CreateAXTextMarker);
Modified: trunk/WebKitLibraries/ChangeLog (149155 => 149156)
--- trunk/WebKitLibraries/ChangeLog 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/WebKitLibraries/ChangeLog 2013-04-26 00:27:56 UTC (rev 149156)
@@ -1,3 +1,12 @@
+2013-04-25 Chris Fleizach <[email protected]>
+
+ WEB SPEECH: language support does not work as expected
+ https://bugs.webkit.org/show_bug.cgi?id=115119
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKitSystemInterface.h:
+
2013-04-24 Roger Fong <[email protected]>
Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
Modified: trunk/WebKitLibraries/WebKitSystemInterface.h (149155 => 149156)
--- trunk/WebKitLibraries/WebKitSystemInterface.h 2013-04-25 23:33:23 UTC (rev 149155)
+++ trunk/WebKitLibraries/WebKitSystemInterface.h 2013-04-26 00:27:56 UTC (rev 149156)
@@ -84,7 +84,9 @@
void WKAccessibilityHandleFocusChanged(void);
AXUIElementRef WKCreateAXUIElementRef(id element);
void WKUnregisterUniqueIdForElement(id element);
-
+
+NSArray *WKSpeechSynthesisGetVoiceIdentifiers(void);
+
BOOL WKShouldBlockPlugin(NSString *bundleIdentifier, NSString *bundleVersionString);
BOOL WKIsPluginUpdateAvailable(NSString *bundleIdentifier);
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
(Binary files differ)
