summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-30 14:17:36 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-30 14:17:36 -0400
commit418164343aa2437668796a013c1326c43ef318ac (patch)
treeef0631ea55f45322e44749f2240919d1baa31252 /WebCore
parentc8238eccbdd8de109a5d7c28b514ee36033ed4ba (diff)
parent99fa56b298722aebfd2f987e8a88b5b25d7386fe (diff)
downloadexternal_webkit-418164343aa2437668796a013c1326c43ef318ac.zip
external_webkit-418164343aa2437668796a013c1326c43ef318ac.tar.gz
external_webkit-418164343aa2437668796a013c1326c43ef318ac.tar.bz2
Merge change I99fa56b2 into eclair
* changes: always update the WebTextView from the input element
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/html/HTMLInputElement.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 88e14fd..59e4e2f 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -1113,16 +1113,12 @@ void HTMLInputElement::setValue(const String& value)
if (isTextField()) {
unsigned max = m_data.value().length();
- if (document()->focusedNode() == this)
#ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
- {
- // Make sure our UI side textfield changes to match the RenderTextControl
- android::WebViewCore::getWebViewCore(document()->view())->updateTextfield(this, false, value);
+ // Make sure our UI side textfield changes to match the RenderTextControl
+ android::WebViewCore::getWebViewCore(document()->view())->updateTextfield(this, false, value);
#endif
+ if (document()->focusedNode() == this)
InputElement::updateSelectionRange(this, this, max, max);
-#ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
- }
-#endif
else
cacheSelection(max, max);
}