[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

mrobinson at webkit.org mrobinson at webkit.org
Sun Feb 20 23:36:04 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit dfc2220213113f247f9c5223eae28a1c0f29f369
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 22 00:16:34 2011 +0000

    2011-01-21  Martin Robinson  <mrobinson at igalia.com>
    
            Rebaseline tests that use menulists. Also unskip a non-existent test.
    
            * platform/gtk/Skipped: Remove non-existent test.
            * platform/gtk/editing/selection/select-box-expected.checksum:
            * platform/gtk/editing/selection/select-box-expected.png:
            * platform/gtk/editing/selection/select-box-expected.txt:
            * platform/gtk/transforms/2d/zoom-menulist-expected.checksum:
            * platform/gtk/transforms/2d/zoom-menulist-expected.png:
            * platform/gtk/transforms/2d/zoom-menulist-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8746659..7c2eb55 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-21  Martin Robinson  <mrobinson at igalia.com>
+
+        Rebaseline tests that use menulists. Also unskip a non-existent test.
+
+        * platform/gtk/Skipped: Remove non-existent test.
+        * platform/gtk/editing/selection/select-box-expected.checksum:
+        * platform/gtk/editing/selection/select-box-expected.png:
+        * platform/gtk/editing/selection/select-box-expected.txt:
+        * platform/gtk/transforms/2d/zoom-menulist-expected.checksum:
+        * platform/gtk/transforms/2d/zoom-menulist-expected.png:
+        * platform/gtk/transforms/2d/zoom-menulist-expected.txt:
+
 2011-01-21  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 4959ed0..5772642 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -4775,7 +4775,6 @@ transforms/3d
 compositing
 
 # Missing textInputController
-editing/inserting/insert-composition-whitespace.html
 editing/selection/mixed-editability-10.html
 editing/selection/5825350-1.html
 editing/selection/5825350-2.html
diff --git a/LayoutTests/platform/gtk/editing/selection/select-box-expected.checksum b/LayoutTests/platform/gtk/editing/selection/select-box-expected.checksum
index 9a0aa7b..46b2514 100644
--- a/LayoutTests/platform/gtk/editing/selection/select-box-expected.checksum
+++ b/LayoutTests/platform/gtk/editing/selection/select-box-expected.checksum
@@ -1 +1 @@
-3e983868f973636258f4d188f31182b6
\ No newline at end of file
+33bada328da8abbb534f7a2c9fa81f9d
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/editing/selection/select-box-expected.png b/LayoutTests/platform/gtk/editing/selection/select-box-expected.png
index f6c8aa2..17b4603 100644
Binary files a/LayoutTests/platform/gtk/editing/selection/select-box-expected.png and b/LayoutTests/platform/gtk/editing/selection/select-box-expected.png differ
diff --git a/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt b/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt
index 630730f..b26b98b 100644
--- a/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/select-box-expected.txt
@@ -60,14 +60,14 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 691x19
           text run at (0,0) width 292: "This tests caret movement across a select box. "
           text run at (292,0) width 399: "The caret should skip over the select box as if it were an image."
-      RenderBlock {DIV} at (0,35) size 784x29
-        RenderBlock {DIV} at (0,0) size 784x29
-          RenderText {#text} at (0,5) size 71x19
-            text run at (0,5) width 71: "select box: "
-          RenderMenuList {SELECT} at (73,2) size 32x25 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-            RenderBlock (anonymous) at (1,1) size 30x23
-              RenderText at (2,2) size 9x19
-                text run at (2,2) width 9: "1"
-          RenderText {#text} at (107,5) size 66x19
-            text run at (107,5) width 66: " the end ..."
+      RenderBlock {DIV} at (0,35) size 784x31
+        RenderBlock {DIV} at (0,0) size 784x31
+          RenderText {#text} at (0,6) size 71x19
+            text run at (0,6) width 71: "select box: "
+          RenderMenuList {SELECT} at (73,2) size 41x27 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 39x25
+              RenderText at (3,3) size 9x19
+                text run at (3,3) width 9: "1"
+          RenderText {#text} at (116,6) size 66x19
+            text run at (116,6) width 66: " the end ..."
 caret: position 1 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.checksum b/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.checksum
index 0fe6f81..a780eba 100644
--- a/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.checksum
+++ b/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.checksum
@@ -1 +1 @@
-7e096ea3d6ced617e3b371f2ffe97355
\ No newline at end of file
+1646d69d440e0cc17a7c7cde793d8de5
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.png b/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.png
index 46ebba2..d0ab07c 100644
Binary files a/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.png and b/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.png differ
diff --git a/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.txt b/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.txt
index 76a8056..cb62dfe 100644
--- a/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.txt
+++ b/LayoutTests/platform/gtk/transforms/2d/zoom-menulist-expected.txt
@@ -6,9 +6,9 @@ layer at (0,0) size 800x600
       RenderBlock {H1} at (0,0) size 784x37
         RenderText {#text} at (0,0) size 272x36
           text run at (0,0) width 272: "Zooming Menu List"
-      RenderBlock (anonymous) at (0,58) size 784x77
-        RenderMenuList {SELECT} at (6,6) size 153x65 [bgcolor=#FFFFFF] [border: (3px solid #000000)]
-          RenderBlock (anonymous) at (3,3) size 147x59
-            RenderText at (2,2) size 91x55
-              text run at (2,2) width 91: "One"
+      RenderBlock (anonymous) at (0,58) size 784x79
+        RenderMenuList {SELECT} at (6,6) size 194x67 [bgcolor=#FFFFFF] [border: (3px solid #000000)]
+          RenderBlock (anonymous) at (3,3) size 188x61
+            RenderText at (3,3) size 91x55
+              text run at (3,3) width 91: "One"
         RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list