Index: Source/modules/speech/SpeechRecognitionEvent.h |
diff --git a/Source/modules/speech/SpeechRecognitionEvent.h b/Source/modules/speech/SpeechRecognitionEvent.h |
index a27bdd43517df322e2eff62d4b844cd7621bac20..98f0f5748483dac243bb47a82c9837766cf94598 100644 |
--- a/Source/modules/speech/SpeechRecognitionEvent.h |
+++ b/Source/modules/speech/SpeechRecognitionEvent.h |
@@ -30,7 +30,6 @@ |
#include "modules/speech/SpeechRecognitionResult.h" |
#include "modules/speech/SpeechRecognitionResultList.h" |
#include "platform/heap/Handle.h" |
-#include "wtf/RefPtr.h" |
namespace WebCore { |
@@ -41,7 +40,7 @@ public: |
SpeechRecognitionEventInit(); |
unsigned long resultIndex; |
- RefPtrWillBeMember<SpeechRecognitionResultList> results; |
+ Member<SpeechRecognitionResultList> results; |
}; |
class SpeechRecognitionEvent FINAL : public Event { |
@@ -50,8 +49,8 @@ public: |
static PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> create(const AtomicString&, const SpeechRecognitionEventInit&); |
virtual ~SpeechRecognitionEvent(); |
- static PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> createResult(unsigned long resultIndex, const WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> >& results); |
- static PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> createNoMatch(PassRefPtrWillBeRawPtr<SpeechRecognitionResult>); |
+ static PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> createResult(unsigned long resultIndex, const HeapVector<Member<SpeechRecognitionResult> >& results); |
+ static PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> createNoMatch(SpeechRecognitionResult*); |
unsigned long resultIndex() const { return m_resultIndex; } |
SpeechRecognitionResultList* results() const { return m_results.get(); } |
@@ -68,10 +67,10 @@ public: |
private: |
SpeechRecognitionEvent(); |
SpeechRecognitionEvent(const AtomicString&, const SpeechRecognitionEventInit&); |
- SpeechRecognitionEvent(const AtomicString& eventName, unsigned long resultIndex, PassRefPtrWillBeRawPtr<SpeechRecognitionResultList> results); |
+ SpeechRecognitionEvent(const AtomicString& eventName, unsigned long resultIndex, SpeechRecognitionResultList* results); |
unsigned long m_resultIndex; |
- RefPtrWillBeMember<SpeechRecognitionResultList> m_results; |
+ PersistentWillBeMember<SpeechRecognitionResultList> m_results; |
}; |
} // namespace WebCore |