Commit 18ca56bb authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Remove RevocableInterfacePtr from SpeechRecongition

RevocableInterfacePtr is going away. Just use a mojo::Remote instead.

BUG=978694

Change-Id: I61e9d334150822271ddc1e401e2c13c488482a85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841236Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarMario Sanchez Prada <mario@igalia.com>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703439}
parent c03263ee
......@@ -64,13 +64,9 @@ void SpeechRecognition::start(ExceptionState& exception_state) {
receiver_.set_disconnect_handler(WTF::Bind(
&SpeechRecognition::OnConnectionError, WrapWeakPersistent(this)));
mojo::PendingReceiver<mojom::blink::SpeechRecognitionSession>
session_receiver = MakeRequest(
&session_, GetExecutionContext()->GetInterfaceInvalidator());
controller_->Start(std::move(session_receiver), std::move(session_client),
*grammars_, lang_, continuous_, interim_results_,
max_alternatives_);
controller_->Start(session_.BindNewPipeAndPassReceiver(),
std::move(session_client), *grammars_, lang_, continuous_,
interim_results_, max_alternatives_);
started_ = true;
}
......@@ -189,6 +185,7 @@ ExecutionContext* SpeechRecognition::GetExecutionContext() const {
void SpeechRecognition::ContextDestroyed(ExecutionContext*) {
controller_ = nullptr;
receiver_.reset();
session_.reset();
}
bool SpeechRecognition::HasPendingActivity() const {
......
......@@ -27,6 +27,7 @@
#define THIRD_PARTY_BLINK_RENDERER_MODULES_SPEECH_SPEECH_RECOGNITION_H_
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "third_party/blink/public/mojom/speech/speech_recognizer.mojom-blink.h"
#include "third_party/blink/public/platform/web_private_ptr.h"
#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
......@@ -37,7 +38,6 @@
#include "third_party/blink/renderer/modules/speech/speech_grammar_list.h"
#include "third_party/blink/renderer/modules/speech/speech_recognition_result.h"
#include "third_party/blink/renderer/platform/heap/handle.h"
#include "third_party/blink/renderer/platform/mojo/revocable_interface_ptr.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace blink {
......@@ -136,7 +136,7 @@ class MODULES_EXPORT SpeechRecognition final
bool stopping_;
HeapVector<Member<SpeechRecognitionResult>> final_results_;
mojo::Receiver<mojom::blink::SpeechRecognitionSessionClient> receiver_;
RevocableInterfacePtr<mojom::blink::SpeechRecognitionSession> session_;
mojo::Remote<mojom::blink::SpeechRecognitionSession> session_;
};
} // namespace blink
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment