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

content/renderer/speech_recognition_dispatcher.h

Index: content/renderer/speech_recognition_dispatcher.h
diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h
new file mode 100644
index 0000000000000000000000000000000000000000..342f924e68c605334f0bd7e26a017d5809ecc5a7
--- /dev/null
+++ b/content/renderer/speech_recognition_dispatcher.h
@@ -0,0 +1,74 @@
+// 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.
+
+#ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
+#define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
+#pragma once
+
+#include <map>
+
+#include "base/basictypes.h"
+#include "content/public/renderer/render_view_observer.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionHandle.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognizer.h"
+
+class RenderViewImpl;
+
+namespace content {
+struct SpeechRecognitionError;
+struct SpeechRecognitionResult;
+}
+
+namespace WebKit {
+class WebSpeechRecognitionParams;
+class WebSpeechRecognizerClient;
+}
+
+// SpeechRecognitionDispatcher is a delegate for messages used by WebKit for
+// scripted JS speech APIs. It's the complement of
+// SpeechRecognitionDispatcherHost (owned by RenderViewHost).
+class SpeechRecognitionDispatcher : public content::RenderViewObserver,
+                                    public WebKit::WebSpeechRecognizer {
+ public:
+  SpeechRecognitionDispatcher(RenderViewImpl* render_view);
+  virtual ~SpeechRecognitionDispatcher();
+
+ private:
+  // RenderView::Observer implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+
+  // WebKit::WebSpeechRecognizer implementation.
+  virtual void start(const WebKit::WebSpeechRecognitionHandle&,
+                     const WebKit::WebSpeechRecognitionParams&,
+                     WebKit::WebSpeechRecognizerClient*) OVERRIDE;
+  virtual void stop(const WebKit::WebSpeechRecognitionHandle&,
+                    WebKit::WebSpeechRecognizerClient*) OVERRIDE;
+  virtual void abort(const WebKit::WebSpeechRecognitionHandle&,
+                     WebKit::WebSpeechRecognizerClient*) OVERRIDE;
+
+  void OnRecognitionStarted(int js_handle_id);
+  void OnAudioStarted(int js_handle_id);
+  void OnSoundStarted(int js_handle_id);
+  void OnSoundEnded(int js_handle_id);
+  void OnAudioEnded(int js_handle_id);
+  void OnErrorOccurred(int js_handle_id,
+                       const content::SpeechRecognitionError& error);
+  void OnRecognitionEnded(int js_handle_id);
+  void OnResultRetrieved(int js_handle_id,
+                         const content::SpeechRecognitionResult& result);
+
+  int GetIDForHandle(const WebKit::WebSpeechRecognitionHandle& handle);
+  const WebKit::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id);
+
+  // The WebKit client class that we use to send events back to the JS world.
+  WebKit::WebSpeechRecognizerClient* recognizer_client_;
+  typedef std::map<int, WebKit::WebSpeechRecognitionHandle> HandleMap;

[hans, 2012/05/14 14:04:52]

maybe a blank before this line to separate the "handle stuff" from the
recognizer_client_

+  HandleMap handle_map_;
+  int last_mapping_id_;
+
+  DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher);
+};
+
+#endif  // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_