summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tts_api_controller.cc
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 01:30:23 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 01:30:23 +0000
commit47058f6fdb07be8b387f9622a687cea15c0f888e (patch)
tree31eed78096edfe9efc7bdd52f7d06eed0b12acc1 /chrome/browser/extensions/extension_tts_api_controller.cc
parent2a8b52c25832adfb76b42736112cc14c4aaa3c77 (diff)
downloadchromium_src-47058f6fdb07be8b387f9622a687cea15c0f888e.zip
chromium_src-47058f6fdb07be8b387f9622a687cea15c0f888e.tar.gz
chromium_src-47058f6fdb07be8b387f9622a687cea15c0f888e.tar.bz2
Fix some bugs when speak() is called without all of its arguments.
BUG=89255 TEST=Adds TtsApiTest.PlatformSpeakOptionalArgs Review URL: http://codereview.chromium.org/7360006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tts_api_controller.cc')
-rw-r--r--chrome/browser/extensions/extension_tts_api_controller.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_tts_api_controller.cc b/chrome/browser/extensions/extension_tts_api_controller.cc
index 1d0b3fc..8ebda0c 100644
--- a/chrome/browser/extensions/extension_tts_api_controller.cc
+++ b/chrome/browser/extensions/extension_tts_api_controller.cc
@@ -70,6 +70,7 @@ int Utterance::next_utterance_id_ = 0;
Utterance::Utterance(Profile* profile)
: profile_(profile),
id_(next_utterance_id_++),
+ src_id_(-1),
can_enqueue_(false),
char_index_(0),
finished_(false) {
@@ -98,6 +99,9 @@ void Utterance::OnTtsEvent(TtsEventType event_type,
return;
}
+ if (src_id_ < 0)
+ return;
+
ListValue args;
DictionaryValue* event = new DictionaryValue();
event->SetInteger(constants::kCharIndexKey, char_index);