Changeset 95722 in webkit

Timestamp:

Sep 22, 2011 9:18:50 AM (13 years ago)

Author:

leandrogracia@chromium.org

Message:

Source/WebCore: Fire TextInput events on speech input, but not set/add any inputMethod attribute.
​https://bugs.webkit.org/show_bug.cgi?id=60451

Reviewed by Ryosuke Niwa.

Introduce code to dispatch TextInput events when text is introduced via
the speech input feature. Handle also the cases where speech input is
started programmatically from the LayoutTestController.

Test: fast/speech/input-ontextinput-event.html

• dom/TextEventInputType.h:
• html/shadow/TextControlInnerElements.cpp:

(WebCore::InputFieldSpeechButtonElement::setRecognitionResult):

LayoutTests: Testing text events triggered by speech input.
​https://bugs.webkit.org/show_bug.cgi?id=60451

Reviewed by Ryosuke Niwa.

• fast/speech/input-ontextinput-event-expected.txt: Added.
• fast/speech/input-ontextinput-event.html: Added.
• fast/speech/input-text-speechstart.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/speech/input-ontextinput-event-expected.txt (added)
• LayoutTests/fast/speech/input-ontextinput-event.html (added)
• LayoutTests/fast/speech/input-text-speechstart.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/TextEventInputType.h (modified) (1 diff)
• Source/WebCore/html/shadow/TextControlInnerElements.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-22  Leandro Gracia Gil  <leandrogracia@chromium.org>
+
+        Testing text events triggered by speech input.
+        https://bugs.webkit.org/show_bug.cgi?id=60451
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/speech/input-ontextinput-event-expected.txt: Added.
+        * fast/speech/input-ontextinput-event.html: Added.
+        * fast/speech/input-text-speechstart.html:
+
 2011-09-20  Jason Liu  <jason.liu@torchmobile.com.cn>
 

trunk/LayoutTests/fast/speech/input-text-speechstart.html

@@ -14 +14 @@
     // Test that we can trigger speech with a method call to the input
     // element, so the user agent could toggle speech via a keypress,
-    // for example.
+    // for example. Select is required in order to ensure that the result
+    // will be set in input during the generated TextInput event.
     var input = document.getElementById(id);
+    input.select();
     layoutTestController.startSpeechInput(input);
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-22  Leandro Gracia Gil  <leandrogracia@chromium.org>
+
+        Fire TextInput events on speech input, but not set/add any inputMethod attribute.
+        https://bugs.webkit.org/show_bug.cgi?id=60451
+
+        Reviewed by Ryosuke Niwa.
+
+        Introduce code to dispatch TextInput events when text is introduced via
+        the speech input feature. Handle also the cases where speech input is
+        started programmatically from the LayoutTestController.
+
+        Test: fast/speech/input-ontextinput-event.html
+
+        * dom/TextEventInputType.h:
+        * html/shadow/TextControlInnerElements.cpp:
+        (WebCore::InputFieldSpeechButtonElement::setRecognitionResult):
+
 2011-09-20  Jason Liu  <jason.liu@torchmobile.com.cn>
 

trunk/Source/WebCore/dom/TextEventInputType.h

@@ -36 +36 @@
     TextEventInputPaste,
     TextEventInputDrop,
+    TextEventInputOther,
 };
 

trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp

@@ -44 +44 @@
 #include "SpeechInput.h"
 #include "SpeechInputEvent.h"
+#include "TextEvent.h"
+#include "TextEventInputType.h"
 
 namespace WebCore {
@@ -489 +491 @@
 
     RefPtr<InputFieldSpeechButtonElement> holdRefButton(this);
-    input->setValue(results.isEmpty() ? "" : results[0]->utterance());
+    if (document() && document()->domWindow())
+        input->dispatchEvent(TextEvent::create(document()->domWindow(), results.isEmpty() ? "" : results[0]->utterance(), TextEventInputOther));
+
+    // This event is sent after the text event so the website can perform actions using the input field content immediately.
+    // It provides alternative recognition hypotheses and notifies that the results come from speech input.
     input->dispatchEvent(SpeechInputEvent::create(eventNames().webkitspeechchangeEvent, results));