summaryrefslogtreecommitdiff
path: root/chromium/content/browser/speech/tts_controller_impl.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-29 10:46:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-02 12:02:10 +0000
commit99677208ff3b216fdfec551fbe548da5520cd6fb (patch)
tree476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/speech/tts_controller_impl.cc
parentc30a6232df03e1efbd9f3b226777b07e087a1122 (diff)
downloadqtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/speech/tts_controller_impl.cc')
-rw-r--r--chromium/content/browser/speech/tts_controller_impl.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/content/browser/speech/tts_controller_impl.cc b/chromium/content/browser/speech/tts_controller_impl.cc
index e34045ca4e1..2b7bd10feca 100644
--- a/chromium/content/browser/speech/tts_controller_impl.cc
+++ b/chromium/content/browser/speech/tts_controller_impl.cc
@@ -105,6 +105,10 @@ TtsControllerImpl* TtsControllerImpl::GetInstance() {
return base::Singleton<TtsControllerImpl>::get();
}
+void TtsControllerImpl::SetStopSpeakingWhenHidden(bool value) {
+ stop_speaking_when_hidden_ = value;
+}
+
TtsControllerImpl::TtsControllerImpl() = default;
TtsControllerImpl::~TtsControllerImpl() {
@@ -166,7 +170,7 @@ bool TtsControllerImpl::StopCurrentUtteranceIfMatches(const GURL& source_url) {
if (current_utterance_ && !current_utterance_->GetEngineId().empty()) {
if (engine_delegate_)
engine_delegate_->Stop(current_utterance_.get());
- } else {
+ } else if (GetTtsPlatform()->PlatformImplAvailable()) {
GetTtsPlatform()->ClearError();
GetTtsPlatform()->StopSpeaking();
}
@@ -531,10 +535,6 @@ void TtsControllerImpl::UpdateUtteranceDefaults(TtsUtterance* utterance) {
utterance->SetContinuousParameters(rate, pitch, volume);
}
-void TtsControllerImpl::SetStopSpeakingWhenHidden(bool value) {
- stop_speaking_when_hidden_ = value;
-}
-
void TtsControllerImpl::StripSSML(
const std::string& utterance,
base::OnceCallback<void(const std::string&)> on_ssml_parsed) {