summaryrefslogtreecommitdiffstats
path: root/WebCore/html
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-06-12 11:53:23 -0700
committerGrace Kloba <klobag@google.com>2009-06-18 17:23:37 -0700
commitfa67f45c81b502d6f7125a91131c43f1b8a0ee6b (patch)
tree074ea643e92407adf365cf4b4224fd419a0d0249 /WebCore/html
parentc55ff27e90020786b49c7652a4cd71e71bfc8548 (diff)
downloadexternal_webkit-fa67f45c81b502d6f7125a91131c43f1b8a0ee6b.zip
external_webkit-fa67f45c81b502d6f7125a91131c43f1b8a0ee6b.tar.gz
external_webkit-fa67f45c81b502d6f7125a91131c43f1b8a0ee6b.tar.bz2
Fix WebKit keygen. Has submitted the change to webkit as bug 26016.
Diffstat (limited to 'WebCore/html')
-rw-r--r--WebCore/html/HTMLOptionElement.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/html/HTMLOptionElement.cpp b/WebCore/html/HTMLOptionElement.cpp
index 085019f..63f818e 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)