[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 655805e25f4b7de4b869c2928921846b568b3bc7
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 12 21:50:43 2003 +0000

    	- fixed 3370614 -- REGRESSION (81-85): partial inline input from Japanese
    	input method can disappear
    
            Reviewed by Hyatt
    
            * khtml/rendering/render_form.cpp:
            (RenderLineEdit::updateFromElement):
    	call w->text() before element()->value(), because w->text() has a side
    	effect of updating element()->value() in the inline input case
            (RenderTextArea::updateFromElement):
    	same for text areas
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4809 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bb9ee44..29ea65f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-08-12  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3370614 -- REGRESSION (81-85): partial inline input from Japanese 
+	input method can disappear
+
+        Reviewed by Hyatt
+
+        * khtml/rendering/render_form.cpp:
+        (RenderLineEdit::updateFromElement):
+	call w->text() before element()->value(), because w->text() has a side
+	effect of updating element()->value() in the inline input case
+        (RenderTextArea::updateFromElement):
+	same for text areas
+
 2003-08-12  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3374566, list bullets don't display if list-style-type is none but a list-style-image
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bb9ee44..29ea65f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-08-12  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3370614 -- REGRESSION (81-85): partial inline input from Japanese 
+	input method can disappear
+
+        Reviewed by Hyatt
+
+        * khtml/rendering/render_form.cpp:
+        (RenderLineEdit::updateFromElement):
+	call w->text() before element()->value(), because w->text() has a side
+	effect of updating element()->value() in the inline input case
+        (RenderTextArea::updateFromElement):
+	same for text areas
+
 2003-08-12  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3374566, list bullets don't display if list-style-type is none but a list-style-image
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index 9dd188b..eff71d6 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -550,10 +550,14 @@ void RenderLineEdit::updateFromElement()
     if ( w->maxLength() != ml )
         w->setMaxLength( ml );
 
+    // Call w->text() before calling element()->value(), because in the case of inline
+    // input such as Hiragana, w->text() has a side effect of sending the notification
+    // that we use in slotTextChanged to update element()->m_value
+    QString widgetText = w->text();
     QString newText = element()->value().string();
     newText.replace('\\', backslashAsCurrencySymbol());
 
-    if (newText != w->text()) {
+    if (newText != widgetText) {
         w->blockSignals(true);
         int pos = w->cursorPosition();
 
@@ -1355,9 +1359,14 @@ void RenderTextArea::updateFromElement()
     TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget);
     w->setReadOnly(element()->readOnly());
     w->setAlignment(style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft);
+    
+    // Call w->text() before calling element()->value(), because in the case of inline
+    // input such as Hiragana, w->text() has a side effect of sending the notification
+    // that we use in slotTextChanged to update element()->m_value
+    QString widgetText = w->text();
     QString text = element()->value().string();
     text.replace('\\', backslashAsCurrencySymbol());
-    if (w->text() != text) {
+    if (widgetText != text) {
         w->blockSignals(true);
         int line, col;
         w->getCursorPosition( &line, &col );

-- 
WebKit Debian packaging