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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 m_recognizer->stop(WebSpeechRecognitionHandle(recognition), this); | 69 m_recognizer->stop(WebSpeechRecognitionHandle(recognition), this); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void SpeechRecognitionClientProxy::abort(SpeechRecognition* recognition) | 72 void SpeechRecognitionClientProxy::abort(SpeechRecognition* recognition) |
| 73 { | 73 { |
| 74 m_recognizer->abort(WebSpeechRecognitionHandle(recognition), this); | 74 m_recognizer->abort(WebSpeechRecognitionHandle(recognition), this); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void SpeechRecognitionClientProxy::didStartAudio(const WebSpeechRecognitionHandl e& handle) | 77 void SpeechRecognitionClientProxy::didStartAudio(const WebSpeechRecognitionHandl e& handle) |
| 78 { | 78 { |
| 79 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 79 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 80 recognition->didStartAudio(); | 80 recognition->didStartAudio(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void SpeechRecognitionClientProxy::didStartSound(const WebSpeechRecognitionHandl e& handle) | 83 void SpeechRecognitionClientProxy::didStartSound(const WebSpeechRecognitionHandl e& handle) |
| 84 { | 84 { |
| 85 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 85 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 86 recognition->didStartSound(); | 86 recognition->didStartSound(); |
| 87 recognition->didStartSpeech(); | 87 recognition->didStartSpeech(); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void SpeechRecognitionClientProxy::didEndSound(const WebSpeechRecognitionHandle& handle) | 90 void SpeechRecognitionClientProxy::didEndSound(const WebSpeechRecognitionHandle& handle) |
| 91 { | 91 { |
| 92 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 92 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 93 recognition->didEndSpeech(); | 93 recognition->didEndSpeech(); |
| 94 recognition->didEndSound(); | 94 recognition->didEndSound(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 void SpeechRecognitionClientProxy::didEndAudio(const WebSpeechRecognitionHandle& handle) | 97 void SpeechRecognitionClientProxy::didEndAudio(const WebSpeechRecognitionHandle& handle) |
| 98 { | 98 { |
| 99 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 99 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 100 recognition->didEndAudio(); | 100 recognition->didEndAudio(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 void SpeechRecognitionClientProxy::didReceiveResults(const WebSpeechRecognitionH andle& handle, const WebVector<WebSpeechRecognitionResult>& newFinalResults, con st WebVector<WebSpeechRecognitionResult>& currentInterimResults) | 103 void SpeechRecognitionClientProxy::didReceiveResults(const WebSpeechRecognitionH andle& handle, const WebVector<WebSpeechRecognitionResult>& newFinalResults, con st WebVector<WebSpeechRecognitionResult>& currentInterimResults) |
| 104 { | 104 { |
| 105 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 105 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 106 | 106 |
| 107 Vector<RefPtr<SpeechRecognitionResult> > finalResultsVector(newFinalResults. size()); | 107 Vector<RefPtrWillBeRawPtr<SpeechRecognitionResult> > finalResultsVector(newF inalResults.size()); |
|
Mads Ager (chromium)
2014/02/18 09:15:39
These need to be WillBeHeapVector<RefPtrWillBeMemb
sof
2014/02/18 09:42:23
Thanks, fixed.
| |
| 108 for (size_t i = 0; i < newFinalResults.size(); ++i) | 108 for (size_t i = 0; i < newFinalResults.size(); ++i) |
| 109 finalResultsVector[i] = static_cast<PassRefPtr<SpeechRecognitionResult> >(newFinalResults[i]); | 109 finalResultsVector[i] = PassRefPtrWillBeRawPtr<SpeechRecognitionResult>( newFinalResults[i]); |
| 110 | 110 |
| 111 Vector<RefPtr<SpeechRecognitionResult> > interimResultsVector(currentInterim Results.size()); | 111 Vector<RefPtrWillBeRawPtr<SpeechRecognitionResult> > interimResultsVector(cu rrentInterimResults.size()); |
| 112 for (size_t i = 0; i < currentInterimResults.size(); ++i) | 112 for (size_t i = 0; i < currentInterimResults.size(); ++i) |
| 113 interimResultsVector[i] = static_cast<PassRefPtr<SpeechRecognitionResult > >(currentInterimResults[i]); | 113 interimResultsVector[i] = PassRefPtrWillBeRawPtr<SpeechRecognitionResult >(currentInterimResults[i]); |
| 114 | 114 |
| 115 recognition->didReceiveResults(finalResultsVector, interimResultsVector); | 115 recognition->didReceiveResults(finalResultsVector, interimResultsVector); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void SpeechRecognitionClientProxy::didReceiveNoMatch(const WebSpeechRecognitionH andle& handle, const WebSpeechRecognitionResult& result) | 118 void SpeechRecognitionClientProxy::didReceiveNoMatch(const WebSpeechRecognitionH andle& handle, const WebSpeechRecognitionResult& result) |
| 119 { | 119 { |
| 120 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 120 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 121 recognition->didReceiveNoMatch(result); | 121 recognition->didReceiveNoMatch(result); |
| 122 } | 122 } |
| 123 | 123 |
| 124 void SpeechRecognitionClientProxy::didReceiveError(const WebSpeechRecognitionHan dle& handle, const WebString& message, WebSpeechRecognizerClient::ErrorCode code ) | 124 void SpeechRecognitionClientProxy::didReceiveError(const WebSpeechRecognitionHan dle& handle, const WebString& message, WebSpeechRecognizerClient::ErrorCode code ) |
| 125 { | 125 { |
| 126 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 126 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 127 SpeechRecognitionError::ErrorCode errorCode = static_cast<SpeechRecognitionE rror::ErrorCode>(code); | 127 SpeechRecognitionError::ErrorCode errorCode = static_cast<SpeechRecognitionE rror::ErrorCode>(code); |
| 128 recognition->didReceiveError(SpeechRecognitionError::create(errorCode, messa ge)); | 128 recognition->didReceiveError(SpeechRecognitionError::create(errorCode, messa ge)); |
| 129 } | 129 } |
| 130 | 130 |
| 131 void SpeechRecognitionClientProxy::didStart(const WebSpeechRecognitionHandle& ha ndle) | 131 void SpeechRecognitionClientProxy::didStart(const WebSpeechRecognitionHandle& ha ndle) |
| 132 { | 132 { |
| 133 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 133 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 134 recognition->didStart(); | 134 recognition->didStart(); |
| 135 } | 135 } |
| 136 | 136 |
| 137 void SpeechRecognitionClientProxy::didEnd(const WebSpeechRecognitionHandle& hand le) | 137 void SpeechRecognitionClientProxy::didEnd(const WebSpeechRecognitionHandle& hand le) |
| 138 { | 138 { |
| 139 RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle ); | 139 RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<S peechRecognition>(handle); |
| 140 recognition->didEnd(); | 140 recognition->didEnd(); |
| 141 } | 141 } |
| 142 | 142 |
| 143 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer* recognizer) | 143 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer* recognizer) |
| 144 : m_recognizer(recognizer) | 144 : m_recognizer(recognizer) |
| 145 { | 145 { |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace blink | 148 } // namespace blink |
| OLD | NEW |