diff options
| author | Steve Block <steveblock@google.com> | 2010-09-10 04:32:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 04:32:10 -0700 |
| commit | 9836c30e301e8c144507e06ef2482d33c89a7d1c (patch) | |
| tree | 3bc09ce26af045919965717db7a7c598c3b5a4ce | |
| parent | cd011297fda5b6f6093453d59c2624aaf878e2fb (diff) | |
| parent | a926fcfd627808c13994eb22aa991c82fd57673a (diff) | |
| download | external_webkit-9836c30e301e8c144507e06ef2482d33c89a7d1c.zip external_webkit-9836c30e301e8c144507e06ef2482d33c89a7d1c.tar.gz external_webkit-9836c30e301e8c144507e06ef2482d33c89a7d1c.tar.bz2 | |
am a926fcfd: Cherry-pick security fix in WebKit change 61709
Merge commit 'a926fcfd627808c13994eb22aa991c82fd57673a' into gingerbread-plus-aosp
* commit 'a926fcfd627808c13994eb22aa991c82fd57673a':
Cherry-pick security fix in WebKit change 61709
| -rw-r--r-- | WebCore/dom/SelectElement.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp index 866b6ca..0338c1e 100644 --- a/WebCore/dom/SelectElement.cpp +++ b/WebCore/dom/SelectElement.cpp @@ -342,8 +342,13 @@ void SelectElement::setSelectedIndex(SelectElementData& data, Element* element, data.setUserDrivenChange(userDrivenChange); if (fireOnChangeNow) menuListOnChange(data, element); - if (RenderMenuList* menuList = toRenderMenuList(element->renderer())) - menuList->didSetSelectedIndex(); + RenderObject* renderer = element->renderer(); + if (renderer) { + if (data.usesMenuList()) + toRenderMenuList(renderer)->didSetSelectedIndex(); + else if (renderer->isListBox()) + toRenderListBox(renderer)->selectionChanged(); + } } if (Frame* frame = element->document()->frame()) |