[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 b310b06ca41bb521702caf6937764a9c7982603e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 21:30:41 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=33161
            Assertion failure in WebView when using Chinese Simplified IME
    
            * WebView.cpp: (WebView::onIMERequestCharPosition): Changed the assertion into release mode
            check. We can't make assertions about arguments passed from outside WebKit.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 9df5b67..36453d6 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=33161
+        Assertion failure in WebView when using Chinese Simplified IME
+
+        * WebView.cpp: (WebView::onIMERequestCharPosition): Changed the assertion into release mode
+        check. We can't make assertions about arguments passed from outside WebKit.
+
+2010-01-04  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
         https://bugs.webkit.org/show_bug.cgi?id=33157
         Implement TextInput logging channel on Windows
 
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 20633d7..8e38d17 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -5277,8 +5277,9 @@ bool WebView::onIMENotify(WPARAM wparam, LPARAM, LRESULT*)
 
 LRESULT WebView::onIMERequestCharPosition(Frame* targetFrame, IMECHARPOSITION* charPos)
 {
+    if (charPos->dwCharPos && !targetFrame->editor()->hasComposition())
+        return 0;
     IntRect caret;
-    ASSERT(charPos->dwCharPos == 0 || targetFrame->editor()->hasComposition());
     if (RefPtr<Range> range = targetFrame->editor()->hasComposition() ? targetFrame->editor()->compositionRange() : targetFrame->selection()->selection().toNormalizedRange()) {
         ExceptionCode ec = 0;
         RefPtr<Range> tempRange = range->cloneRange(ec);

-- 
WebKit Debian packaging