Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/web/WebInputElement.cpp b/src/third_party/WebKit/Source/web/WebInputElement.cpp
index 00a81ad..fd6aac9 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebInputElement.cpp
+++ b/src/third_party/WebKit/Source/web/WebInputElement.cpp
@@ -32,9 +32,11 @@
 #include "public/web/WebInputElement.h"
 
 #include "core/HTMLNames.h"
+#include "core/InputTypeNames.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLDataListElement.h"
+#include "core/html/HTMLDataListOptionsCollection.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/html/shadow/TextControlInnerElements.h"
@@ -52,32 +54,32 @@ bool WebInputElement::isTextField() const
 
 bool WebInputElement::isText() const
 {
-    return constUnwrap<HTMLInputElement>()->isText();
+    return constUnwrap<HTMLInputElement>()->isTextField() && constUnwrap<HTMLInputElement>()->type() != InputTypeNames::number;
 }
 
 bool WebInputElement::isEmailField() const
 {
-    return constUnwrap<HTMLInputElement>()->isEmailField();
+    return constUnwrap<HTMLInputElement>()->type() == InputTypeNames::email;
 }
 
 bool WebInputElement::isPasswordField() const
 {
-    return constUnwrap<HTMLInputElement>()->isPasswordField();
+    return constUnwrap<HTMLInputElement>()->type() == InputTypeNames::password;
 }
 
 bool WebInputElement::isImageButton() const
 {
-    return constUnwrap<HTMLInputElement>()->isImageButton();
+    return constUnwrap<HTMLInputElement>()->type() == InputTypeNames::image;
 }
 
 bool WebInputElement::isRadioButton() const
 {
-    return constUnwrap<HTMLInputElement>()->isRadioButton();
+    return constUnwrap<HTMLInputElement>()->type() == InputTypeNames::radio;
 }
 
 bool WebInputElement::isCheckbox() const
 {
-    return constUnwrap<HTMLInputElement>()->isCheckbox();
+    return constUnwrap<HTMLInputElement>()->type() == InputTypeNames::checkbox;
 }
 
 int WebInputElement::maxLength() const