2011-09-23 Xan Lopez <xlopez@igalia.com>

        [GTK] Rebaseline following r95745, r95725

        Unreviewed rebaseline.

        * platform/gtk/editing/deleting/merge-whitespace-pre-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 89a93d1..49d800b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-23  Xan Lopez  <xlopez@igalia.com>
+
+        [GTK] Rebaseline following r95745, r95725
+
+        Unreviewed rebaseline.
+
+        * platform/gtk/editing/deleting/merge-whitespace-pre-expected.txt:
+
 2011-09-23  Marcus Bulach  <bulach@chromium.org>
 
         [chromium] Rebaseline following r95745, r95725

diff --git a/LayoutTests/platform/gtk/editing/deleting/merge-whitespace-pre-expected.txt b/LayoutTests/platform/gtk/editing/deleting/merge-whitespace-pre-expected.txt
index e3d01c8..4fd66d4 100644 (file)
--- a/LayoutTests/platform/gtk/editing/deleting/merge-whitespace-pre-expected.txt
+++ b/LayoutTests/platform/gtk/editing/deleting/merge-whitespace-pre-expected.txt
@@ -12,8 +12,9 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x19
           RenderText {#text} at (0,0) size 21x19
             text run at (0,0) width 21: "foo"
-          RenderText {#text} at (21,0) size 20x19
-            text run at (21,0) width 20: "bar"
+          RenderInline {SPAN} at (0,0) size 24x15
+            RenderText {#text} at (21,4) size 24x15
+              text run at (21,4) width 24: "bar"
         RenderBlock {PRE} at (0,32) size 784x15
           RenderText {#text} at (0,0) size 24x15
             text run at (0,0) width 24: "baz"