[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c06b295e22b5f31efdf165c321e921864832552f
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 01:40:31 2010 +0000

    2010-03-01  Gustavo Noronha Silva  <gns at gnome.org>
    
            Rebaseline the two editing tests we stopped skipping - we failed
            to take the new caret position result into account while
            unskipping these.
    
            * platform/gtk/editing/selection/5109817-expected.txt:
            * platform/gtk/editing/selection/5354455-2-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55393 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 810a214..4d280b2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-01  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Rebaseline the two editing tests we stopped skipping - we failed
+        to take the new caret position result into account while
+        unskipping these.
+
+        * platform/gtk/editing/selection/5109817-expected.txt:
+        * platform/gtk/editing/selection/5354455-2-expected.txt:
+
 2010-03-01  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/gtk/editing/selection/5109817-expected.txt b/LayoutTests/platform/gtk/editing/selection/5109817-expected.txt
index 2af9020..a62f3fa 100644
--- a/LayoutTests/platform/gtk/editing/selection/5109817-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/5109817-expected.txt
@@ -14,3 +14,4 @@ layer at (0,0) size 800x600
             text run at (29,0) width 44: "second"
         RenderText {#text} at (73,0) size 260x20
           text run at (73,0) width 260: " word in this sentence should be selected."
+caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/selection/5354455-2-expected.txt b/LayoutTests/platform/gtk/editing/selection/5354455-2-expected.txt
index 38ae71f..9a52c8c 100644
--- a/LayoutTests/platform/gtk/editing/selection/5354455-2-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/5354455-2-expected.txt
@@ -22,3 +22,4 @@ layer at (8,8) size 612x155
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
+caret: position 0 of child 0 {#text} of child 1 {H1} of child 1 {BODY} of child 0 {HTML} of document

-- 
WebKit Debian packaging