[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[rniwa at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0539dca0d54e17f3a448cb7c0b280a63f249a845
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 10 22:10:30 2009 +0000

    REGRESSION (r49414): Rebaseline needed for Windows / Gtk Linux
    https://bugs.webkit.org/show_bug.cgi?id=30279
    
    Patch by Ryosuke Niwa <rniwa at webkit.org> on 2009-10-10
    Reviewed by Eric Seidel.
    
    * platform/gtk/editing/style/5228141-expected.txt: Same rebaseline done for Mac in r49414
    * platform/win/editing/execCommand/toggle-compound-styles-expected.txt: two i tags are merged properly
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bc24522..d5d8a53 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-10  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION (r49414): Rebaseline needed for Windows / Gtk Linux
+        https://bugs.webkit.org/show_bug.cgi?id=30279
+
+        * platform/gtk/editing/style/5228141-expected.txt: Same rebaseline done for Mac in r49414
+        * platform/win/editing/execCommand/toggle-compound-styles-expected.txt: two i tags are merged properly
+
 2009-10-10  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Eric Carlson.
diff --git a/LayoutTests/platform/gtk/editing/style/5228141-expected.txt b/LayoutTests/platform/gtk/editing/style/5228141-expected.txt
index c0711e2..752a9d7 100644
--- a/LayoutTests/platform/gtk/editing/style/5228141-expected.txt
+++ b/LayoutTests/platform/gtk/editing/style/5228141-expected.txt
@@ -11,10 +11,9 @@ layer at (0,0) size 800x600
           RenderInline {B} at (0,0) size 0x22
             RenderBR {BR} at (0,0) size 0x22
         RenderBlock {DIV} at (0,22) size 784x109
-          RenderInline {B} at (0,0) size 166x22
+          RenderInline {B} at (0,0) size 242x22
             RenderText {#text} at (0,87) size 166x22
               text run at (0,87) width 166: "This text should be bold."
-          RenderInline {B} at (0,0) size 76x22
             RenderImage {IMG} at (166,0) size 76x103
 selection start: position 0 of child 0 {BR} of child 0 {B} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 1 of child 0 {IMG} of child 1 {B} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 1 {IMG} of child 0 {B} of child 1 {DIV} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt b/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt
index 43eb194..6c94fb9 100644
--- a/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt
+++ b/LayoutTests/platform/win/editing/execCommand/toggle-compound-styles-expected.txt
@@ -7,7 +7,7 @@ PLATFORM-DEPENDNET TESTS
 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 <u><b>hello </b></u><b>world</b>
-one italic command converted <i>hello</i> <img> to <i>hello </i><i><img></i>
+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-INDEPENDNET 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