[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit a2b93fbfb8829111b81ce4fcbd4ce6f9d43ccbec
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 23:50:34 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=33181
            The first letter is not removed properly from inline input hole
    
            * WebView.cpp: (WebView::onIMEEndComposition): If composition is ended before it was
            confirmed, cancel it.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 36453d6..1c4d0e0 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Darin Adler.
 
+        https://bugs.webkit.org/show_bug.cgi?id=33181
+        The first letter is not removed properly from inline input hole
+
+        * WebView.cpp: (WebView::onIMEEndComposition): If composition is ended before it was
+        confirmed, cancel it.
+
+2010-01-04  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
         https://bugs.webkit.org/show_bug.cgi?id=33161
         Assertion failure in WebView when using Chinese Simplified IME
 
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 8e38d17..210f9df 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -5255,8 +5255,15 @@ bool WebView::onIMEComposition(LPARAM lparam)
 bool WebView::onIMEEndComposition()
 {
     LOG(TextInput, "onIMEEndComposition");
-    if (m_inIMEComposition) 
+    // If the composition hasn't been confirmed yet, it needs to be cancelled.
+    // This happens after deleting the last character from inline input hole.
+    Frame* targetFrame = m_page->focusController()->focusedOrMainFrame();
+    if (targetFrame && targetFrame->editor()->hasComposition())
+        targetFrame->editor()->confirmComposition(String());
+
+    if (m_inIMEComposition)
         m_inIMEComposition--;
+
     return true;
 }
 

-- 
WebKit Debian packaging