[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 16:21:58 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 074e06d18ee4e541df2f7b236f56048cdf3200c9
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 22 18:55:37 2010 +0000

    2010-11-22  Andreas Kling  <kling at webkit.org>
    
            Unreviewed, rebaseline GTK+ after r72527.
    
            * platform/gtk/css1/box_properties/margin_right-expected.txt:
            * platform/gtk/css1/box_properties/padding_right-expected.txt:
            * platform/gtk/fast/lists/001-vertical-expected.txt:
            * platform/gtk/fast/lists/002-vertical-expected.txt:
            * platform/gtk/fast/lists/003-vertical-expected.txt:
            * platform/gtk/fast/lists/007-vertical-expected.txt:
            * platform/gtk/fast/lists/008-vertical-expected.txt:
            * platform/gtk/fast/lists/outSideListMarkers-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d29b968..135b23c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-22  Andreas Kling  <kling at webkit.org>
+
+        Unreviewed, rebaseline GTK+ after r72527.
+
+        * platform/gtk/css1/box_properties/margin_right-expected.txt:
+        * platform/gtk/css1/box_properties/padding_right-expected.txt:
+        * platform/gtk/fast/lists/001-vertical-expected.txt:
+        * platform/gtk/fast/lists/002-vertical-expected.txt:
+        * platform/gtk/fast/lists/003-vertical-expected.txt:
+        * platform/gtk/fast/lists/007-vertical-expected.txt:
+        * platform/gtk/fast/lists/008-vertical-expected.txt:
+        * platform/gtk/fast/lists/outSideListMarkers-expected.txt: Added.
+
 2010-11-22  Adam Roben  <aroben at apple.com>
 
         Add Windows-specific results for editing/selection/extend-selection-home-end.html
diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.txt
index d6268ba..af19f74 100644
--- a/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.txt
+++ b/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.txt
@@ -43,14 +43,14 @@ layer at (0,0) size 783x1038
           RenderText {#text} at (0,0) size 700x19
             text run at (0,0) width 700: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray."
         RenderListItem {LI} at (40,19) size 675x57 [bgcolor=#FFFFFF]
-          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderListMarker at (1,0) size 7x19: bullet
           RenderText {#text} at (19,0) size 656x57
             text run at (19,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-"
             text run at (46,19) width 60: "checked. "
             text run at (106,19) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's"
             text run at (147,38) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white."
         RenderListItem {LI} at (40,76) size 700x19
-          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderListMarker at (503,0) size 7x19: bullet
           RenderText {#text} at (521,0) size 179x19
             text run at (521,0) width 179: "This is an unclassed list item"
       RenderBlock {P} at (0,461) size 765x19 [bgcolor=#C0C0C0]
@@ -93,19 +93,19 @@ layer at (0,0) size 783x1038
                   text run at (382,19) width 176: "width of the parent element."
               RenderBlock {UL} at (4,198) size 718x114 [bgcolor=#808080]
                 RenderListItem {LI} at (40,0) size 678x38
-                  RenderListMarker at (-18,0) size 7x19: bullet
+                  RenderListMarker at (-4,0) size 7x19: bullet
                   RenderText {#text} at (14,0) size 664x38
                     text run at (14,0) width 664: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to"
                     text run at (646,19) width 32: "gray."
                 RenderListItem {LI} at (40,38) size 653x57 [bgcolor=#FFFFFF]
-                  RenderListMarker at (-18,0) size 7x19: bullet
+                  RenderListMarker at (31,0) size 7x19: bullet
                   RenderText {#text} at (49,0) size 646x57
                     text run at (49,0) width 604: "Another list item might not be such a bad idea, either, considering that such things do need to be"
                     text run at (7,19) width 108: "double-checked. "
                     text run at (115,19) width 538: "This list item has its right margin also set to 25 pixels, which should combine with the"
                     text run at (94,38) width 559: "list's margin to make 50 pixels of margin, and its background-color has been set to white."
                 RenderListItem {LI} at (40,95) size 678x19
-                  RenderListMarker at (-18,0) size 7x19: bullet
+                  RenderListMarker at (481,0) size 7x19: bullet
                   RenderText {#text} at (499,0) size 179x19
                     text run at (499,0) width 179: "This is an unclassed list item"
               RenderBlock {P} at (4,328) size 743x19 [bgcolor=#C0C0C0]
diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.txt
index 2a8b97c..19fc41e 100644
--- a/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.txt
+++ b/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.txt
@@ -54,12 +54,12 @@ layer at (0,0) size 781x1196
           text run at (77,38) width 497: "The text has been right-aligned in order to make the right padding easier to see."
       RenderBlock {UL} at (0,483) size 765x76 [bgcolor=#808080]
         RenderListItem {LI} at (40,0) size 700x38
-          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderListMarker at (-15,0) size 7x19: bullet
           RenderText {#text} at (3,0) size 697x38
             text run at (3,0) width 697: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to"
             text run at (675,19) width 25: "test."
         RenderListItem {LI} at (40,38) size 700x38 [bgcolor=#FFFFFF]
-          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderListMarker at (-3,0) size 7x19: bullet
           RenderText {#text} at (15,0) size 660x38
             text run at (15,0) width 660: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL"
             text run at (622,19) width 53: "element."
@@ -116,12 +116,12 @@ layer at (0,0) size 781x1196
                   text run at (478,57) width 80: "easier to see."
               RenderBlock {UL} at (4,350) size 743x76 [bgcolor=#808080]
                 RenderListItem {LI} at (40,0) size 678x38
-                  RenderListMarker at (-18,0) size 7x19: bullet
+                  RenderListMarker at (16,0) size 7x19: bullet
                   RenderText {#text} at (34,0) size 644x38
                     text run at (34,0) width 644: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in"
                     text run at (600,19) width 78: "order to test."
                 RenderListItem {LI} at (40,38) size 678x38 [bgcolor=#FFFFFF]
-                  RenderListMarker at (-18,0) size 7x19: bullet
+                  RenderListMarker at (1,0) size 7x19: bullet
                   RenderText {#text} at (19,0) size 634x38
                     text run at (19,0) width 634: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the"
                     text run at (574,19) width 79: "UL element."
diff --git a/LayoutTests/platform/gtk/fast/lists/001-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/001-vertical-expected.txt
index 209fec7..02e48ab 100644
--- a/LayoutTests/platform/gtk/fast/lists/001-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/001-vertical-expected.txt
@@ -1,21 +1,21 @@
-layer at (0,0) size 781x610
-  RenderView at (0,0) size 781x600
-layer at (0,0) size 781x610
-  RenderBlock {HTML} at (0,0) size 781x600
-    RenderBody {BODY} at (8,8) size 757x584
+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 776x584
       RenderBlock {DIV} at (0,0) size 107x584 [border: (3px solid #FFA500)]
         RenderBlock (floating) {DIV} at (11,11) size 122x122 [bgcolor=#FFA500] [border: (3px solid #FFA500)]
         RenderListItem {DIV} at (11,11) size 85x562 [border: (3px solid #FFA500)]
           RenderListItem {DIV} at (11,11) size 63x540 [border: (3px solid #FFA500)]
             RenderListItem {DIV} at (11,11) size 41x518 [border: (3px solid #FFA500)]
-              RenderListMarker at (11,103) size 19x7: bullet
-              RenderListMarker at (11,103) size 19x7: bullet
-              RenderListMarker at (11,103) size 19x7: bullet
+              RenderListMarker at (11,73) size 19x7: bullet
+              RenderListMarker at (11,92) size 19x7: bullet
+              RenderListMarker at (11,111) size 19x7: bullet
               RenderText {#text} at (11,132) size 19x86
                 text run at (11,132) width 86: "List item text."
       RenderBlock {UL} at (123,0) size 142x584
         RenderListItem {LI} at (0,40) size 142x544 [border: (2px solid #FF0000)]
-          RenderListMarker at (52,555) size 19x7: bullet
+          RenderListMarker at (52,505) size 19x7: bullet
           RenderText {#text} at (52,75) size 38x417
             text run at (52,75) width 417: "Foo fofodfosjlkdf dslkdjlk asdlksjald djklsd klasjdkas sdajd lsadjkl"
             text run at (71,422) width 70: "asjdlksajdk"
diff --git a/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt
index eaaa287..1b8f2a1 100644
--- a/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/002-vertical-expected.txt
@@ -6,12 +6,12 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,0) size 38x584
         RenderBlock {UL} at (0,0) size 38x584
           RenderListItem {LI} at (0,40) size 19x544
-            RenderListMarker at (0,-18) size 19x7: bullet
+            RenderListMarker at (0,487) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x39 [color=#0000EE]
               RenderText {#text} at (0,505) size 19x39
                 text run at (0,505) width 39: "Home"
           RenderListItem {LI} at (19,40) size 19x544
-            RenderListMarker at (0,-18) size 19x7: bullet
+            RenderListMarker at (0,469) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x57 [color=#0000EE]
               RenderText {#text} at (0,487) size 19x57
                 text run at (0,487) width 57: "Archives"
diff --git a/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt
index 1e6e7c2..c00d019 100644
--- a/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/003-vertical-expected.txt
@@ -122,42 +122,42 @@ layer at (0,0) size 447x600
       RenderBlock {DIV} at (0,0) size 317x584
         RenderBlock {UL} at (0,0) size 152x584
           RenderListItem {LI} at (0,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,486) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x40 [color=#0000EE]
               RenderText {#text} at (0,504) size 19x40
                 text run at (0,504) width 40: "About"
           RenderListItem {LI} at (19,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,471) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x55 [color=#0000EE]
               RenderText {#text} at (0,489) size 19x55
                 text run at (0,489) width 55: "Site map"
           RenderListItem {LI} at (38,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,469) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x57 [color=#0000EE]
               RenderText {#text} at (0,487) size 19x57
                 text run at (0,487) width 57: "Archives"
           RenderListItem {LI} at (57,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,476) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x50 [color=#0000EE]
               RenderText {#text} at (0,494) size 19x50
                 text run at (0,494) width 50: "Projects"
           RenderListItem {LI} at (76,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,483) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x43 [color=#0000EE]
               RenderText {#text} at (0,501) size 19x43
                 text run at (0,501) width 43: "Photos"
           RenderListItem {LI} at (95,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,471) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x55 [color=#0000EE]
               RenderText {#text} at (0,489) size 19x55
                 text run at (0,489) width 55: "Statistics"
           RenderListItem {LI} at (114,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,382) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x144 [color=#0000EE]
               RenderText {#text} at (0,400) size 19x144
                 text run at (0,400) width 144: "Accessibility statement"
           RenderListItem {LI} at (133,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,414) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x29 [color=#0000EE]
               RenderText {#text} at (0,432) size 19x29
                 text run at (0,432) width 29: "RSS"
@@ -170,38 +170,38 @@ layer at (0,0) size 447x600
               text run at (0,539) width 5: ")"
         RenderBlock {UL} at (168,0) size 19x584
           RenderListItem {LI} at (0,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,438) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x88 [color=#0000EE]
               RenderText {#text} at (0,456) size 19x88
                 text run at (0,456) width 88: "What is RSS?"
         RenderBlock {UL} at (203,0) size 114x584
           RenderListItem {LI} at (0,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,434) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x92 [color=#0000EE]
               RenderText {#text} at (0,452) size 19x92
                 text run at (0,452) width 92: "RSS Validator"
           RenderListItem {LI} at (19,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,381) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x145 [color=#0000EE]
               RenderText {#text} at (0,399) size 19x145
                 text run at (0,399) width 145: "Dive Into Accessibility"
           RenderListItem {LI} at (38,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,425) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x101 [color=#0000EE]
               RenderText {#text} at (0,443) size 19x101
                 text run at (0,443) width 101: "Dive Into OS X"
           RenderListItem {LI} at (57,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,428) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x98 [color=#0000EE]
               RenderText {#text} at (0,446) size 19x98
                 text run at (0,446) width 98: "Dive Into J2EE"
           RenderListItem {LI} at (76,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,417) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x109 [color=#0000EE]
               RenderText {#text} at (0,435) size 19x109
                 text run at (0,435) width 109: "Dive Into Python"
           RenderListItem {LI} at (95,40) size 19x544
-            RenderListMarker at (0,292) size 19x7: bullet
+            RenderListMarker at (0,481) size 19x7: bullet
             RenderInline {A} at (0,0) size 19x45 [color=#0000EE]
               RenderText {#text} at (0,499) size 19x45
                 text run at (0,499) width 45: "r\x{E9}sum\x{E9}"
diff --git a/LayoutTests/platform/gtk/fast/lists/007-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/007-vertical-expected.txt
index af6f95b..e9d5168 100644
--- a/LayoutTests/platform/gtk/fast/lists/007-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/007-vertical-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x600
             text run at (0,0) width 520: "The top padding on this unordered list has been set to 25 pixels, which will require"
             text run at (19,0) width 191: "some extra test in order to test."
         RenderListItem {LI} at (38,50) size 76x534 [bgcolor=#FFFFFF] [border: (25px solid #008000) none]
-          RenderListMarker at (0,-18) size 19x7: bullet
+          RenderListMarker at (0,7) size 19x7: bullet
           RenderText {#text} at (0,50) size 76x473
             text run at (0,50) width 473: "Another list item might not be such a bad idea, either, considering that such"
             text run at (19,50) width 239: "things do need to be double-checked. "
diff --git a/LayoutTests/platform/gtk/fast/lists/008-vertical-expected.txt b/LayoutTests/platform/gtk/fast/lists/008-vertical-expected.txt
index acf8d5c..b6d8b5c 100644
--- a/LayoutTests/platform/gtk/fast/lists/008-vertical-expected.txt
+++ b/LayoutTests/platform/gtk/fast/lists/008-vertical-expected.txt
@@ -5,30 +5,30 @@ layer at (0,0) size 1856x581
     RenderBody {BODY} at (8,8) size 1832x565
       RenderBlock {UL} at (0,0) size 138x202 [border: (1px solid #0000FF)]
         RenderListItem {LI} at (1,41) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,-18) size 19x7: bullet
+          RenderListMarker at (10,-13) size 19x7: bullet
           RenderText {#text} at (10,10) size 19x59
             text run at (10,10) width 59: "First item"
         RenderListItem {LI} at (40,41) size 58x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,-18) size 19x7: bullet
+          RenderListMarker at (10,-13) size 19x7: bullet
           RenderText {#text} at (10,10) size 38x138
             text run at (10,10) width 138: "Second and very very"
             text run at (29,10) width 59: "long item"
         RenderListItem {LI} at (98,41) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,-18) size 19x7: bullet
+          RenderListMarker at (10,-13) size 19x7: bullet
           RenderText {#text} at (10,10) size 19x66
             text run at (10,10) width 66: "Third item"
       RenderBlock {UL} at (154,0) size 138x202 [border: (1px solid #FF0000)]
         RenderListItem {LI} at (1,1) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,171) size 19x7: bullet
+          RenderListMarker at (10,166) size 19x7: bullet
           RenderText {#text} at (10,91) size 19x59
             text run at (10,91) width 59: "First item"
         RenderListItem {LI} at (40,1) size 58x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,171) size 19x7: bullet
+          RenderListMarker at (10,166) size 19x7: bullet
           RenderText {#text} at (10,12) size 38x138
             text run at (10,12) width 138: "Second and very very"
             text run at (29,91) width 59: "long item"
         RenderListItem {LI} at (98,1) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,171) size 19x7: bullet
+          RenderListMarker at (10,166) size 19x7: bullet
           RenderText {#text} at (10,84) size 19x66
             text run at (10,84) width 66: "Third item"
       RenderBlock {UL} at (308,0) size 138x202 [border: (1px solid #0000FF)]
@@ -61,30 +61,30 @@ layer at (0,0) size 1856x581
             text run at (10,69) width 66: "Third item"
       RenderBlock {UL} at (616,0) size 138x202 [border: (1px solid #0000FF)]
         RenderListItem {LI} at (1,41) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (14,-17) size 10x10
+          RenderListMarker at (14,-12) size 10x10
           RenderText {#text} at (10,10) size 19x59
             text run at (10,10) width 59: "First item"
         RenderListItem {LI} at (40,41) size 58x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (14,-17) size 10x10
+          RenderListMarker at (14,-12) size 10x10
           RenderText {#text} at (10,10) size 38x138
             text run at (10,10) width 138: "Second and very very"
             text run at (29,10) width 59: "long item"
         RenderListItem {LI} at (98,41) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (14,-17) size 10x10
+          RenderListMarker at (14,-12) size 10x10
           RenderText {#text} at (10,10) size 19x66
             text run at (10,10) width 66: "Third item"
       RenderBlock {UL} at (770,0) size 138x202 [border: (1px solid #FF0000)]
         RenderListItem {LI} at (1,1) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (14,167) size 10x10
+          RenderListMarker at (14,162) size 10x10
           RenderText {#text} at (10,91) size 19x59
             text run at (10,91) width 59: "First item"
         RenderListItem {LI} at (40,1) size 58x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (14,167) size 10x10
+          RenderListMarker at (14,162) size 10x10
           RenderText {#text} at (10,12) size 38x138
             text run at (10,12) width 138: "Second and very very"
             text run at (29,91) width 59: "long item"
         RenderListItem {LI} at (98,1) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (14,167) size 10x10
+          RenderListMarker at (14,162) size 10x10
           RenderText {#text} at (10,84) size 19x66
             text run at (10,84) width 66: "Third item"
       RenderBlock {UL} at (924,0) size 138x202 [border: (1px solid #0000FF)]
@@ -117,30 +117,30 @@ layer at (0,0) size 1856x581
             text run at (10,67) width 66: "Third item"
       RenderBlock {OL} at (1232,0) size 138x202 [border: (1px solid #0000FF)]
         RenderListItem {LI} at (1,41) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,-21) size 19x16: "1"
+          RenderListMarker at (10,-16) size 19x16: "1"
           RenderText {#text} at (10,10) size 19x59
             text run at (10,10) width 59: "First item"
         RenderListItem {LI} at (40,41) size 58x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,-21) size 19x16: "2"
+          RenderListMarker at (10,-16) size 19x16: "2"
           RenderText {#text} at (10,10) size 38x138
             text run at (10,10) width 138: "Second and very very"
             text run at (29,10) width 59: "long item"
         RenderListItem {LI} at (98,41) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,-21) size 19x16: "3"
+          RenderListMarker at (10,-16) size 19x16: "3"
           RenderText {#text} at (10,10) size 19x66
             text run at (10,10) width 66: "Third item"
       RenderBlock {OL} at (1386,0) size 138x202 [border: (1px solid #FF0000)]
         RenderListItem {LI} at (1,1) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,165) size 19x16: "1"
+          RenderListMarker at (10,160) size 19x16: "1"
           RenderText {#text} at (10,91) size 19x59
             text run at (10,91) width 59: "First item"
         RenderListItem {LI} at (40,1) size 58x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,165) size 19x16: "2"
+          RenderListMarker at (10,160) size 19x16: "2"
           RenderText {#text} at (10,12) size 38x138
             text run at (10,12) width 138: "Second and very very"
             text run at (29,91) width 59: "long item"
         RenderListItem {LI} at (98,1) size 39x160 [border: (5px solid #FFA500)]
-          RenderListMarker at (10,165) size 19x16: "3"
+          RenderListMarker at (10,160) size 19x16: "3"
           RenderText {#text} at (10,84) size 19x66
             text run at (10,84) width 66: "Third item"
       RenderBlock {OL} at (1540,0) size 138x202 [border: (1px solid #0000FF)]
diff --git a/LayoutTests/platform/gtk/fast/lists/outSideListMarkers-expected.txt b/LayoutTests/platform/gtk/fast/lists/outSideListMarkers-expected.txt
new file mode 100644
index 0000000..b3c63a9
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/lists/outSideListMarkers-expected.txt
@@ -0,0 +1,83 @@
+layer at (0,0) size 781x607
+  RenderView at (0,0) size 781x600
+layer at (0,0) size 781x607
+  RenderBlock {HTML} at (0,0) size 781x607
+    RenderBody {BODY} at (8,8) size 765x583
+      RenderBlock {H2} at (0,0) size 765x28
+        RenderText {#text} at (0,0) size 509x28
+          text run at (0,0) width 509: "The following lists have list-style-position: outside"
+      RenderBlock {P} at (0,47) size 765x19
+        RenderInline {U} at (0,0) size 105x19
+          RenderText {#text} at (0,0) size 105x19
+            text run at (0,0) width 105: "text-align: center"
+      RenderBlock {UL} at (0,82) size 765x57
+        RenderListItem {LI} at (40,0) size 725x19
+          RenderListMarker at (243,0) size 7x19: bullet
+          RenderText {#text} at (261,0) size 203x19
+            text run at (261,0) width 203: "Earl Grey Tea - A fine black tea"
+        RenderListItem {LI} at (40,19) size 725x19
+          RenderListMarker at (209,0) size 7x19: bullet
+          RenderText {#text} at (227,0) size 270x19
+            text run at (227,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
+        RenderListItem {LI} at (40,38) size 725x19
+          RenderListMarker at (209,0) size 7x19: bullet
+          RenderText {#text} at (227,0) size 271x19
+            text run at (227,0) width 271: "Honeybush Tea - A super fruity delight tea"
+      RenderBlock (anonymous) at (0,155) size 765x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderBlock {P} at (0,190) size 765x19
+        RenderInline {U} at (0,0) size 96x19
+          RenderText {#text} at (0,0) size 96x19
+            text run at (0,0) width 96: "text-align: right"
+      RenderBlock {UL} at (0,225) size 765x57
+        RenderListItem {LI} at (40,0) size 725x19
+          RenderListMarker at (504,0) size 7x19: bullet
+          RenderText {#text} at (522,0) size 203x19
+            text run at (522,0) width 203: "Earl Grey Tea - A fine black tea"
+        RenderListItem {LI} at (40,19) size 725x19
+          RenderListMarker at (437,0) size 7x19: bullet
+          RenderText {#text} at (455,0) size 270x19
+            text run at (455,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
+        RenderListItem {LI} at (40,38) size 725x19
+          RenderListMarker at (436,0) size 7x19: bullet
+          RenderText {#text} at (454,0) size 271x19
+            text run at (454,0) width 271: "Honeybush Tea - A super fruity delight tea"
+      RenderBlock {H2} at (0,301) size 765x28
+        RenderText {#text} at (0,0) size 509x28
+          text run at (0,0) width 509: "The following lists have list-style-position: outside"
+      RenderBlock {P} at (0,348) size 765x19
+        RenderInline {U} at (0,0) size 105x19
+          RenderText {#text} at (0,0) size 105x19
+            text run at (0,0) width 105: "text-align: center"
+      RenderBlock {UL} at (0,383) size 765x57
+        RenderListItem {LI} at (40,0) size 725x19
+          RenderListMarker at (243,0) size 7x19: bullet
+          RenderText {#text} at (261,0) size 203x19
+            text run at (261,0) width 203: "Earl Grey Tea - A fine black tea"
+        RenderListItem {LI} at (40,19) size 725x19
+          RenderListMarker at (209,0) size 7x19: bullet
+          RenderText {#text} at (227,0) size 270x19
+            text run at (227,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
+        RenderListItem {LI} at (40,38) size 725x19
+          RenderListMarker at (209,0) size 7x19: bullet
+          RenderText {#text} at (227,0) size 271x19
+            text run at (227,0) width 271: "Honeybush Tea - A super fruity delight tea"
+      RenderBlock (anonymous) at (0,456) size 765x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderBlock {P} at (0,491) size 765x19
+        RenderInline {U} at (0,0) size 96x19
+          RenderText {#text} at (0,0) size 96x19
+            text run at (0,0) width 96: "text-align: right"
+      RenderBlock {UL} at (0,526) size 765x57
+        RenderListItem {LI} at (40,0) size 725x19
+          RenderListMarker at (504,0) size 7x19: bullet
+          RenderText {#text} at (522,0) size 203x19
+            text run at (522,0) width 203: "Earl Grey Tea - A fine black tea"
+        RenderListItem {LI} at (40,19) size 725x19
+          RenderListMarker at (437,0) size 7x19: bullet
+          RenderText {#text} at (455,0) size 270x19
+            text run at (455,0) width 270: "Jasmine Tea - A fabulous \"all purpose\" tea"
+        RenderListItem {LI} at (40,38) size 725x19
+          RenderListMarker at (436,0) size 7x19: bullet
+          RenderText {#text} at (454,0) size 271x19
+            text run at (454,0) width 271: "Honeybush Tea - A super fruity delight tea"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list