Changeset 83862 in webkit

Timestamp:

Apr 14, 2011 8:51:53 AM (13 years ago)

Author:

satish@chromium.org

Message:

2011-04-14 Satish Sampath <​satish@chromium.org>

Reviewed by Kent Tamura.

Disable speech input for readonly and disabled input fields.
​https://bugs.webkit.org/show_bug.cgi?id=58540

• fast/speech/input-readonly-and-disabled-expected.txt: Added.
• fast/speech/input-readonly-and-disabled.html: Added.

2011-04-14 Satish Sampath <​satish@chromium.org>

Reviewed by Kent Tamura.

Disable speech input for readonly and disabled input fields.
​https://bugs.webkit.org/show_bug.cgi?id=58540

Test: fast/speech/input-readonly-and-disabled.html

• html/shadow/TextControlInnerElements.cpp: (WebCore::InputFieldSpeechButtonElement::defaultEventHandler): (WebCore::InputFieldSpeechButtonElement::setRecognitionResult):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/speech/input-readonly-and-disabled-expected.txt (added)
• LayoutTests/fast/speech/input-readonly-and-disabled.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/TextControlInnerElements.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-14  Satish Sampath  <satish@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Disable speech input for readonly and disabled input fields.
+        https://bugs.webkit.org/show_bug.cgi?id=58540
+
+        * fast/speech/input-readonly-and-disabled-expected.txt: Added.
+        * fast/speech/input-readonly-and-disabled.html: Added.
+
 2011-04-14  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Satish Sampath  <satish@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Disable speech input for readonly and disabled input fields.
+        https://bugs.webkit.org/show_bug.cgi?id=58540
+
+        Test: fast/speech/input-readonly-and-disabled.html
+
+        * html/shadow/TextControlInnerElements.cpp:
+        (WebCore::InputFieldSpeechButtonElement::defaultEventHandler):
+        (WebCore::InputFieldSpeechButtonElement::setRecognitionResult):
+
 2011-04-14  Ilya Tikhonovsky  <loislo@chromium.org>
 

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

@@ -394 +394 @@
     RefPtr<HTMLInputElement> input(static_cast<HTMLInputElement*>(shadowAncestorNode()));
 
+    if (input->disabled() || input->isReadOnlyFormControl()) {
+        if (!event->defaultHandled())
+            HTMLDivElement::defaultEventHandler(event);
+        return;
+    }
+
     // On mouse down, select the text and set focus.
     if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
@@ -472 +478 @@
     // here, we take a temporary reference.
     RefPtr<HTMLInputElement> input(static_cast<HTMLInputElement*>(shadowAncestorNode()));
+    if (input->disabled() || input->isReadOnlyFormControl())
+        return;
+
     RefPtr<InputFieldSpeechButtonElement> holdRefButton(this);
     input->setValue(results.isEmpty() ? "" : results[0]->utterance());