Introduced SpeechRecognitionDispatcher(Host) classes, handling dispatch of IPC messages for continu…

content/common/speech_recognition_messages.h

Index: content/common/speech_recognition_messages.h
diff --git a/content/common/speech_recognition_messages.h b/content/common/speech_recognition_messages.h
index dc3ceb38e4011fa8705ec5047c664e80e9a5c9b8..4a32299cfee4bee2aa17c5d60c78ee75c5313ee4 100644
--- a/content/common/speech_recognition_messages.h
+++ b/content/common/speech_recognition_messages.h
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "content/public/common/speech_recognition_error.h"
+#include "content/public/common/speech_recognition_grammar.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
@@ -14,17 +15,29 @@
 
 #define IPC_MESSAGE_START SpeechRecognitionMsgStart
 
+IPC_ENUM_TRAITS(content::SpeechAudioErrorDetails)
 IPC_ENUM_TRAITS(content::SpeechRecognitionErrorCode)
 
+IPC_STRUCT_TRAITS_BEGIN(content::SpeechRecognitionError)
+  IPC_STRUCT_TRAITS_MEMBER(code)
+  IPC_STRUCT_TRAITS_MEMBER(details)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(content::SpeechRecognitionHypothesis)
   IPC_STRUCT_TRAITS_MEMBER(utterance)
   IPC_STRUCT_TRAITS_MEMBER(confidence)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::SpeechRecognitionResult)
+  IPC_STRUCT_TRAITS_MEMBER(provisional)
   IPC_STRUCT_TRAITS_MEMBER(hypotheses)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(content::SpeechRecognitionGrammar)
+  IPC_STRUCT_TRAITS_MEMBER(url)
+  IPC_STRUCT_TRAITS_MEMBER(weight)
+IPC_STRUCT_TRAITS_END()
+
 // Used to start a speech recognition session.
 IPC_STRUCT_BEGIN(InputTagSpeechHostMsg_StartRecognition_Params)
   // The render view requesting speech recognition.
@@ -41,7 +54,7 @@ IPC_STRUCT_BEGIN(InputTagSpeechHostMsg_StartRecognition_Params)
   IPC_STRUCT_MEMBER(std::string, origin_url)
 IPC_STRUCT_END()
 
-// Speech recognition messages sent from the renderer to the browser.
+// Renderer -> Browser messages.
 
 // Requests the speech recognition service to start speech recognition on behalf
 // of the given |render_view_id|.
@@ -63,24 +76,82 @@ IPC_MESSAGE_CONTROL2(InputTagSpeechHostMsg_StopRecording,
                      int /* render_view_id */,
                      int /* request_id */)
 
-// Speech recognition messages sent from the browser to the renderer.
+// Browser -> Renderer messages.
 
-// Relay a speech recognition result, either partial or final.
+// Relays a speech recognition result, either partial or final.
 IPC_MESSAGE_ROUTED2(InputTagSpeechMsg_SetRecognitionResult,
                     int /* request_id */,
                     content::SpeechRecognitionResult /* result */)
 
-// Indicate that speech recognizer has stopped recording and started
+// Indicates that speech recognizer has stopped recording and started
 // recognition.
 IPC_MESSAGE_ROUTED1(InputTagSpeechMsg_RecordingComplete,
                     int /* request_id */)
 
-// Indicate that speech recognizer has completed recognition. This will be the
+// Indicates that speech recognizer has completed recognition. This will be the
 // last message sent in response to a InputTagSpeechHostMsg_StartRecognition.
 IPC_MESSAGE_ROUTED1(InputTagSpeechMsg_RecognitionComplete,
                     int /* request_id */)
 
-// Toggle speech recognition on or off on the speech input control for the
+// Toggles speech recognition on or off on the speech input control for the
 // current focused element. Has no effect if the current element doesn't
 // support speech recognition.
 IPC_MESSAGE_ROUTED0(InputTagSpeechMsg_ToggleSpeechInput)
+
+
+// ------- Messages for Speech JS APIs (SpeechRecognitionDispatcher) ----------
+
+// Renderer -> Browser messages.
+
+// Used to start a speech recognition session.
+IPC_STRUCT_BEGIN(SpeechRecognitionHostMsg_StartRequest_Params)
+  // The render view requesting speech recognition.
+  IPC_STRUCT_MEMBER(int, render_view_id)
+  // Unique ID associated with the JS object making the calls.
+  IPC_STRUCT_MEMBER(int, request_id)
+  // Language to use for speech recognition.
+  IPC_STRUCT_MEMBER(std::string, language)
+  // Speech grammars to use.
+  IPC_STRUCT_MEMBER(content::SpeechRecognitionGrammarArray, grammars)
+  // URL of the page (or iframe if applicable).
+  IPC_STRUCT_MEMBER(std::string, origin_url)
+  // One-shot/continuous recognition mode.
+  IPC_STRUCT_MEMBER(bool, is_one_shot)
+IPC_STRUCT_END()
+
+
+// Requests the speech recognition service to start speech recognition.
+IPC_MESSAGE_CONTROL1(SpeechRecognitionHostMsg_StartRequest,
+                     SpeechRecognitionHostMsg_StartRequest_Params)
+
+// Requests the speech recognition service to abort speech recognition on
+// behalf of the given |render_view_id|. If speech recognition is not happening
+// or is happening on behalf of some other render view, this call does nothing.
+IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_AbortRequest,
+                     int /* render_view_id */,
+                     int /* request_id */)
+
+// Requests the speech recognition service to stop audio capture on behalf of
+// the given |render_view_id|. Any audio recorded so far will be fed to the
+// speech recognizer. If speech recognition is not happening nor or is
+// happening on behalf of some other render view, this call does nothing.
+IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_StopCaptureRequest,
+                     int /* render_view_id */,
+                     int /* request_id */)
+
+// Browser -> Renderer messages.
+
+// The messages below follow exactly the same semantic of the corresponding
+// events defined in content/public/browser/speech_recognition_event_listener.h.
+IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ResultRetrieved,
+                    int /* request_id */,
+                    content::SpeechRecognitionResult /* result */)
+IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ErrorOccurred,

[jam, 2012/05/23 15:41:24]

nit: blank line between each message

[Primiano Tucci (use gerrit), 2012/05/23 17:11:56]

Done.

+                    int /* request_id */,
+                    content::SpeechRecognitionError /* error */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_Started, int /* request_id */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_AudioStarted, int /* request_id */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_SoundStarted, int /* request_id */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_SoundEnded, int /* request_id */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_AudioEnded, int /* request_id */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_Ended, int /* request_id */)