summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/InputElement.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-06 21:36:31 +0000
committerBen Murdoch <benm@google.com>2011-01-07 10:36:05 +0000
commit4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch)
treeee905fa007e14522848f571215c1054734db9269 /WebCore/dom/InputElement.cpp
parent21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff)
downloadexternal_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip
external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz
external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/dom/InputElement.cpp')
-rw-r--r--WebCore/dom/InputElement.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/dom/InputElement.cpp b/WebCore/dom/InputElement.cpp
index 85f37e1..37211d8 100644
--- a/WebCore/dom/InputElement.cpp
+++ b/WebCore/dom/InputElement.cpp
@@ -138,7 +138,9 @@ void InputElement::setValueFromRenderer(InputElementData& data, InputElement* in
element->setFormControlValueMatchesRenderer(true);
- element->dispatchEvent(Event::create(eventNames().inputEvent, true, false));
+ // Input event is fired by the Node::defaultEventHandler for editable controls.
+ if (!inputElement->isTextField())
+ element->dispatchEvent(Event::create(eventNames().inputEvent, true, false));
notifyFormStateChanged(element);
}