| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * * Redistributions of source code must retain the above copyright | 7 * * Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * * Redistributions in binary form must reproduce the above copyright | 9 * * Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "web/SpeechRecognitionClientProxy.h" | 26 #include "modules/speech/SpeechRecognitionClientProxy.h" |
| 27 | 27 |
| 28 #include <memory> | 28 #include <memory> |
| 29 #include "core/dom/ExecutionContext.h" | 29 #include "core/dom/ExecutionContext.h" |
| 30 #include "modules/mediastream/MediaStreamTrack.h" | 30 #include "modules/mediastream/MediaStreamTrack.h" |
| 31 #include "modules/speech/SpeechGrammarList.h" | 31 #include "modules/speech/SpeechGrammarList.h" |
| 32 #include "modules/speech/SpeechRecognition.h" | 32 #include "modules/speech/SpeechRecognition.h" |
| 33 #include "modules/speech/SpeechRecognitionError.h" | 33 #include "modules/speech/SpeechRecognitionError.h" |
| 34 #include "modules/speech/SpeechRecognitionResult.h" | 34 #include "modules/speech/SpeechRecognitionResult.h" |
| 35 #include "modules/speech/SpeechRecognitionResultList.h" | 35 #include "modules/speech/SpeechRecognitionResultList.h" |
| 36 #include "platform/RuntimeEnabledFeatures.h" | 36 #include "platform/RuntimeEnabledFeatures.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 } | 113 } |
| 114 | 114 |
| 115 void SpeechRecognitionClientProxy::DidReceiveResults( | 115 void SpeechRecognitionClientProxy::DidReceiveResults( |
| 116 const WebSpeechRecognitionHandle& handle, | 116 const WebSpeechRecognitionHandle& handle, |
| 117 const WebVector<WebSpeechRecognitionResult>& new_final_results, | 117 const WebVector<WebSpeechRecognitionResult>& new_final_results, |
| 118 const WebVector<WebSpeechRecognitionResult>& current_interim_results) { | 118 const WebVector<WebSpeechRecognitionResult>& current_interim_results) { |
| 119 SpeechRecognition* recognition(handle); | 119 SpeechRecognition* recognition(handle); |
| 120 | 120 |
| 121 HeapVector<Member<SpeechRecognitionResult>> final_results_vector( | 121 HeapVector<Member<SpeechRecognitionResult>> final_results_vector( |
| 122 new_final_results.size()); | 122 new_final_results.size()); |
| 123 for (size_t i = 0; i < new_final_results.size(); ++i) | 123 for (size_t i = 0; i < new_final_results.size(); ++i) { |
| 124 final_results_vector[i] = | 124 final_results_vector[i] = |
| 125 Member<SpeechRecognitionResult>(new_final_results[i]); | 125 Member<SpeechRecognitionResult>(new_final_results[i]); |
| 126 } |
| 126 | 127 |
| 127 HeapVector<Member<SpeechRecognitionResult>> interim_results_vector( | 128 HeapVector<Member<SpeechRecognitionResult>> interim_results_vector( |
| 128 current_interim_results.size()); | 129 current_interim_results.size()); |
| 129 for (size_t i = 0; i < current_interim_results.size(); ++i) | 130 for (size_t i = 0; i < current_interim_results.size(); ++i) { |
| 130 interim_results_vector[i] = | 131 interim_results_vector[i] = |
| 131 Member<SpeechRecognitionResult>(current_interim_results[i]); | 132 Member<SpeechRecognitionResult>(current_interim_results[i]); |
| 133 } |
| 132 | 134 |
| 133 recognition->DidReceiveResults(final_results_vector, interim_results_vector); | 135 recognition->DidReceiveResults(final_results_vector, interim_results_vector); |
| 134 } | 136 } |
| 135 | 137 |
| 136 void SpeechRecognitionClientProxy::DidReceiveNoMatch( | 138 void SpeechRecognitionClientProxy::DidReceiveNoMatch( |
| 137 const WebSpeechRecognitionHandle& handle, | 139 const WebSpeechRecognitionHandle& handle, |
| 138 const WebSpeechRecognitionResult& result) { | 140 const WebSpeechRecognitionResult& result) { |
| 139 SpeechRecognition* recognition(handle); | 141 SpeechRecognition* recognition(handle); |
| 140 recognition->DidReceiveNoMatch(result); | 142 recognition->DidReceiveNoMatch(result); |
| 141 } | 143 } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 161 const WebSpeechRecognitionHandle& handle) { | 163 const WebSpeechRecognitionHandle& handle) { |
| 162 SpeechRecognition* recognition(handle); | 164 SpeechRecognition* recognition(handle); |
| 163 recognition->DidEnd(); | 165 recognition->DidEnd(); |
| 164 } | 166 } |
| 165 | 167 |
| 166 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy( | 168 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy( |
| 167 WebSpeechRecognizer* recognizer) | 169 WebSpeechRecognizer* recognizer) |
| 168 : recognizer_(recognizer) {} | 170 : recognizer_(recognizer) {} |
| 169 | 171 |
| 170 } // namespace blink | 172 } // namespace blink |
| OLD | NEW |