Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebSearchableFormData.cpp

diff --git a/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp b/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp
index b86adc8..370064b 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp
+++ b/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp
@@ -44,7 +44,7 @@
 #include "public/web/WebInputElement.h"
 #include "wtf/text/TextEncoding.h"
 
-using namespace WebCore;
+using namespace blink;
 using namespace HTMLNames;
 
 namespace {
@@ -102,7 +102,7 @@ bool IsSelectInDefaultState(HTMLSelectElement* select)
     const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = select->listItems();
     if (select->multiple() || select->size() > 1) {
         for (WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
-            if (!(*i)->hasLocalName(HTMLNames::optionTag))
+            if (!isHTMLOptionElement(*i))
                 continue;
             HTMLOptionElement* optionElement = toHTMLOptionElement(*i);
             if (optionElement->selected() != optionElement->hasAttribute(selectedAttr))
@@ -115,7 +115,7 @@ bool IsSelectInDefaultState(HTMLSelectElement* select)
     // least one item is selected, determine which one.
     HTMLOptionElement* initialSelected = 0;
     for (WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
-        if (!(*i)->hasLocalName(HTMLNames::optionTag))
+        if (!isHTMLOptionElement(*i))
             continue;
         HTMLOptionElement* optionElement = toHTMLOptionElement(*i);
         if (optionElement->hasAttribute(selectedAttr)) {