| 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 "config.h" | 26 #include "config.h" |
| 27 #include "WebSpeechRecognitionResult.h" | 27 #include "WebSpeechRecognitionResult.h" |
| 28 | 28 |
| 29 #include "heap/Handle.h" | |
| 30 #include "modules/speech/SpeechRecognitionAlternative.h" | 29 #include "modules/speech/SpeechRecognitionAlternative.h" |
| 31 #include "modules/speech/SpeechRecognitionResult.h" | 30 #include "modules/speech/SpeechRecognitionResult.h" |
| 32 #include "wtf/PassRefPtr.h" | 31 #include "wtf/PassRefPtr.h" |
| 33 #include "wtf/RawPtr.h" | |
| 34 #include "wtf/RefPtr.h" | |
| 35 #include "wtf/Vector.h" | 32 #include "wtf/Vector.h" |
| 36 | 33 |
| 37 // Move them into WebCore for the benefit of template aliases. | |
| 38 namespace WebCore { | |
| 39 using WTF::RawPtr; | |
| 40 using WTF::RefPtr; | |
| 41 using WTF::Vector; | |
| 42 }; | |
| 43 | |
| 44 namespace blink { | 34 namespace blink { |
| 45 | 35 |
| 46 void WebSpeechRecognitionResult::assign(const WebSpeechRecognitionResult& other) | 36 void WebSpeechRecognitionResult::assign(const WebSpeechRecognitionResult& other) |
| 47 { | 37 { |
| 48 m_private = other.m_private; | 38 m_private = other.m_private; |
| 49 } | 39 } |
| 50 | 40 |
| 51 void WebSpeechRecognitionResult::assign(const WebVector<WebString>& transcripts,
const WebVector<float>& confidences, bool final) | 41 void WebSpeechRecognitionResult::assign(const WebVector<WebString>& transcripts,
const WebVector<float>& confidences, bool final) |
| 52 { | 42 { |
| 53 ASSERT(transcripts.size() == confidences.size()); | 43 ASSERT(transcripts.size() == confidences.size()); |
| 54 | 44 |
| 55 WebCore::WillBeHeapVector<WebCore::RefPtrWillBeMember<WebCore::SpeechRecogni
tionAlternative> > alternatives(transcripts.size()); | 45 Vector<RefPtr<WebCore::SpeechRecognitionAlternative> > alternatives(transcri
pts.size()); |
| 56 for (size_t i = 0; i < transcripts.size(); ++i) | 46 for (size_t i = 0; i < transcripts.size(); ++i) |
| 57 alternatives[i] = WebCore::SpeechRecognitionAlternative::create(transcri
pts[i], confidences[i]); | 47 alternatives[i] = WebCore::SpeechRecognitionAlternative::create(transcri
pts[i], confidences[i]); |
| 58 | 48 |
| 59 m_private = WebCore::SpeechRecognitionResult::create(alternatives, final); | 49 m_private = WebCore::SpeechRecognitionResult::create(alternatives, final); |
| 60 } | 50 } |
| 61 | 51 |
| 62 void WebSpeechRecognitionResult::reset() | 52 void WebSpeechRecognitionResult::reset() |
| 63 { | 53 { |
| 64 m_private.reset(); | 54 m_private.reset(); |
| 65 } | 55 } |
| 66 | 56 |
| 67 WebSpeechRecognitionResult::operator PassRefPtr<WebCore::SpeechRecognitionResult
>() const | 57 WebSpeechRecognitionResult::operator PassRefPtr<WebCore::SpeechRecognitionResult
>() const |
| 68 { | 58 { |
| 69 return m_private.get(); | 59 return m_private.get(); |
| 70 } | 60 } |
| 71 | 61 |
| 72 } // namespace blink | 62 } // namespace blink |
| OLD | NEW |