[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cf681cdb2e75df844165dcf3008b1094531f54fa
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 17:12:56 2010 +0000

    2010-12-17  Antonio Gomes  <agomes at rim.com>
    
            Unreviewed expectation result update.
    
            editing/execCommand/toggle-compound-styles.html needs new expected results after r74269.
    
            Default editing behavior of GTK+ DRT was changed from Mac to Unix, and this test is wrongly
            going through platform specific editing behavior code path without making calls to
            LayoutTestController::setEditingBehavior. Filed bug 51261 for the proper fix.
    
            * platform/gtk/editing/execCommand/toggle-compound-styles-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 92838df..ccdc8c9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-17  Antonio Gomes  <agomes at rim.com>
+
+        Unreviewed expectation result update.
+
+        editing/execCommand/toggle-compound-styles.html needs new expected results after r74269.
+
+        Default editing behavior of GTK+ DRT was changed from Mac to Unix, and this test is wrongly
+        going through platform specific editing behavior code path without making calls to
+        LayoutTestController::setEditingBehavior. Filed bug 51261 for the proper fix.
+
+        * platform/gtk/editing/execCommand/toggle-compound-styles-expected.txt:
+
 2010-12-05  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/LayoutTests/platform/gtk/editing/execCommand/toggle-compound-styles-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/toggle-compound-styles-expected.txt
index b989b76..c2e7986 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/toggle-compound-styles-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/toggle-compound-styles-expected.txt
@@ -4,10 +4,10 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PLATFORM-DEPENDENT TESTS
-one bold command converted <u><b>hello</b> world</u> to <u>hello world</u>
-one bold command converted <b>hello </b>world to hello world
-one bold command converted <u><b>hello </b></u>world to <u>hello </u>world
-one italic command converted <i>hello</i> <img> to hello <img>
+one bold command converted <u><b>hello</b> world</u> to <u><b>hello world</b></u>
+one bold command converted <b>hello </b>world to <b>hello world</b>
+one bold command converted <u><b>hello </b></u>world to <b><u>hello </u>world</b>
+one italic command converted <i>hello</i> <img> to <i>hello <img></i>
 one italic command converted <s><b>hello<i> world</i></b></s> to <s><b><i>hello world</i></b></s>
 PLATFORM-INDEPENDENT TESTS
 PASS one bold command converted <u><span id='test'><b>hello</b></span><b>world</b></u> to <u><span id="test">hello</span>world</u>

-- 
WebKit Debian packaging