summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/html
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-07-31 15:11:10 -0700
committerGeorge Mount <mount@google.com>2012-08-02 09:36:05 -0700
commit3fe9241dc0b20c68b75847832b8f179c741f4b34 (patch)
tree9204a09c63b8be07c799b6b44cd93d656a07db43 /Source/WebCore/html
parentf0ad26a937ebc7c889abf512e2ec83914ccbf01f (diff)
downloadexternal_webkit-3fe9241dc0b20c68b75847832b8f179c741f4b34.zip
external_webkit-3fe9241dc0b20c68b75847832b8f179c741f4b34.tar.gz
external_webkit-3fe9241dc0b20c68b75847832b8f179c741f4b34.tar.bz2
DO NOT MERGE. Allow numeric entry fields to have placeholder text.
Bug 6712551 Change-Id: I0e43bb223dc2646d6d78f6135f502b75066e6449
Diffstat (limited to 'Source/WebCore/html')
-rw-r--r--Source/WebCore/html/HTMLInputElement.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 4ede2a8..27b29a8 100644
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -1569,7 +1569,11 @@ bool HTMLInputElement::hasSpinButton() const
bool HTMLInputElement::supportsPlaceholder() const
{
+#if PLATFORM(ANDROID)
+ return isTextType() || isNumberField();
+#else
return isTextType();
+#endif
}
CheckedRadioButtons& HTMLInputElement::checkedRadioButtons() const