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

philn at webkit.org philn at webkit.org
Sun Feb 20 23:58:09 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit a600e9fe47f1fde87b35352724f7ce839e5f334a
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 08:43:25 2011 +0000

    2011-01-27  Philippe Normand  <pnormand at igalia.com>
    
            Unreviewed, updated GTK baselines after r76726.
    
            * platform/gtk/fast/blockflow/Kusa-Makura-background-canvas-expected.txt:
            * platform/gtk/fast/blockflow/vertical-baseline-alignment-expected.txt:
            * platform/gtk/fast/lists/002-vertical-expected.txt:
            * platform/gtk/fast/lists/003-vertical-expected.txt:
            * platform/gtk/fast/overflow/overflow-rtl-vertical-expected.txt:
            * platform/gtk/fast/table/028-vertical-expected.txt:
            * platform/gtk/fast/table/border-collapsing/003-vertical-expected.txt:
            * platform/gtk/fast/table/height-percent-test-vertical-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b7af4ca..b94114e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-27  Philippe Normand  <pnormand at igalia.com>
+
+        Unreviewed, updated GTK baselines after r76726.
+
+        * platform/gtk/fast/blockflow/Kusa-Makura-background-canvas-expected.txt:
+        * platform/gtk/fast/blockflow/vertical-baseline-alignment-expected.txt:
+        * platform/gtk/fast/lists/002-vertical-expected.txt:
+        * platform/gtk/fast/lists/003-vertical-expected.txt:
+        * platform/gtk/fast/overflow/overflow-rtl-vertical-expected.txt:
+        * platform/gtk/fast/table/028-vertical-expected.txt:
+        * platform/gtk/fast/table/border-collapsing/003-vertical-expected.txt:
+        * platform/gtk/fast/table/height-percent-test-vertical-expected.txt:
+
 2011-01-27  Yuzo Fujishima  <yuzo at google.com>
 
         Unreviewed Chromium test expectation change.
diff --git a/LayoutTests/platform/gtk/fast/blockflow/Kusa-Makura-background-canvas-expected.txt b/LayoutTests/platform/gtk/fast/blockflow/Kusa-Makura-background-canvas-expected.txt
index bda3967..c42976f 100644
--- a/LayoutTests/platform/gtk/fast/blockflow/Kusa-Makura-background-canvas-expected.txt
+++ b/LayoutTests/platform/gtk/fast/blockflow/Kusa-Makura-background-canvas-expected.txt
@@ -1,15 +1,15 @@
-layer at (0,0) size 3377x581
+layer at (0,0) size 3417x581
   RenderView at (0,0) size 800x581
