<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164807] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164807">164807</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-02-27 09:49:45 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>speechSynthesis.speak of a zero length utterance kills future speech
https://bugs.webkit.org/show_bug.cgi?id=129403
Reviewed by Mario Sanchez Prada.
Source/WebCore:
Empty length strings may choke a synthesizer and result in didFinishSpeaking not being called.
The WebKit code should be proactive about screening out empty length strings.
Test: platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html
* Modules/speech/SpeechSynthesis.cpp:
(WebCore::SpeechSynthesis::startSpeakingImmediately):
LayoutTests:
* platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string-expected.txt: Added.
* platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesspeechSpeechSynthesiscpp">trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfastspeechsynthesisspeechsynthesisspeakemptystringexpectedtxt">trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastspeechsynthesisspeechsynthesisspeakemptystringhtml">trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164806 => 164807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-27 17:02:13 UTC (rev 164806)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 17:49:45 UTC (rev 164807)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-27 Chris Fleizach <cfleizach@apple.com>
+
+ speechSynthesis.speak of a zero length utterance kills future speech
+ https://bugs.webkit.org/show_bug.cgi?id=129403
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string-expected.txt: Added.
+ * platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html: Added.
+
</ins><span class="cx"> 2014-02-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r164783.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastspeechsynthesisspeechsynthesisspeakemptystringexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string-expected.txt (0 => 164807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string-expected.txt 2014-02-27 17:49:45 UTC (rev 164807)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+This tests that an empty string sent to the synthesizer still generates a callback.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS speechSynthesis.speaking is false
+PASS event.elapsedTime > 0 is true
+PASS speechSynthesis.speaking is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastspeechsynthesisspeechsynthesisspeakemptystringhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html (0 => 164807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html 2014-02-27 17:49:45 UTC (rev 164807)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!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>
+
+ if (window.internals)
+ window.internals.enableMockSpeechSynthesizer();
+
+ description("This tests that an empty string sent to the synthesizer still generates a callback.");
+
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ window.jsTestIsAsync = true;
+
+ // Start a very short speaking job that will finish quickly.
+ var u = new SpeechSynthesisUtterance("");
+
+ u.onstart = function(event) {
+ shouldBeTrue("event.elapsedTime > 0");
+ shouldBeTrue("speechSynthesis.speaking");
+ }
+ u.onend = function(event) {
+ shouldBeTrue("event.elapsedTime > 0");
+ shouldBeFalse("speechSynthesis.speaking");
+ finishJSTest();
+ }
+
+ shouldBeFalse("speechSynthesis.speaking");
+ speechSynthesis.speak(u);
+
+</script>
+
+<script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164806 => 164807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 17:02:13 UTC (rev 164806)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 17:49:45 UTC (rev 164807)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-27 Chris Fleizach <cfleizach@apple.com>
+
+ speechSynthesis.speak of a zero length utterance kills future speech
+ https://bugs.webkit.org/show_bug.cgi?id=129403
+
+ Reviewed by Mario Sanchez Prada.
+
+ Empty length strings may choke a synthesizer and result in didFinishSpeaking not being called.
+ The WebKit code should be proactive about screening out empty length strings.
+
+ Test: platform/mac/fast/speechsynthesis/speech-synthesis-speak-empty-string.html
+
+ * Modules/speech/SpeechSynthesis.cpp:
+ (WebCore::SpeechSynthesis::startSpeakingImmediately):
+
</ins><span class="cx"> 2014-02-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r164783.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesspeechSpeechSynthesiscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp (164806 => 164807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp 2014-02-27 17:02:13 UTC (rev 164806)
+++ trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp 2014-02-27 17:49:45 UTC (rev 164807)
</span><span class="lines">@@ -107,6 +107,13 @@
</span><span class="cx"> utterance->setStartTime(monotonicallyIncreasingTime());
</span><span class="cx"> m_currentSpeechUtterance = utterance;
</span><span class="cx"> m_isPaused = false;
</span><ins>+
+ // Zero lengthed strings should immediately notify that the event is complete.
+ if (utterance->text().isEmpty()) {
+ handleSpeakingCompleted(utterance, false);
+ return;
+ }
+
</ins><span class="cx"> if (!m_platformSpeechSynthesizer)
</span><span class="cx"> m_platformSpeechSynthesizer = PlatformSpeechSynthesizer::create(this);
</span><span class="cx"> m_platformSpeechSynthesizer->speak(utterance->platformUtterance());
</span></span></pre>
</div>
</div>
</body>
</html>