Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb )

Changes in WebKit since the last update:

++ b/WebKit/qt/ChangeLog
2009-04-02  Takumi Asaki <takumi.asaki@nokia.com>

        Reviewed by Simon Hausmann.

        Fix pre-edit handling of text fields with input methods.

        The input method sends an empty preeditString() if all characters of
        the preedit should be deleted. So inputMethodEvent() has to use
        preeditString() if it's empty.

        * Api/qwebpage.cpp:
        (QWebPagePrivate::inputMethodEvent):

2009-03-30  Simon Hausmann  <simon.hausmann@nokia.com>

        Rubber-stamped by Tor Arne Vestbø.

        Document that setHtml/setContent loads only the html/data immediately, not external objects.

        * Api/qwebframe.cpp:
        * Api/qwebview.cpp:

1 files changed, 3 insertions, 3 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 636b6e8245..de373836e1 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -896,14 +896,14 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
         return;
     }
 
-    if (!ev->preeditString().isEmpty()) {
+    if (!ev->commitString().isEmpty())
+        editor->confirmComposition(ev->commitString());
+    else {
         QString preedit = ev->preeditString();
         // ### FIXME: use the provided QTextCharFormat (use color at least)
         Vector<CompositionUnderline> underlines;
         underlines.append(CompositionUnderline(0, preedit.length(), Color(0,0,0), false));
         editor->setComposition(preedit, underlines, preedit.length(), 0);
-    } else if (!ev->commitString().isEmpty()) {
-        editor->confirmComposition(ev->commitString());
     }
     ev->accept();
 }