Index: Source/modules/speech/SpeechRecognition.cpp |
diff --git a/Source/modules/speech/SpeechRecognition.cpp b/Source/modules/speech/SpeechRecognition.cpp |
index eed96414d64de564a7d88c8183ef74e10ac1ce5b..09b1535198c4cd21fab02fcebb0d7d235d96b348 100644 |
--- a/Source/modules/speech/SpeechRecognition.cpp |
+++ b/Source/modules/speech/SpeechRecognition.cpp |
@@ -37,11 +37,11 @@ |
namespace WebCore { |
-PassRefPtrWillBeRawPtr<SpeechRecognition> SpeechRecognition::create(ExecutionContext* context) |
+SpeechRecognition* SpeechRecognition::create(ExecutionContext* context) |
{ |
- RefPtrWillBeRawPtr<SpeechRecognition> speechRecognition(adoptRefWillBeRefCountedGarbageCollected(new SpeechRecognition(context))); |
+ SpeechRecognition* speechRecognition = adoptRefCountedGarbageCollected(new SpeechRecognition(context)); |
speechRecognition->suspendIfNeeded(); |
- return speechRecognition.release(); |
+ return speechRecognition; |
} |
void SpeechRecognition::start(ExceptionState& exceptionState) |
@@ -105,21 +105,21 @@ void SpeechRecognition::didEndAudio() |
dispatchEvent(Event::create(EventTypeNames::audioend)); |
} |
-void SpeechRecognition::didReceiveResults(const WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> >& newFinalResults, const WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> >& currentInterimResults) |
+void SpeechRecognition::didReceiveResults(const HeapVector<Member<SpeechRecognitionResult> >& newFinalResults, const HeapVector<Member<SpeechRecognitionResult> >& currentInterimResults) |
{ |
unsigned long resultIndex = m_finalResults.size(); |
for (size_t i = 0; i < newFinalResults.size(); ++i) |
m_finalResults.append(newFinalResults[i]); |
- WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > results = m_finalResults; |
+ HeapVector<Member<SpeechRecognitionResult> > results = m_finalResults; |
for (size_t i = 0; i < currentInterimResults.size(); ++i) |
results.append(currentInterimResults[i]); |
dispatchEvent(SpeechRecognitionEvent::createResult(resultIndex, results)); |
} |
-void SpeechRecognition::didReceiveNoMatch(PassRefPtrWillBeRawPtr<SpeechRecognitionResult> result) |
+void SpeechRecognition::didReceiveNoMatch(SpeechRecognitionResult* result) |
{ |
dispatchEvent(SpeechRecognitionEvent::createNoMatch(result)); |
} |