Attachment 369546 Details for Bug 197761 – patch

[patch] patch

patch (text/plain), 4.65 KB, created by chris fleizach on 2019-05-10 00:02:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2019-05-10 00:02:30 PDT

Size: 4.65 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 245171)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-05-10  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Crash at WebKit: WebKit::WebSpeechSynthesisClient::speak
>+        https://bugs.webkit.org/show_bug.cgi?id=197761
>+        <rdar://problem/50237614>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        It's valid for the incoming voice to be nil, so we need to protect against that.
>+
>+        Tests: fast/speechsynthesis/speech-synthesis-real-client-version.html
>+
>+        * WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:
>+        (WebKit::WebSpeechSynthesisClient::speak):
>+
> 2019-05-09  Rob Buis  <rbuis@igalia.com>
> 
>         Limit number of prefetches of a given page
>Index: Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp	(revision 245147)
>+++ Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp	(working copy)
>@@ -58,8 +58,14 @@
>     };
> 
>     auto voice = utterance->voice();
>-    m_page.sendWithAsyncReply(Messages::WebPageProxy::SpeechSynthesisSpeak(utterance->text(), utterance->lang(), utterance->volume(), utterance->rate(), utterance->pitch(), utterance->startTime(), voice->voiceURI(), voice->name(), voice->lang(), voice->localService(), voice->isDefault()), WTFMove(completionHandler));
>+    auto voiceURI = voice ? voice->voiceURI() : "";
>+    auto name = voice ? voice->name() : "";
>+    auto lang = voice ? voice->lang() : "";
>+    auto localService = voice ? voice->localService() : false;
>+    auto isDefault = voice ? voice->isDefault() : false;
> 
>+    m_page.sendWithAsyncReply(Messages::WebPageProxy::SpeechSynthesisSpeak(utterance->text(), utterance->lang(), utterance->volume(), utterance->rate(), utterance->pitch(), utterance->startTime(), voiceURI, name, lang, localService, isDefault), WTFMove(completionHandler));
>+
>     m_page.corePage()->speechSynthesisClient()->observer()->didStartSpeaking();
> }
> 
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 245147)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-05-10  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Crash at WebKit: WebKit::WebSpeechSynthesisClient::speak
>+        https://bugs.webkit.org/show_bug.cgi?id=197761
>+        <rdar://problem/50237614>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt: Added.
>+        * fast/speechsynthesis/speech-synthesis-real-client-version.html: Added.
>+
> 2019-05-09  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Unable to commit search on MSN.com, qq.com, or sina.com.cn using enter key (hardware or software keyboard)
>Index: LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt
>===================================================================
>--- LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt	(nonexistent)
>+++ LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt	(working copy)
>@@ -0,0 +1,10 @@
>+This tests that we can dispatch a speech job using the real synthesizer without crashing.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS speechSynthesis.speaking is false
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>Index: LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version.html
>===================================================================
>--- LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version.html	(nonexistent)
>+++ LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version.html	(working copy)
>@@ -0,0 +1,33 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body id="body">
>+
>+<div id="console"></div>
>+
>+<script>
>+
>+    description("This tests that we can dispatch a speech job using the real synthesizer without crashing.");
>+
>+    if (window.testRunner)
>+        testRunner.waitUntilDone();
>+
>+    window.jsTestIsAsync = true;
>+
>+    // Start a very short speaking job that will finish quickly.
>+    var u = new SpeechSynthesisUtterance("a");
>+
>+    u.addEventListener('end', function(e) { 
>+       finishJSTest();
>+    });
>+
>+    shouldBeFalse("speechSynthesis.speaking");
>+    speechSynthesis.speak(u);
>+
>+</script>
>+
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 197761: 369546