-layer at (-2577,0) size 3377x581 backgroundClip at (0,0) size 3377x581 clip at (0,0) size 3377x581 outlineClip at (0,0) size 3377x581
-  RenderBlock {HTML} at (0,0) size 3377x581
-    RenderBody {BODY} at (58,46) size 3261x489
-      RenderBlock {H1} at (0,21) size 48x447
+layer at (-2617,0) size 3417x581 backgroundClip at (0,0) size 3417x581 clip at (0,0) size 3417x581 outlineClip at (0,0) size 3417x581
+  RenderBlock {HTML} at (0,0) size 3417x581
+    RenderBody {BODY} at (58,46) size 3301x489
+      RenderBlock {H1} at (0,0) size 48x489
         RenderText {#text} at (6,0) size 36x38
           text run at (6,0) width 38: "\x{8349}\x{6795}"
-      RenderBlock {H2} at (48,19) size 36x451
+      RenderBlock {H2} at (69,0) size 36x489
         RenderText {#text} at (4,0) size 28x56
           text run at (4,0) width 56: "\x{590F}\x{76EE}\x{6F31}\x{77F3}"
-      RenderBlock {DIV} at (84,0) size 3177x489
+      RenderBlock {DIV} at (124,0) size 3177x489
         RenderBlock (anonymous) at (0,0) size 1766x489
           RenderBR {BR} at (0,0) size 19x0
           RenderBR {BR} at (19,0) size 19x0
diff --git a/LayoutTests/platform/gtk/fast/blockflow/vertical-baseline-alignment-expected.txt b/LayoutTests/platform/gtk/fast/blockflow/vertical-baseline-alignment-expected.txt
index e68deb6..ee84db5 100644
--- a/LayoutTests/platform/gtk/fast/blockflow/vertical-baseline-alignment-expected.txt
+++ b/LayoutTests/platform/gtk/fast/blockflow/vertical-baseline-alignment-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (592,0) size 208x600
-  RenderBlock {HTML} at (0,0) size 208x600
-    RenderBody {BODY} at (8,8) size 192x584
-      RenderBlock {P} at (0,24) size 110x536
+layer at (536,0) size 264x600
+  RenderBlock {HTML} at (0,0) size 264x600
+    RenderBody {BODY} at (24,8) size 216x584
+      RenderBlock {P} at (0,0) size 110x584
         RenderInline {SPAN} at (0,0) size 28x62
           RenderText {#text} at (21,0) size 28x62
             text run at (21,0) width 62: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} "
@@ -17,7 +17,7 @@ layer at (592,0) size 208x600
             RenderText {#text} at (87,297) size 14x164
               text run at (87,297) width 164: "SHOULD NOT BE CENTERED."
           RenderText {#text} at (0,0) size 0x0
-      RenderBlock {P} at (110,24) size 82x536
+      RenderBlock {P} at (134,0) size 82x584
         RenderInline {SPAN} at (0,0) size 28x433
           RenderText {#text} at (48,0) size 28x62
             text run at (48,0) width 62: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} "
diff --git a/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt
index eaaa287..02000f6 100644
--- a/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
+    RenderBody {BODY} at (8,8) size 776x584
       RenderBlock {DIV} at (0,0) size 38x584
         RenderBlock {UL} at (0,0) size 38x584
           RenderListItem {LI} at (0,40) size 19x544
@@ -15,7 +15,8 @@ layer at (0,0) size 800x600
             RenderInline {A} at (0,0) size 19x57 [color=#0000EE]
               RenderText {#text} at (0,487) size 19x57
                 text run at (0,487) width 57: "Archives"
-      RenderBlock {P} at (54,16) size 38x552
-        RenderText {#text} at (0,0) size 38x533
-          text run at (0,0) width 533: "This test case illustrates the correct positioning of list item bullets according to CSS3."
-          text run at (19,0) width 509: "The bullets should be on the far left, with the text of the list items on the far right."
+      RenderBlock {P} at (54,0) size 38x584
+        RenderText {#text} at (0,0) size 38x562
+          text run at (0,0) width 537: "This test case illustrates the correct positioning of list item bullets according to CSS3. "
+          text run at (0,537) width 25: "The"
+          text run at (19,0) width 480: "bullets should be on the far left, with the text of the list items on the far right."
diff --git a/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt
index 7199ca7..31f83d8 100644
--- a/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt
@@ -3,42 +3,44 @@ layer at (0,0) size 800x600
 layer at (0,0) size 349x600
   RenderBlock {HTML} at (0,0) size 349x600
     RenderBody {BODY} at (16,8) size 317x584
-      RenderBlock (floating) {DIV} at (0,0) size 431x350
-        RenderBlock {P} at (0,16) size 76x318
-          RenderText {#text} at (0,0) size 38x297
-            text run at (0,0) width 297: "This test case illustrates incorrect positioning of"
-            text run at (19,0) width 114: "list items within a "
+      RenderBlock (floating) {DIV} at (0,0) size 463x350
+        RenderBlock {P} at (16,0) size 76x350
+          RenderText {#text} at (0,0) size 38x319
+            text run at (0,0) width 319: "This test case illustrates incorrect positioning of list"
+            text run at (19,0) width 92: "items within a "
           RenderInline {CODE} at (0,0) size 15x136
-            RenderText {#text} at (19,114) size 15x136
-              text run at (19,114) width 136: "text-align: right"
-          RenderText {#text} at (19,250) size 19x67
-            text run at (19,250) width 67: " div after a"
-          RenderInline {CODE} at (0,0) size 15x88
-            RenderText {#text} at (38,0) size 15x88
-              text run at (38,0) width 88: "float: left"
-          RenderText {#text} at (38,88) size 19x32
-            text run at (38,88) width 32: " div. "
+            RenderText {#text} at (19,92) size 15x136
+              text run at (19,92) width 136: "text-align: right"
+          RenderText {#text} at (19,228) size 19x71
+            text run at (19,228) width 71: " div after a "
+          RenderInline {CODE} at (0,0) size 34x347
+            RenderText {#text} at (19,299) size 34x347
+              text run at (19,299) width 48: "float:"
+              text run at (38,0) width 32: "left"
+          RenderText {#text} at (38,32) size 19x32
+            text run at (38,32) width 32: " div. "
           RenderInline {A} at (0,0) size 19x192 [color=#0000EE]
-            RenderText {#text} at (38,120) size 19x192
-              text run at (38,120) width 192: "Screenshot of correct behavior"
-          RenderText {#text} at (38,312) size 19x4
-            text run at (38,312) width 4: ";"
-          RenderInline {A} at (0,0) size 19x124 [color=#0000EE]
-            RenderText {#text} at (57,0) size 19x124
-              text run at (57,0) width 124: "screenshot of Safari"
-          RenderText {#text} at (57,124) size 19x4
-            text run at (57,124) width 4: "."
-        RenderBlock {P} at (76,16) size 57x318
+            RenderText {#text} at (38,64) size 19x192
+              text run at (38,64) width 192: "Screenshot of correct behavior"
+          RenderText {#text} at (38,256) size 19x8
+            text run at (38,256) width 8: "; "
+          RenderInline {A} at (0,0) size 38x347 [color=#0000EE]
+            RenderText {#text} at (38,264) size 38x347
+              text run at (38,264) width 83: "screenshot of"
+              text run at (57,0) width 37: "Safari"
+          RenderText {#text} at (57,37) size 19x4
+            text run at (57,37) width 4: "."
+        RenderBlock {P} at (108,0) size 57x350
           RenderText {#text} at (0,0) size 38x304
             text run at (0,0) width 304: "This bug only occurs on pages with a standards-"
             text run at (19,0) width 150: "compliant DOCTYPE. "
-          RenderInline {A} at (0,0) size 38x267 [color=#0000EE]
-            RenderText {#text} at (19,150) size 38x267
-              text run at (19,150) width 117: "View this test case"
-              text run at (38,0) width 139: "without a DOCTYPE"
-          RenderText {#text} at (38,139) size 19x4
-            text run at (38,139) width 4: "."
-        RenderBlock {OL} at (149,0) size 266x350
+          RenderInline {A} at (0,0) size 38x330 [color=#0000EE]
+            RenderText {#text} at (19,150) size 38x330
+              text run at (19,150) width 180: "View this test case without a"
+              text run at (38,0) width 76: "DOCTYPE"
+          RenderText {#text} at (38,76) size 19x4
+            text run at (38,76) width 4: "."
+        RenderBlock {OL} at (181,0) size 266x350
           RenderListItem {LI} at (0,40) size 38x310
             RenderListMarker at (0,-21) size 19x16: "1"
             RenderText {#text} at (0,0) size 38x302
diff --git a/LayoutTests/platform/gtk/fast/overflow/overflow-rtl-vertical-expected.txt b/LayoutTests/platform/gtk/fast/overflow/overflow-rtl-vertical-expected.txt
index da46d3b..25b4250 100644
--- a/LayoutTests/platform/gtk/fast/overflow/overflow-rtl-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/overflow/overflow-rtl-vertical-expected.txt
@@ -1,21 +1,21 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 328x600
-  RenderBlock {HTML} at (0,0) size 328x600
-    RenderBody {BODY} at (8,8) size 312x584
-      RenderBlock {P} at (0,16) size 38x552
+layer at (0,0) size 352x600
+  RenderBlock {HTML} at (0,0) size 352x600
+    RenderBody {BODY} at (16,8) size 328x584
+      RenderBlock {P} at (0,0) size 38x584
         RenderText {#text} at (0,0) size 19x135
           text run at (0,0) width 135: "This is a test case for "
-        RenderInline {I} at (0,0) size 38x529
-          RenderText {#text} at (0,135) size 38x529
-            text run at (0,135) width 394: "http://bugzilla.opendarwin.org/show_bug.cgi?id=5826 Blocks"
-            text run at (19,0) width 445: "with direction:rtl and overflow:auto or scroll have incorrect scrollbars"
-        RenderText {#text} at (19,445) size 19x4
-          text run at (19,445) width 4: "."
-      RenderBlock (anonymous) at (38,0) size 19x584
+        RenderInline {I} at (0,0) size 38x560
+          RenderText {#text} at (0,135) size 38x560
+            text run at (0,135) width 425: "http://bugzilla.opendarwin.org/show_bug.cgi?id=5826 Blocks with"
+            text run at (19,0) width 414: "direction:rtl and overflow:auto or scroll have incorrect scrollbars"
+        RenderText {#text} at (19,414) size 19x4
+          text run at (19,414) width 4: "."
+      RenderBlock (anonymous) at (54,0) size 19x584
         RenderText {#text} at (0,0) size 19x457
           text run at (0,0) width 457: "The right column should be a mirror-image of the left column in terms of"
-      RenderBlock {UL} at (73,0) size 57x584
+      RenderBlock {UL} at (89,0) size 57x584
         RenderListItem {LI} at (0,40) size 19x544
           RenderListMarker at (0,-18) size 19x7: bullet
           RenderText {#text} at (0,0) size 19x164
@@ -28,35 +28,35 @@ layer at (0,0) size 328x600
           RenderListMarker at (0,-18) size 19x7: bullet
           RenderText {#text} at (0,0) size 19x331
             text run at (0,0) width 331: "which letters are visible initially and when you scroll"
-      RenderTable {TABLE} at (146,0) size 166x256
+      RenderTable {TABLE} at (162,0) size 166x256
         RenderTableSection {TBODY} at (0,0) size 166x256
           RenderTableRow {TR} at (0,2) size 162x256
             RenderTableCell {TD} at (2,2) size 162x125 [r=0 c=0 rs=1 cs=1]
             RenderTableCell {TD} at (2,129) size 162x125 [r=0 c=1 rs=1 cs=1]
-layer at (161,15) size 48x115 clip at (161,25) size 32x100 scrollHeight 188
+layer at (185,15) size 48x115 clip at (185,25) size 32x100 scrollHeight 188
   RenderBlock {DIV} at (5,5) size 48x115 [bgcolor=#FFFF00] [border: (10px solid #FF0000) none (5px solid #008000) none]
     RenderText {#text} at (0,10) size 19x188
       text run at (0,10) width 188: "abcdefghijklmnopqrstuvwxyz"
-layer at (213,15) size 48x115 clip at (213,25) size 48x100
+layer at (237,15) size 48x115 clip at (237,25) size 48x100
   RenderBlock {DIV} at (57,5) size 48x115 [bgcolor=#FFFF00] [border: (10px solid #FF0000) none (5px solid #008000) none]
     RenderBlock {DIV} at (0,10) size 19x100 [bgcolor=#D3D3D3]
       RenderText {#text} at (0,-88) size 19x188
         text run at (0,-88) width 188: "abcdefghijklmnopqrstuvwxyz"
-layer at (265,15) size 48x115 clip at (265,25) size 32x100 scrollHeight 188
+layer at (289,15) size 48x115 clip at (289,25) size 32x100 scrollHeight 188
   RenderBlock {DIV} at (109,5) size 48x115 [bgcolor=#FFFF00] [border: (10px solid #FF0000) none (5px solid #008000) none]
     RenderBlock {DIV} at (0,10) size 19x100 [bgcolor=#D3D3D3]
       RenderText {#text} at (0,0) size 19x188
         text run at (0,0) width 188: "abcdefghijklmnopqrstuvwxyz"
-layer at (161,142) size 48x115 clip at (161,147) size 32x100 scrollY 88 scrollHeight 188
+layer at (185,142) size 48x115 clip at (185,147) size 32x100 scrollY 88 scrollHeight 188
   RenderBlock {DIV} at (5,5) size 48x115 [bgcolor=#FFFF00] [border: (5px solid #008000) none (10px solid #FF0000) none]
     RenderText {#text} at (0,-83) size 19x188
       text run at (0,-83) width 188: "zyxwvutsrqponmlkjihgfedcba"
-layer at (213,142) size 48x115 clip at (213,147) size 48x100
+layer at (237,142) size 48x115 clip at (237,147) size 48x100
   RenderBlock {DIV} at (57,5) size 48x115 [bgcolor=#FFFF00] [border: (5px solid #008000) none (10px solid #FF0000) none]
     RenderBlock {DIV} at (0,5) size 19x100 [bgcolor=#D3D3D3]
       RenderText {#text} at (0,0) size 19x188
         text run at (0,0) width 188: "zyxwvutsrqponmlkjihgfedcba"
-layer at (265,142) size 48x115 clip at (265,147) size 32x100 scrollY 88 scrollHeight 188
+layer at (289,142) size 48x115 clip at (289,147) size 32x100 scrollY 88 scrollHeight 188
   RenderBlock {DIV} at (109,5) size 48x115 [bgcolor=#FFFF00] [border: (5px solid #008000) none (10px solid #FF0000) none]
     RenderBlock {DIV} at (0,5) size 19x100 [bgcolor=#D3D3D3]
       RenderText {#text} at (0,-88) size 19x188
diff --git a/LayoutTests/platform/gtk/fast/table/028-vertical-expected.txt b/LayoutTests/platform/gtk/fast/table/028-vertical-expected.txt
index 68466c4..220af69 100644
--- a/LayoutTests/platform/gtk/fast/table/028-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/table/028-vertical-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 781x635
       RenderBlock (anonymous) at (0,0) size 765x19
         RenderText {#text} at (0,0) size 277x19
           text run at (0,0) width 277: "These two tables should be the same height."
-      RenderBlock {DIV} at (0,19) size 64x600
+      RenderBlock {DIV} at (0,19) size 80x600
         RenderTable {TABLE} at (0,0) size 22x320
           RenderTableSection {TBODY} at (0,0) size 22x320
             RenderTableRow {TR} at (0,0) size 22x320
@@ -18,8 +18,8 @@ layer at (0,0) size 781x635
                   text run at (1,1) width 8: "2"
               RenderTableCell {TD} at (0,314) size 22x6 [border: (1px solid #008000)] [r=0 c=2 rs=1 cs=1]
                 RenderImage {IMG} at (1,1) size 20x4 [bgcolor=#FFA500]
-        RenderBlock {P} at (22,16) size 0x568
-        RenderTable {TABLE} at (22,0) size 42x320
+        RenderBlock {P} at (38,0) size 0x600
+        RenderTable {TABLE} at (38,0) size 42x320
           RenderTableSection {TBODY} at (0,0) size 42x320
             RenderTableRow {TR} at (0,0) size 21x320
               RenderTableCell {TD} at (0,0) size 21x64 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/gtk/fast/table/border-collapsing/003-vertical-expected.txt b/LayoutTests/platform/gtk/fast/table/border-collapsing/003-vertical-expected.txt
index 7bedfad..6761e38 100644
--- a/LayoutTests/platform/gtk/fast/table/border-collapsing/003-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/table/border-collapsing/003-vertical-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (401,0) size 399x600
-  RenderBlock {HTML} at (0,0) size 399x600
-    RenderBody {BODY} at (8,8) size 359x584
-      RenderBlock {P} at (0,16) size 57x552
+layer at (393,0) size 407x600
+  RenderBlock {HTML} at (0,0) size 407x600
+    RenderBody {BODY} at (16,8) size 359x584
+      RenderBlock {P} at (0,0) size 57x584
         RenderText {#text} at (0,0) size 19x201
           text run at (0,0) width 201: "The black border below should "
         RenderInline {I} at (0,0) size 19x20
@@ -16,10 +16,10 @@ layer at (401,0) size 399x600
         RenderInline {A} at (0,0) size 19x22 [color=#0000EE]
           RenderText {#text} at (19,288) size 19x22
             text run at (19,288) width 22: "this"
-        RenderText {#text} at (19,310) size 38x516
+        RenderText {#text} at (19,310) size 38x581
           text run at (19,310) width 4: " "
-          text run at (19,314) width 202: "bug fix changed our behavior to"
-          text run at (38,0) width 97: "match the spec."
+          text run at (19,314) width 267: "bug fix changed our behavior to match the"
+          text run at (38,0) width 32: "spec."
       RenderBlock {DIV} at (89,32) size 270x520 [border: (1px solid #0000FF)]
         RenderTable {DIV} at (1,1) size 220x115 [border:]
           RenderTableSection (anonymous) at (10,1) size 200x104
diff --git a/LayoutTests/platform/gtk/fast/table/height-percent-test-vertical-expected.txt b/LayoutTests/platform/gtk/fast/table/height-percent-test-vertical-expected.txt
index b6ab272..a542474 100644
--- a/LayoutTests/platform/gtk/fast/table/height-percent-test-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/table/height-percent-test-vertical-expected.txt
@@ -8,7 +8,7 @@ layer at (0,0) size 781x597
           RenderBlock (floating) {DIV} at (1,1) size 24x100
             RenderBlock {DIV} at (0,0) size 24x100 [bgcolor=#008000]
         RenderBlock {DIV} at (58,16) size 26x549 [border: (1px solid #000000)]
-          RenderBlock (floating) {DIV} at (1,1) size 24x547
+          RenderBlock (floating) {DIV} at (1,1) size 24x96
             RenderTable {TABLE} at (0,0) size 24x96 [bgcolor=#FF0000]
               RenderTableSection {TBODY} at (0,0) size 24x96
                 RenderTableRow {TR} at (0,0) size 24x96

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list