Make SpeechRecognition per RenderFrame instead of per RenderView.

content/browser/speech/speech_recognition_manager_impl.cc

 // Copyright (c) 2013 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.
 
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 
 #include "base/bind.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
 #include "content/browser/speech/google_one_shot_remote_engine.h"
 #include "content/browser/speech/google_streaming_remote_engine.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/browser/speech_recognition_manager_delegate.h"
 #include "content/public/browser/speech_recognition_session_config.h"
 #include "content/public/browser/speech_recognition_session_context.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 
@@ skipping 161 matching lines @@
   SessionsTable::iterator iter = sessions_.find(session_id);
   DCHECK(iter != sessions_.end());
   Session* session = iter->second;
 
   if (session->abort_requested)
     return;
 
   if (ask_user) {
     SpeechRecognitionSessionContext& context = session->context;
     context.label = media_stream_manager_->MakeMediaAccessRequest(
-        context.render_process_id,
-        context.render_frame_id,
+        context.render_frame_host->GetProcess()->GetID(),
+        context.render_frame_host->GetRoutingID(),
         context.request_id,
         StreamOptions(true, false),
         GURL(context.context_name),
         base::Bind(
             &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback,
             weak_factory_.GetWeakPtr(), session_id));
     return;
   }
 
   if (is_allowed) {
@@ skipping 214 matching lines @@
     listener->OnRecognitionEnd(session_id);
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent,
                  weak_factory_.GetWeakPtr(),
                  session_id,
                  EVENT_RECOGNITION_ENDED));
 }
 
 int SpeechRecognitionManagerImpl::GetSession(
-    int render_process_id, int render_view_id, int request_id) const {
+    RenderFrameHost* render_frame_host, int request_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   SessionsTable::const_iterator iter;
   for(iter = sessions_.begin(); iter != sessions_.end(); ++iter) {
     const int session_id = iter->first;
     const SpeechRecognitionSessionContext& context = iter->second->context;
-    if (context.render_process_id == render_process_id &&
-        context.render_view_id == render_view_id &&
+    if (context.render_frame_host == render_frame_host &&
         context.request_id == request_id) {
       return session_id;
     }
   }
   return kSessionIDInvalid;
 }
 
 SpeechRecognitionSessionContext
 SpeechRecognitionManagerImpl::GetSessionContext(int session_id) const {
   return GetSession(session_id)->context;
 }
 
-void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderProcess(
-    int render_process_id) {
-  // This method gracefully destroys sessions for the listener. However, since
-  // the listener itself is likely to be destroyed after this call, we avoid
-  // dispatching further events to it, marking the |listener_is_active| flag.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderFrame(
+    RenderFrameHost* render_frame_host) {
+  DCHECK(render_frame_host);
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
   for (SessionsTable::iterator it = sessions_.begin(); it != sessions_.end();
        ++it) {
     Session* session = it->second;
-    if (session->context.render_process_id == render_process_id) {
+    if (session->context.render_frame_host == render_frame_host)
       AbortSession(session->id);
-      session->listener_is_active = false;
-    }
   }
 }
 
-void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderView(
-    int render_process_id,
-    int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  for (SessionsTable::iterator it = sessions_.begin(); it != sessions_.end();
-       ++it) {
-    Session* session = it->second;
-    if (session->context.render_process_id == render_process_id &&
-        session->context.render_view_id == render_view_id) {
-      AbortSession(session->id);
-    }
-  }
-}
-
 // -----------------------  Core FSM implementation ---------------------------
 void SpeechRecognitionManagerImpl::DispatchEvent(int session_id,
                                                  FSMEvent event) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // There are some corner cases in which the session might be deleted (due to
   // an EndRecognition event) between a request (e.g. Abort) and its dispatch.
   if (!SessionExists(session_id))
     return;
 
@@ skipping 197 matching lines @@
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     abort_requested(false),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace content