diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 12:15:40 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 12:15:40 +0000 |
| commit | c01c348a50f45cd10d65a3ad65fb6ef9db4cab75 (patch) | |
| tree | 8c91c5bf69c92816e52000845253cf02dcf96987 /webkit | |
| parent | 3fcb52fa1b719e156ef28fc162ba7db2ee0543c7 (diff) | |
| download | chromium_src-c01c348a50f45cd10d65a3ad65fb6ef9db4cab75.zip chromium_src-c01c348a50f45cd10d65a3ad65fb6ef9db4cab75.tar.gz chromium_src-c01c348a50f45cd10d65a3ad65fb6ef9db4cab75.tar.bz2 | |
Language tag for speech.
This is the 3rd in a 4-sided patch to add language attribute support to speech input.
The other patches can be found here:
1st - http://codereview.chromium.org/3615005/show
2nd - https://bugs.webkit.org/show_bug.cgi?id=47089
4th - https://bugs.webkit.org/show_bug.cgi?id=47420
This patch will be submitted once the webkit change has been rolled into chromium DEPS. Also, a last webkit cleanup patch will be submitted at any point after the 2nd patch.
BUG=53598
TEST=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=64466
Review URL: http://codereview.chromium.org/3595018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index ef206e3..d1d13bc 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -1128,9 +1128,10 @@ void LayoutTestController::setAllowFileAccessFromFileURLs( void LayoutTestController::setMockSpeechInputResult(const CppArgumentList& args, CppVariant* result) { - if (args.size() > 0 && args[0].isString()) { + if (args.size() > 0 && args[0].isString() && args[1].isString()) { shell_->speech_input_controller_mock()->setMockRecognitionResult( - WebString::fromUTF8(args[0].ToString())); + WebString::fromUTF8(args[0].ToString()), + WebString::fromUTF8(args[1].ToString())); } result->SetNull(); } |