Chromium Code Reviews| 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 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 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 | 27 |
| 28 #include "modules/speech/SpeechRecognitionResult.h" | 28 #include "modules/speech/SpeechRecognitionResult.h" |
| 29 | 29 |
| 30 namespace WebCore { | 30 namespace WebCore { |
| 31 | 31 |
| 32 DEFINE_GC_INFO(SpeechRecognitionResult); | |
| 33 | |
| 32 SpeechRecognitionResult::~SpeechRecognitionResult() | 34 SpeechRecognitionResult::~SpeechRecognitionResult() |
| 33 { | 35 { |
| 34 } | 36 } |
| 35 | 37 |
| 36 PassRefPtr<SpeechRecognitionResult> SpeechRecognitionResult::create(const Vector <RefPtr<SpeechRecognitionAlternative> >& alternatives, bool final) | 38 PassRefPtr<SpeechRecognitionResult> SpeechRecognitionResult::create(const Vector <RefPtrWillBeRawPtr<SpeechRecognitionAlternative> >& alternatives, bool final) |
| 37 { | 39 { |
| 38 return adoptRef(new SpeechRecognitionResult(alternatives, final)); | 40 return adoptRef(new SpeechRecognitionResult(alternatives, final)); |
| 39 } | 41 } |
| 40 | 42 |
| 41 SpeechRecognitionAlternative* SpeechRecognitionResult::item(unsigned long index) | 43 SpeechRecognitionAlternative* SpeechRecognitionResult::item(unsigned long index) |
| 42 { | 44 { |
| 43 if (index >= m_alternatives.size()) | 45 if (index >= m_alternatives.size()) |
| 44 return 0; | 46 return 0; |
| 45 | 47 |
| 46 return m_alternatives[index].get(); | 48 return m_alternatives[index].get(); |
| 47 } | 49 } |
| 48 | 50 |
| 49 SpeechRecognitionResult::SpeechRecognitionResult(const Vector<RefPtr<SpeechRecog nitionAlternative> >& alternatives, bool final) | 51 SpeechRecognitionResult::SpeechRecognitionResult(const Vector<RefPtrWillBeRawPtr <SpeechRecognitionAlternative> >& alternatives, bool final) |
| 50 : m_alternatives(alternatives) | 52 : m_final(final) |
| 51 , m_final(final) | 53 #if !ENABLE(OILPAN) |
| 54 , m_alternatives(alternatives) | |
| 55 #endif | |
| 52 { | 56 { |
| 53 ScriptWrappable::init(this); | 57 ScriptWrappable::init(this); |
| 58 #if ENABLE(OILPAN) | |
| 59 // Manual copying Vector<RawPtr> to Vector<Member>. | |
|
haraken
2014/02/12 05:18:45
That's why we want to use WillBeHeapVector<RefPtrW
| |
| 60 m_alternatives.grow(alternatives.size()); | |
| 61 for (size_t i = 0; i < alternatives.size(); i++) | |
| 62 m_alternatives[i] = alternatives[i]; | |
| 63 #endif | |
| 64 } | |
| 65 | |
| 66 void SpeechRecognitionResult::trace(Visitor* visitor) | |
| 67 { | |
| 68 #if ENABLE(OILPAN) | |
|
haraken
2014/02/12 05:18:45
Is this #if needed?
sof
2014/02/12 07:48:51
It's like the earlier one, not being able to handl
| |
| 69 visitor->trace(m_alternatives); | |
| 70 #endif | |
| 54 } | 71 } |
| 55 | 72 |
| 56 } // namespace WebCore | 73 } // namespace WebCore |
| OLD | NEW |