summaryrefslogtreecommitdiff
path: root/Source/WebCore/html/HTMLInputElement.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-26 11:37:00 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-26 11:36:36 +0100
commitf474b2b60ec57205facd4eec2181ebe69b686772 (patch)
tree42a132541a82c97039ea8a98b40e5012187ede28 /Source/WebCore/html/HTMLInputElement.cpp
parent061d58bc0fa016cfeed744fd3e4663460635d69b (diff)
downloadqtwebkit-f474b2b60ec57205facd4eec2181ebe69b686772.tar.gz
Imported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (http://svn.webkit.org/repository/webkit/trunk@135696)
New snapshot that fixes build after QMacStyle removal Change-Id: Idea95c96c73b49158d52861db2a4b8d2c51766b0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebCore/html/HTMLInputElement.cpp')
-rw-r--r--Source/WebCore/html/HTMLInputElement.cpp34
1 files changed, 1 insertions, 33 deletions
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 5dac84963..4cae786f1 100644
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -56,7 +56,6 @@
#include "Language.h"
#include "LocalizedStrings.h"
#include "MouseEvent.h"
-#include "NumberInputType.h"
#include "RenderTextControlSingleLine.h"
#include "RenderTheme.h"
#include "RuntimeEnabledFeatures.h"
@@ -545,35 +544,9 @@ void HTMLInputElement::updateType()
void HTMLInputElement::subtreeHasChanged()
{
- ASSERT(isTextField());
- ASSERT(renderer());
-
- bool wasChanged = wasChangedSinceLastFormControlChangeEvent();
- setChangedSinceLastFormControlChangeEvent(true);
-
- // We don't need to call sanitizeUserInputValue() function here because
- // HTMLInputElement::handleBeforeTextInsertedEvent() has already called
- // sanitizeUserInputValue().
- // sanitizeValue() is needed because IME input doesn't dispatch BeforeTextInsertedEvent.
- setValueFromRenderer(sanitizeValue(convertFromVisibleValue(innerTextValue())));
- updatePlaceholderVisibility(false);
- // Recalc for :invalid and hasUnacceptableValue() change.
- setNeedsStyleRecalc();
-
m_inputType->subtreeHasChanged();
-
- if (!wasChanged && focused()) {
- if (Frame* frame = document()->frame())
- frame->editor()->textFieldDidBeginEditing(this);
- }
-
- if (focused()) {
- if (Frame* frame = document()->frame())
- frame->editor()->textDidChangeInTextField(this);
- }
// When typing in an input field, childrenChanged is not called, so we need to force the directionality check.
- if (isTextField())
- calculateAndAdjustDirectionality();
+ calculateAndAdjustDirectionality();
}
const AtomicString& HTMLInputElement::formControlType() const
@@ -1404,11 +1377,6 @@ String HTMLInputElement::visibleValue() const
return m_inputType->visibleValue();
}
-String HTMLInputElement::convertFromVisibleValue(const String& visibleValue) const
-{
- return m_inputType->convertFromVisibleValue(visibleValue);
-}
-
String HTMLInputElement::sanitizeValue(const String& proposedValue) const
{
if (proposedValue.isNull())