Fix rate, pitch, and volume from web speech synthesis API to extensions.

chrome/browser/speech/extension_api/tts_engine_extension_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 120 matching lines @@
           voice.event_types.end()) {
         result_voice.events.insert(TTS_EVENT_CANCELLED);
         result_voice.events.insert(TTS_EVENT_INTERRUPTED);
       }
     }
   }
 }
 
 void TtsExtensionEngine::Speak(Utterance* utterance,
                                const VoiceData& voice) {
+  LOG(ERROR) << "TtsExtensionEngine::Speak";

[David Tseng, 2015/03/16 17:56:50]

Remove

+  {
+    std::string json;
+    base::JSONWriter::Write(utterance->options(), &json);
+    LOG(ERROR) << "Options: " << json;

[David Tseng, 2015/03/16 17:56:50]

Remove

+  }
+
   // See if the engine supports the "end" event; if so, we can keep the
   // utterance around and track it. If not, we're finished with this
   // utterance now.
   bool sends_end_event = voice.events.find(TTS_EVENT_END) != voice.events.end();
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->AppendString(utterance->text());
 
   // Pass through most options to the speech engine, but remove some
   // that are handled internally.
   scoped_ptr<base::DictionaryValue> options(static_cast<base::DictionaryValue*>(
       utterance->options()->DeepCopy()));
   if (options->HasKey(constants::kRequiredEventTypesKey))
     options->Remove(constants::kRequiredEventTypesKey, NULL);
   if (options->HasKey(constants::kDesiredEventTypesKey))
     options->Remove(constants::kDesiredEventTypesKey, NULL);
   if (sends_end_event && options->HasKey(constants::kEnqueueKey))
     options->Remove(constants::kEnqueueKey, NULL);
   if (options->HasKey(constants::kSrcIdKey))
     options->Remove(constants::kSrcIdKey, NULL);
   if (options->HasKey(constants::kIsFinalEventKey))
     options->Remove(constants::kIsFinalEventKey, NULL);
   if (options->HasKey(constants::kOnEventKey))
     options->Remove(constants::kOnEventKey, NULL);
 
+  // Get the volume, pitch, and rate, but only if they weren't already in
+  // the options. TODO(dmazzoni): these shouldn't be redundant.
+  // http://crbug.com/463264
+  if (!options->HasKey(constants::kRateKey)) {
+    options->SetDouble(constants::kRateKey,
+                       utterance->continuous_parameters().rate);
+  }
+  if (!options->HasKey(constants::kPitchKey)) {
+    options->SetDouble(constants::kPitchKey,
+                       utterance->continuous_parameters().pitch);
+  }
+  if (!options->HasKey(constants::kVolumeKey)) {
+    options->SetDouble(constants::kVolumeKey,
+                       utterance->continuous_parameters().volume);
+  }
+
   // Add the voice name and language to the options if they're not
   // already there, since they might have been picked by the TTS controller
   // rather than directly by the client that requested the speech.
   if (!options->HasKey(constants::kVoiceNameKey))
     options->SetString(constants::kVoiceNameKey, voice.name);
   if (!options->HasKey(constants::kLangKey))
     options->SetString(constants::kLangKey, voice.lang);
 
   args->Append(options.release());
   args->AppendInteger(utterance->id());
 
+  std::string json;
+  base::JSONWriter::Write(args.get(), &json);
+  LOG(ERROR) << "To Extension: " << json;

[David Tseng, 2015/03/16 17:56:50]

Remove

+
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnSpeak, args.Pass()));
   Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
   event->restrict_to_browser_context = profile;
   EventRouter::Get(profile)
       ->DispatchEventToExtension(utterance->extension_id(), event.Pass());
 }
 
 void TtsExtensionEngine::Stop(Utterance* utterance) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
@@ skipping 115 matching lines @@
         utterance_id, TTS_EVENT_PAUSE, char_index, std::string());
   } else if (event_type == constants::kEventTypeResume) {
     controller->OnTtsEvent(
         utterance_id, TTS_EVENT_RESUME, char_index, std::string());
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
 
   return true;
 }