[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 6ea684c5434979890a5bab5f82f610288d4d2764
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 09:22:19 2010 +0000

    2010-12-29  Zhe Su  <suzhe at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Remove entry for editing/input/ime-composition-clearpreedit.html test.
            https://bugs.webkit.org/show_bug.cgi?id=51693
    
            * platform/chromium/test_expectations.txt:
    2010-12-29  Zhe Su  <suzhe at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Fix editing/input/ime-composition-clearpreedit.html test in chromium
            by removing the line "editor->confirmComposition(text);" from
            WebFrameImpl::setMarkedText() method, because that line will insert the
            text into the focused node, which is apparently wrong.
    
            https://bugs.webkit.org/show_bug.cgi?id=51693
    
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::setMarkedText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ee6912e..a862444 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-29  Zhe Su  <suzhe at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove entry for editing/input/ime-composition-clearpreedit.html test.
+        https://bugs.webkit.org/show_bug.cgi?id=51693
+
+        * platform/chromium/test_expectations.txt:
+
 2010-12-28  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Antonio Gomes.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 408f5fe..bfbbf94 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3282,7 +3282,5 @@ 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 70b7184..5338eb7 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-29  Zhe Su  <suzhe at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix editing/input/ime-composition-clearpreedit.html test in chromium
+        by removing the line "editor->confirmComposition(text);" from
+        WebFrameImpl::setMarkedText() method, because that line will insert the
+        text into the focused node, which is apparently wrong.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51693
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::setMarkedText):
+
 2010-12-23  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 80d07be..670fc96 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1081,8 +1081,6 @@ void WebFrameImpl::setMarkedText(
 {
     Editor* editor = frame()->editor();
 
-    editor->confirmComposition(text);
-
     Vector<CompositionUnderline> decorations;
     editor->setComposition(text, decorations, location, length);
 }

-- 
WebKit Debian packaging