[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9bb585bbffc3fa7a6b623e858bbcd1e0c19b1b6b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 19:13:20 2010 +0000

    2010-12-29  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r74735.
            http://trac.webkit.org/changeset/74735
            https://bugs.webkit.org/show_bug.cgi?id=51715
    
            assert failures on fast/forms/input-maxlength-ime-
            completed.html (Requested by mihaip on #webkit).
    
            * platform/chromium/test_expectations.txt:
    2010-12-29  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r74735.
            http://trac.webkit.org/changeset/74735
            https://bugs.webkit.org/show_bug.cgi?id=51715
    
            assert failures on fast/forms/input-maxlength-ime-
            completed.html (Requested by mihaip on #webkit).
    
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::setMarkedText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f83b64f..9e2f298 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-29  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r74735.
+        http://trac.webkit.org/changeset/74735
+        https://bugs.webkit.org/show_bug.cgi?id=51715
+
+        assert failures on fast/forms/input-maxlength-ime-
+        completed.html (Requested by mihaip on #webkit).
+
+        * platform/chromium/test_expectations.txt:
+
 2010-12-29  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed Chromium baselines. Update Chromium baselines for
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index bfbbf94..408f5fe 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3282,5 +3282,7 @@ BUGCR67905 MAC : svg/css/getComputedStyle-basic.xhtml = TEXT
 BUGCR67935 WIN : fast/canvas/webgl/canvas-test.html = CRASH
 BUGCR67935 WIN : fast/canvas/webgl/gl-pixelstorei.html = CRASH
 
+BUGCR67960 : editing/input/ime-composition-clearpreedit.html = TEXT
+
 // WebKit roll 74667:74679
 BUGCR68067 LINUX DEBUG : fast/canvas/webgl/tex-image-with-format-and-type.html = TEXT
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5338eb7..cf4ce7c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-29  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r74735.
+        http://trac.webkit.org/changeset/74735
+        https://bugs.webkit.org/show_bug.cgi?id=51715
+
+        assert failures on fast/forms/input-maxlength-ime-
+        completed.html (Requested by mihaip on #webkit).
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::setMarkedText):
+
 2010-12-29  Zhe Su  <suzhe at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 670fc96..80d07be 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1081,6 +1081,8 @@ void WebFrameImpl::setMarkedText(
 {
     Editor* editor = frame()->editor();
 
+    editor->confirmComposition(text);
+
     Vector<CompositionUnderline> decorations;
     editor->setComposition(text, decorations, location, length);
 }

-- 
WebKit Debian packaging