diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-18 09:35:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-18 09:35:58 (GMT) |
commit | 4911fd836a2328b76f6702db76e5376472a3a11f (patch) | |
tree | 375c731e4bf1e573649627ba2d575d000928a212 /src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp | |
parent | 4cef0e055f2b519b405f90ce9cfcab90515e443e (diff) | |
parent | 44349923bc43665de3f3adefe817cbfd85ebd04d (diff) | |
download | Qt-4911fd836a2328b76f6702db76e5376472a3a11f.zip Qt-4911fd836a2328b76f6702db76e5376472a3a11f.tar.gz Qt-4911fd836a2328b76f6702db76e5376472a3a11f.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 85a48bdb52a81a9d18477a347fba5f6c930af416 )
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp index 652bc40..5746281 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp @@ -347,7 +347,11 @@ void HTMLInputElement::aboutToUnload() bool HTMLInputElement::shouldUseInputMethod() const { - return m_type == TEXT || m_type == SEARCH || m_type == ISINDEX; + // The reason IME's are disabled for the password field is because IMEs + // can access the underlying password and display it in clear text -- + // e.g. you can use it to access the stored password for any site + // with only trivial effort. + return isTextField() && inputType() != PASSWORD; } void HTMLInputElement::handleFocusEvent() |