X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fweb%2FWebInputElement.cpp;h=fd6aac98dc5fea71304bee117ac48e8736e11aa3;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=00a81ad66b84f2f2793ab8c8ab191c6ed84c6132;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/web/WebInputElement.cpp b/src/third_party/WebKit/Source/web/WebInputElement.cpp index 00a81ad..fd6aac9 100644 --- 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()->isText(); + return constUnwrap()->isTextField() && constUnwrap()->type() != InputTypeNames::number; } bool WebInputElement::isEmailField() const { - return constUnwrap()->isEmailField(); + return constUnwrap()->type() == InputTypeNames::email; } bool WebInputElement::isPasswordField() const { - return constUnwrap()->isPasswordField(); + return constUnwrap()->type() == InputTypeNames::password; } bool WebInputElement::isImageButton() const { - return constUnwrap()->isImageButton(); + return constUnwrap()->type() == InputTypeNames::image; } bool WebInputElement::isRadioButton() const { - return constUnwrap()->isRadioButton(); + return constUnwrap()->type() == InputTypeNames::radio; } bool WebInputElement::isCheckbox() const { - return constUnwrap()->isCheckbox(); + return constUnwrap()->type() == InputTypeNames::checkbox; } int WebInputElement::maxLength() const