summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-31 11:52:57 +1000
committerWarwick Allison <warwick.allison@nokia.com>2009-07-31 11:52:57 +1000
commitaa9cf406d62004519ad54596e1c391f9a6439210 (patch)
treedd562b9c296981f2761b76623911be8496c7af84 /src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp
parent987aec28b950e1c9817a20a9dd71afc071cd93ea (diff)
parent56b6a5924008ab5cdbae36e9662eddba923acd5e (diff)
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp')
-rw-r--r--src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp
index 1087134ff..60d3de6e7 100644
--- a/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp
+++ b/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp
@@ -125,7 +125,15 @@ bool WMLOptionElement::selected() const
void WMLOptionElement::setSelectedState(bool selected)
{
+ if (this->selected() == selected)
+ return;
+
OptionElement::setSelectedState(m_data, this, selected);
+
+ if (WMLSelectElement* select = ownerSelectElement(this)) {
+ if (select->multiple() || selected)
+ handleIntrinsicEventIfNeeded();
+ }
}
String WMLOptionElement::value() const