Title: [124474] trunk
- Revision
- 124474
- Author
- [email protected]
- Date
- 2012-08-02 10:14:03 -0700 (Thu, 02 Aug 2012)
Log Message
Speech _javascript_ API: Fire speech start event at the same time as sound start event
https://bugs.webkit.org/show_bug.cgi?id=92971
Reviewed by Adam Barth.
Source/WebKit/chromium:
Chromium's speech recognizer doesn't differentiate between "sound
started" and "speech started". Just fire those events at the same
time, and don't provide functions for them in
WebSpeechRecognizerClient.
* public/WebSpeechRecognizerClient.h:
* src/SpeechRecognitionClientProxy.cpp:
(WebKit::SpeechRecognitionClientProxy::didStartSound):
(WebKit::SpeechRecognitionClientProxy::didEndSound):
* src/SpeechRecognitionClientProxy.h:
(SpeechRecognitionClientProxy):
Tools:
Update the MockWebSpeechRecognizer to not fire "speech started" events
separately.
* DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp:
(MockWebSpeechRecognizer::start):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (124473 => 124474)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-02 17:01:56 UTC (rev 124473)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-02 17:14:03 UTC (rev 124474)
@@ -1,3 +1,22 @@
+2012-08-02 Hans Wennborg <[email protected]>
+
+ Speech _javascript_ API: Fire speech start event at the same time as sound start event
+ https://bugs.webkit.org/show_bug.cgi?id=92971
+
+ Reviewed by Adam Barth.
+
+ Chromium's speech recognizer doesn't differentiate between "sound
+ started" and "speech started". Just fire those events at the same
+ time, and don't provide functions for them in
+ WebSpeechRecognizerClient.
+
+ * public/WebSpeechRecognizerClient.h:
+ * src/SpeechRecognitionClientProxy.cpp:
+ (WebKit::SpeechRecognitionClientProxy::didStartSound):
+ (WebKit::SpeechRecognitionClientProxy::didEndSound):
+ * src/SpeechRecognitionClientProxy.h:
+ (SpeechRecognitionClientProxy):
+
2012-08-02 Adam Barth <[email protected]>
[Chromium] WebViewImpl::showTouchHighlightQuads isn't needed for Android
Modified: trunk/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h (124473 => 124474)
--- trunk/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h 2012-08-02 17:01:56 UTC (rev 124473)
+++ trunk/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h 2012-08-02 17:14:03 UTC (rev 124474)
@@ -59,13 +59,6 @@
// This is expected to be called after didStartAudio.
virtual void didStartSound(const WebSpeechRecognitionHandle&) = 0;
- // To be called when speech has been detected.
- // This is expected to be called after didStartSound.
- virtual void didStartSpeech(const WebSpeechRecognitionHandle&) = 0;
-
- // To be called when speech is no longer detected.
- virtual void didEndSpeech(const WebSpeechRecognitionHandle&) = 0;
-
// To be called when sound is no longer detected.
// This is expected to be called after didEndSpeech.
virtual void didEndSound(const WebSpeechRecognitionHandle&) = 0;
Modified: trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.cpp (124473 => 124474)
--- trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.cpp 2012-08-02 17:01:56 UTC (rev 124473)
+++ trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.cpp 2012-08-02 17:14:03 UTC (rev 124474)
@@ -85,23 +85,13 @@
{
RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
recognition->didStartSound();
-}
-
-void SpeechRecognitionClientProxy::didStartSpeech(const WebSpeechRecognitionHandle& handle)
-{
- RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
recognition->didStartSpeech();
}
-void SpeechRecognitionClientProxy::didEndSpeech(const WebSpeechRecognitionHandle& handle)
-{
- RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
- recognition->didEndSpeech();
-}
-
void SpeechRecognitionClientProxy::didEndSound(const WebSpeechRecognitionHandle& handle)
{
RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+ recognition->didEndSpeech();
recognition->didEndSound();
}
Modified: trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.h (124473 => 124474)
--- trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.h 2012-08-02 17:01:56 UTC (rev 124473)
+++ trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.h 2012-08-02 17:14:03 UTC (rev 124474)
@@ -53,8 +53,6 @@
// WebSpeechRecognizerClient:
virtual void didStartAudio(const WebSpeechRecognitionHandle&) OVERRIDE;
virtual void didStartSound(const WebSpeechRecognitionHandle&) OVERRIDE;
- virtual void didStartSpeech(const WebSpeechRecognitionHandle&) OVERRIDE;
- virtual void didEndSpeech(const WebSpeechRecognitionHandle&) OVERRIDE;
virtual void didEndSound(const WebSpeechRecognitionHandle&) OVERRIDE;
virtual void didEndAudio(const WebSpeechRecognitionHandle&) OVERRIDE;
virtual void didReceiveResult(const WebSpeechRecognitionHandle&, const WebSpeechRecognitionResult&, unsigned long resultIndex, const WebVector<WebSpeechRecognitionResult>& resultHistory) OVERRIDE;
Modified: trunk/Tools/ChangeLog (124473 => 124474)
--- trunk/Tools/ChangeLog 2012-08-02 17:01:56 UTC (rev 124473)
+++ trunk/Tools/ChangeLog 2012-08-02 17:14:03 UTC (rev 124474)
@@ -1,3 +1,16 @@
+2012-08-02 Hans Wennborg <[email protected]>
+
+ Speech _javascript_ API: Fire speech start event at the same time as sound start event
+ https://bugs.webkit.org/show_bug.cgi?id=92971
+
+ Reviewed by Adam Barth.
+
+ Update the MockWebSpeechRecognizer to not fire "speech started" events
+ separately.
+
+ * DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp:
+ (MockWebSpeechRecognizer::start):
+
2012-08-02 Philippe Normand <[email protected]>
[GTK] make sometimes using a single core
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp (124473 => 124474)
--- trunk/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp 2012-08-02 17:01:56 UTC (rev 124473)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp 2012-08-02 17:14:03 UTC (rev 124474)
@@ -118,7 +118,6 @@
m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didStart)));
m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didStartAudio)));
m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didStartSound)));
- m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didStartSpeech)));
if (!m_mockTranscripts.isEmpty()) {
ASSERT(m_mockTranscripts.size() == m_mockConfidences.size());
@@ -131,7 +130,6 @@
} else
m_taskQueue.append(adoptPtr(new NoMatchTask(this)));
- m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didEndSpeech)));
m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didEndSound)));
m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didEndAudio)));
m_taskQueue.append(adoptPtr(new ClientCallTask(this, &WebSpeechRecognizerClient::didEnd)));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
