diff options
Diffstat (limited to 'WebCore/html/HTMLOptionElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLOptionElement.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebCore/html/HTMLOptionElement.cpp b/WebCore/html/HTMLOptionElement.cpp index 1280d32..1e07221 100644 --- a/WebCore/html/HTMLOptionElement.cpp +++ b/WebCore/html/HTMLOptionElement.cpp @@ -190,15 +190,7 @@ void HTMLOptionElement::childrenChanged(bool changedByParser, Node* beforeChange HTMLSelectElement* HTMLOptionElement::ownerSelectElement() const { Node* select = parentNode(); -<<<<<<< HEAD:WebCore/html/HTMLOptionElement.cpp -#ifdef ANDROID_FIX while (select && !(select->hasTagName(selectTag) || select->hasTagName(keygenTag))) -#else - while (select && !select->hasTagName(selectTag)) -#endif -======= - while (select && !(select->hasTagName(selectTag) || select->hasTagName(keygenTag))) ->>>>>>> webkit.org at r58956:WebCore/html/HTMLOptionElement.cpp select = select->parentNode(); if (!select) |