Diff
Modified: trunk/LayoutTests/ChangeLog (121005 => 121006)
--- trunk/LayoutTests/ChangeLog 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/ChangeLog 2012-06-22 06:31:18 UTC (rev 121006)
@@ -1,3 +1,24 @@
+2012-06-21 Hans Wennborg <[email protected]>
+
+ s/layoutTestController/testRunner/ in speech tests
+ https://bugs.webkit.org/show_bug.cgi?id=89654
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/speech/bubble-position.html:
+ * fast/speech/change-focus.html:
+ * fast/speech/input-onspeechchange-event.html:
+ * fast/speech/input-ontextinput-event.html:
+ * fast/speech/input-readonly-and-disabled.html:
+ * fast/speech/input-text-language-tag.html:
+ * fast/speech/input-text-speechbutton.html:
+ * fast/speech/input-text-speechstart.html:
+ * fast/speech/scripted/speechrecognition-basics.html:
+ * fast/speech/scripted/speechrecognition-errors.html:
+ * fast/speech/speech-button-ignore-generated-events.html:
+ * fast/speech/speech-input-result-list-not-enough-arguments.html:
+ * fast/speech/speech-input-scripting.html:
+
2012-06-21 Sheriff Bot <[email protected]>
Unreviewed, rolling out r120982.
Modified: trunk/LayoutTests/fast/speech/bubble-position.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/bubble-position.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/bubble-position.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -30,8 +30,8 @@
input._onwebkitspeechchange_ = onSpeechChange;
iframe.contentDocument.getElementsByTagName('body')[0].appendChild(input);
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.setMockSpeechInputDumpRect(true);
+ if (window.testRunner && window.eventSender) {
+ testRunner.setMockSpeechInputDumpRect(true);
debug('Clicking the speech button.');
var x = input.offsetLeft + input.offsetWidth - 4;
Modified: trunk/LayoutTests/fast/speech/change-focus.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/change-focus.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/change-focus.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -28,8 +28,8 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
startSpeechInput('input1');
}
}
Modified: trunk/LayoutTests/fast/speech/input-onspeechchange-event.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/input-onspeechchange-event.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/input-onspeechchange-event.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -20,10 +20,10 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Green eggs and ham', 0.8, '');
- layoutTestController.addMockSpeechInputResult('Green x and ham', 0.5, '');
- layoutTestController.addMockSpeechInputResult('3 x and am', 0.2, '');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Green eggs and ham', 0.8, '');
+ testRunner.addMockSpeechInputResult('Green x and ham', 0.5, '');
+ testRunner.addMockSpeechInputResult('3 x and am', 0.2, '');
// Clicking the speech button should fill in mock speech-recognized text.
var input = document.getElementById('speechInput');
Modified: trunk/LayoutTests/fast/speech/input-ontextinput-event.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/input-ontextinput-event.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/input-ontextinput-event.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -18,9 +18,9 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Green eggs and ham', 0.8, '');
- layoutTestController.addMockSpeechInputResult('Green x and ham', 0.5, '');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Green eggs and ham', 0.8, '');
+ testRunner.addMockSpeechInputResult('Green x and ham', 0.5, '');
// Clicking the speech button should fill in mock speech-recognized text.
var input = document.getElementById('speechInput');
Modified: trunk/LayoutTests/fast/speech/input-readonly-and-disabled.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/input-readonly-and-disabled.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/input-readonly-and-disabled.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -31,8 +31,8 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Test', 1.0, '');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Test', 1.0, '');
testField(0);
}
}
Modified: trunk/LayoutTests/fast/speech/input-text-language-tag.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/input-text-language-tag.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/input-text-language-tag.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -34,9 +34,9 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, 'en-GB');
- layoutTestController.addMockSpeechInputResult('月の写真', 1.0, 'ja');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Pictures of the moon', 1.0, 'en-GB');
+ testRunner.addMockSpeechInputResult('月の写真', 1.0, 'ja');
speechButtonClick('speechInputNone');
}
}
Modified: trunk/LayoutTests/fast/speech/input-text-speechbutton.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/input-text-speechbutton.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/input-text-speechbutton.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -40,8 +40,8 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
startSpeechInput("speechInput" + testIndex);
}
}
Modified: trunk/LayoutTests/fast/speech/input-text-speechstart.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/input-text-speechstart.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/input-text-speechstart.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -14,7 +14,7 @@
// will be set in input during the generated TextInput event.
var input = document.getElementById(id);
input.select();
- layoutTestController.startSpeechInput(input);
+ testRunner.startSpeechInput(input);
}
function onWebkitSpeechChange() {
@@ -23,8 +23,8 @@
}
function run() {
- if (window.layoutTestController && window.eventSender) {
- layoutTestController.addMockSpeechInputResult('Pictures of a sunset', 1.0, '');
+ if (window.testRunner && window.eventSender) {
+ testRunner.addMockSpeechInputResult('Pictures of a sunset', 1.0, '');
startSpeechInput("speechInput");
}
}
Modified: trunk/LayoutTests/fast/speech/scripted/speechrecognition-basics.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/scripted/speechrecognition-basics.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/scripted/speechrecognition-basics.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -45,8 +45,8 @@
noMatchTest();
}
- if (window.layoutTestController) {
- layoutTestController.addMockSpeechRecognitionResult('hello, world', 0.42);
+ if (window.testRunner) {
+ testRunner.addMockSpeechRecognitionResult('hello, world', 0.42);
}
r.start();
}
Modified: trunk/LayoutTests/fast/speech/scripted/speechrecognition-errors.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/scripted/speechrecognition-errors.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/scripted/speechrecognition-errors.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -33,7 +33,7 @@
window.count = 0;
r.start();
- layoutTestController.setMockSpeechRecognitionError(webkitSpeechRecognitionError.NOT_ALLOWED, "not allowed");
+ testRunner.setMockSpeechRecognitionError(webkitSpeechRecognitionError.NOT_ALLOWED, "not allowed");
// Check that we get an error event.
r._onerror_ = function() {
Modified: trunk/LayoutTests/fast/speech/speech-button-ignore-generated-events.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/speech-button-ignore-generated-events.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/speech-button-ignore-generated-events.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -44,9 +44,9 @@
// for any web page to use. The speech button should identify that this is not a real user
// input event and not process it.
function run() {
- if (window.layoutTestController && window.eventSender) {
+ if (window.testRunner && window.eventSender) {
// Running in DRT, test the eventSender case.
- layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
+ testRunner.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
document.getElementById('speechInput')._onwebkitspeechchange_ = function() {
shouldBeEqualToString('document.getElementById("speechInput").value', 'Pictures of the moon');
Modified: trunk/LayoutTests/fast/speech/speech-input-result-list-not-enough-arguments.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/speech-input-result-list-not-enough-arguments.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/speech-input-result-list-not-enough-arguments.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -15,10 +15,10 @@
}
function run() {
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
- layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
+ testRunner.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
var input = document.getElementById('speechInput');
input.addEventListener('webkitspeechchange', onWebkitSpeechChange);
var x = input.offsetLeft + input.offsetWidth - 8;
Modified: trunk/LayoutTests/fast/speech/speech-input-scripting.html (121005 => 121006)
--- trunk/LayoutTests/fast/speech/speech-input-scripting.html 2012-06-22 06:11:44 UTC (rev 121005)
+++ trunk/LayoutTests/fast/speech/speech-input-scripting.html 2012-06-22 06:31:18 UTC (rev 121006)
@@ -53,10 +53,10 @@
}
function run() {
- if (!window.layoutTestController || !window.eventSender)
+ if (!window.testRunner || !window.eventSender)
return;
- layoutTestController.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
+ testRunner.addMockSpeechInputResult('Pictures of the moon', 1.0, '');
// Try disabling speech with an input tag which has the attribute set in HTML and
// verify that doesn't result in any crashes.
