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

Unified Diff: Source/web/SpeechRecognitionClientProxy.cpp

Issue 315133004: Enable Oilpan by default in modules/speech/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unused Dictionary support for SpeechRecognitionError + fix Speech*Event create() types. Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/web/SpeechRecognitionClientProxy.cpp
diff --git a/Source/web/SpeechRecognitionClientProxy.cpp b/Source/web/SpeechRecognitionClientProxy.cpp
index d1de70b0db7e963374865cf04ba0f30636f919ed..96e49b2d21d501cfd89322d40d7edfb988b7d458 100644
--- a/Source/web/SpeechRecognitionClientProxy.cpp
+++ b/Source/web/SpeechRecognitionClientProxy.cpp
@@ -76,67 +76,67 @@ void SpeechRecognitionClientProxy::abort(SpeechRecognition* recognition)
void SpeechRecognitionClientProxy::didStartAudio(const WebSpeechRecognitionHandle& handle)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
dmazzoni 2014/06/05 23:43:06 This looks odd to me.
sof 2014/06/06 06:21:09 Would assigning 'handle' make it look less so? (ju
recognition->didStartAudio();
}
void SpeechRecognitionClientProxy::didStartSound(const WebSpeechRecognitionHandle& handle)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
recognition->didStartSound();
recognition->didStartSpeech();
}
void SpeechRecognitionClientProxy::didEndSound(const WebSpeechRecognitionHandle& handle)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
recognition->didEndSpeech();
recognition->didEndSound();
}
void SpeechRecognitionClientProxy::didEndAudio(const WebSpeechRecognitionHandle& handle)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
recognition->didEndAudio();
}
void SpeechRecognitionClientProxy::didReceiveResults(const WebSpeechRecognitionHandle& handle, const WebVector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRecognitionResult>& currentInterimResults)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
- WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > finalResultsVector(newFinalResults.size());
+ HeapVector<Member<SpeechRecognitionResult> > finalResultsVector(newFinalResults.size());
for (size_t i = 0; i < newFinalResults.size(); ++i)
- finalResultsVector[i] = PassRefPtrWillBeRawPtr<SpeechRecognitionResult>(newFinalResults[i]);
+ finalResultsVector[i] = static_cast<SpeechRecognitionResult*>(newFinalResults[i]);
- WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > interimResultsVector(currentInterimResults.size());
+ HeapVector<Member<SpeechRecognitionResult> > interimResultsVector(currentInterimResults.size());
for (size_t i = 0; i < currentInterimResults.size(); ++i)
- interimResultsVector[i] = PassRefPtrWillBeRawPtr<SpeechRecognitionResult>(currentInterimResults[i]);
+ interimResultsVector[i] = static_cast<SpeechRecognitionResult*>(currentInterimResults[i]);
recognition->didReceiveResults(finalResultsVector, interimResultsVector);
}
void SpeechRecognitionClientProxy::didReceiveNoMatch(const WebSpeechRecognitionHandle& handle, const WebSpeechRecognitionResult& result)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
recognition->didReceiveNoMatch(result);
}
void SpeechRecognitionClientProxy::didReceiveError(const WebSpeechRecognitionHandle& handle, const WebString& message, WebSpeechRecognizerClient::ErrorCode code)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
SpeechRecognitionError::ErrorCode errorCode = static_cast<SpeechRecognitionError::ErrorCode>(code);
recognition->didReceiveError(SpeechRecognitionError::create(errorCode, message));
}
void SpeechRecognitionClientProxy::didStart(const WebSpeechRecognitionHandle& handle)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
recognition->didStart();
}
void SpeechRecognitionClientProxy::didEnd(const WebSpeechRecognitionHandle& handle)
{
- RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
+ SpeechRecognition* recognition(handle);
recognition->didEnd();
}

Powered by Google App Engine
This is Rietveld 408576698