diff options
| author | Grace Kloba <klobag@google.com> | 2009-06-18 17:26:59 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-18 17:26:59 -0700 |
| commit | b83fc086000e27bc227580bd0e35b9d7bee1179a (patch) | |
| tree | bb42864afa2ea50e3a27a5ce52a0eee9b8ff8411 /WebCore/html | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| parent | fa67f45c81b502d6f7125a91131c43f1b8a0ee6b (diff) | |
| download | external_webkit-b83fc086000e27bc227580bd0e35b9d7bee1179a.zip external_webkit-b83fc086000e27bc227580bd0e35b9d7bee1179a.tar.gz external_webkit-b83fc086000e27bc227580bd0e35b9d7bee1179a.tar.bz2 | |
am fa67f45c: Fix WebKit keygen. Has submitted the change to webkit as bug 26016.
Merge commit 'fa67f45c81b502d6f7125a91131c43f1b8a0ee6b'
* commit 'fa67f45c81b502d6f7125a91131c43f1b8a0ee6b':
Fix WebKit keygen. Has submitted the change to webkit as bug 26016.
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLOptionElement.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/html/HTMLOptionElement.cpp b/WebCore/html/HTMLOptionElement.cpp index 982f578..e59537d 100644 --- a/WebCore/html/HTMLOptionElement.cpp +++ b/WebCore/html/HTMLOptionElement.cpp @@ -176,7 +176,11 @@ void HTMLOptionElement::childrenChanged(bool changedByParser, Node* beforeChange HTMLSelectElement* HTMLOptionElement::ownerSelectElement() const { Node* select = parentNode(); +#ifdef ANDROID_FIX + while (select && !(select->hasTagName(selectTag) || select->hasTagName(keygenTag))) +#else while (select && !select->hasTagName(selectTag)) +#endif select = select->parentNode(); if (!select) |