Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: Source/web/WebSpeechRecognitionResult.cpp

Issue 139803012: Move speech module over to Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make SpeechSynthesisVoice GC-finalized Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
29 #include "modules/speech/SpeechRecognitionAlternative.h" 30 #include "modules/speech/SpeechRecognitionAlternative.h"
30 #include "modules/speech/SpeechRecognitionResult.h" 31 #include "modules/speech/SpeechRecognitionResult.h"
31 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
33 #include "wtf/RawPtr.h"
34 #include "wtf/RefPtr.h"
32 #include "wtf/Vector.h" 35 #include "wtf/Vector.h"
33 36
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
34 namespace blink { 44 namespace blink {
35 45
36 void WebSpeechRecognitionResult::assign(const WebSpeechRecognitionResult& other) 46 void WebSpeechRecognitionResult::assign(const WebSpeechRecognitionResult& other)
37 { 47 {
38 m_private = other.m_private; 48 m_private = other.m_private;
39 } 49 }
40 50
41 void WebSpeechRecognitionResult::assign(const WebVector<WebString>& transcripts, const WebVector<float>& confidences, bool final) 51 void WebSpeechRecognitionResult::assign(const WebVector<WebString>& transcripts, const WebVector<float>& confidences, bool final)
42 { 52 {
43 ASSERT(transcripts.size() == confidences.size()); 53 ASSERT(transcripts.size() == confidences.size());
44 54
45 Vector<RefPtr<WebCore::SpeechRecognitionAlternative> > alternatives(transcri pts.size()); 55 WebCore::WillBeHeapVector<WebCore::RefPtrWillBeMember<WebCore::SpeechRecogni tionAlternative> > alternatives(transcripts.size());
46 for (size_t i = 0; i < transcripts.size(); ++i) 56 for (size_t i = 0; i < transcripts.size(); ++i)
47 alternatives[i] = WebCore::SpeechRecognitionAlternative::create(transcri pts[i], confidences[i]); 57 alternatives[i] = WebCore::SpeechRecognitionAlternative::create(transcri pts[i], confidences[i]);
48 58
49 m_private = WebCore::SpeechRecognitionResult::create(alternatives, final); 59 m_private = WebCore::SpeechRecognitionResult::create(alternatives, final);
50 } 60 }
51 61
52 void WebSpeechRecognitionResult::reset() 62 void WebSpeechRecognitionResult::reset()
53 { 63 {
54 m_private.reset(); 64 m_private.reset();
55 } 65 }
56 66
57 WebSpeechRecognitionResult::operator PassRefPtr<WebCore::SpeechRecognitionResult >() const 67 WebSpeechRecognitionResult::operator PassRefPtr<WebCore::SpeechRecognitionResult >() const
58 { 68 {
59 return m_private.get(); 69 return m_private.get();
60 } 70 }
61 71
62 } // namespace blink 72 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698