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

kov at webkit.org kov at webkit.org
Thu Oct 29 20:45:36 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 2b636783018c2754a7e7a56b949f807d5c7de22a
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 19:28:06 2009 +0000

    2009-10-15  Zan Dobersek  <zandobersek at gmail.com>
    
            Reviewed by Gustavo Noronha.
    
            Rebaseline tests after changes made in r49405.
    
            * platform/gtk/editing/execCommand/4916541-expected.txt: Rebaseline.
            * platform/gtk/editing/execCommand/5138441-expected.txt: Ditto.
            * platform/gtk/editing/execCommand/5481523-expected.txt: Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f086c38..63a0ba9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-15  Zan Dobersek  <zandobersek at gmail.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Rebaseline tests after changes made in r49405.
+
+        * platform/gtk/editing/execCommand/4916541-expected.txt: Rebaseline.
+        * platform/gtk/editing/execCommand/5138441-expected.txt: Ditto.
+        * platform/gtk/editing/execCommand/5481523-expected.txt: Ditto.
+
 2009-10-15  Xan Lopez  <xlopez at igalia.com>
 
         Remove obsolete test from Skipped list.
diff --git a/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt
index 24f0b23..9faf579 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/4916541-expected.txt
@@ -10,13 +10,11 @@ layer at (0,0) size 800x600
           text run at (0,20) width 320: "'foo' and 'bar' before and after the indent operation."
       RenderBlock {DIV} at (0,56) size 784x40
         RenderBlock {BLOCKQUOTE} at (40,0) size 744x40
-          RenderInline {SPAN} at (0,0) size 21x20
-            RenderText {#text} at (0,0) size 21x20
-              text run at (0,0) width 21: "foo"
+          RenderText {#text} at (0,0) size 21x20
+            text run at (0,0) width 21: "foo"
           RenderBR {BR} at (21,15) size 0x0
-          RenderInline {SPAN} at (0,0) size 20x20
-            RenderText {#text} at (0,20) size 20x20
-              text run at (0,20) width 20: "bar"
+          RenderText {#text} at (0,20) size 20x20
+            text run at (0,20) width 20: "bar"
         RenderBlock (anonymous) at (0,40) size 784x0
-selection start: position 1 of child 0 {#text} of child 0 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 2 of child 0 {#text} of child 2 {SPAN} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 2 of child 2 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt
index b9445f2..e9e8d3d 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/5138441-expected.txt
@@ -10,12 +10,10 @@ layer at (0,0) size 800x600
           text run at (0,20) width 776: "FormatBlock to implement a \"Quote Text\" feature, and style rules for blockquotes appeared on the blockquotes that we use"
           text run at (0,40) width 149: "to implement indenting."
       RenderBlock {DIV} at (0,76) size 784x66
-        RenderBlock {DIV} at (0,0) size 784x20
-          RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
-            RenderText {#text} at (0,0) size 230x20
-              text run at (0,0) width 230: "This should be indented, not quoted."
-          RenderBlock (anonymous) at (0,20) size 784x0
+        RenderBlock {BLOCKQUOTE} at (40,0) size 744x20
+          RenderText {#text} at (0,0) size 230x20
+            text run at (0,0) width 230: "This should be indented, not quoted."
         RenderBlock {BLOCKQUOTE} at (8,28) size 768x38 [border: (1px dashed #AAAAAA)]
           RenderText {#text} at (9,9) size 175x20
             text run at (9,9) width 175: "This text should be Quoted."
-caret: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+caret: position 0 of child 0 {#text} of child 1 {BLOCKQUOTE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt b/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt
index 4cda317..c2e9992 100644
--- a/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt
+++ b/LayoutTests/platform/gtk/editing/execCommand/5481523-expected.txt
@@ -27,5 +27,7 @@ layer at (0,0) size 800x600
                   RenderTableCell {TD} at (45,28) size 34x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
                     RenderText {#text} at (2,2) size 30x20
                       text run at (2,2) width 30: "Four"
+            RenderBlock (anonymous) at (0,56) size 704x0
+        RenderBlock (anonymous) at (0,56) size 784x0
 selection start: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end:   position 2 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 1 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list