Make SpeechRecognition per RenderFrame instead of per RenderView.

content/common/speech_recognition_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 
 #include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
@@ skipping 31 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(weight)
 IPC_STRUCT_TRAITS_END()
 
 // ------- 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)
+  // The render frame requesting speech recognition.
+  IPC_STRUCT_MEMBER(int, render_frame_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)
   // Maximum number of hypotheses allowed for each results.
   IPC_STRUCT_MEMBER(uint32, max_hypotheses)
   // Whether the user requested continuous recognition or not.
   IPC_STRUCT_MEMBER(bool, continuous)
   // Whether the user requested interim results or not.
   IPC_STRUCT_MEMBER(bool, interim_results)
   // Wheter the user has set an audio track as input or not.
   IPC_STRUCT_MEMBER(bool, using_audio_track)
 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| and |request_id|. If there are no
-// sessions associated with the |request_id| in the render view, this call
-// does nothing.
+// Requests the speech recognition service to abort speech recognition
+// associated with |request_id|. If there are no sessions associated with the
+// |request_id| in the render frame, this call does nothing.
 IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_AbortRequest,
-                     int /* render_view_id */,
-                     int /* request_id */)
+                     int /* request_id */,
+                     int /* render_frame_id */)
 
-// Requests the speech recognition service to abort all speech recognitions 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.
+// Requests the speech recognition service to abort all speech recognitions
+// running for the frame. If speech recognition is not happening for that frame,
+// this call does nothing.
 IPC_MESSAGE_CONTROL1(SpeechRecognitionHostMsg_AbortAllRequests,
-                     int /* render_view_id */)
+                     int /* render_frame_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.
+// Requests the speech recognition service to stop audio capture associated with
+// |request_id|. Any audio recorded so far will be fed to the speech recognizer.
+// If there are no sessions associated with |request_id|, this call does
+// nothing.
 IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_StopCaptureRequest,
-                     int /* render_view_id */,
-                     int /* request_id */)
+                     int /* request_id */,
+                     int /* render_frame_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::SpeechRecognitionResults /* results */)
 
 IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ErrorOccurred,
@@ skipping 10 matching lines @@
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_AudioEnded, int /* request_id */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_Ended, int /* request_id */)
 
 IPC_MESSAGE_ROUTED4(SpeechRecognitionMsg_AudioReceiverReady,
                     int /* request_id */,
                     media::AudioParameters /* params */,
                     base::SharedMemoryHandle /* memory */,
                     base::SyncSocket::TransitDescriptor /* socket */)