diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 549c3711d574..ebc5f5b76950 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,7 @@ +2017-11-10 Carlos Garcia Campos + + Unreviewed GTK+ gardening. Rebaseline tests after r224572 and r224573. Part 1. + 2017-09-13 Zalan Bujtas Switch multicolumn's spanner map from raw over to weak pointers. diff --git a/LayoutTests/accessibility/gtk/object-attributes-expected.txt b/LayoutTests/accessibility/gtk/object-attributes-expected.txt index a9a2aa248e86..c294348538f5 100644 --- a/LayoutTests/accessibility/gtk/object-attributes-expected.txt +++ b/LayoutTests/accessibility/gtk/object-attributes-expected.txt @@ -30,7 +30,7 @@ AXRole: AXHeading AXParent: AXWebArea AXChildren: 0 AXPosition: { 8.000000, 8.000000 } -AXSize: { 784.000000, 36.000000 } +AXSize: { 784.000000, 37.000000 } AXTitle: Heading Level 1 AXDescription: AXValue: Heading Level 1 @@ -48,8 +48,8 @@ AXPlatformAttributes: computed-role:heading, level:1, tag:h1, toolkit:WebKitGtk AXRole: AXHeading AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 65.000000 } -AXSize: { 784.000000, 27.000000 } +AXPosition: { 8.000000, 66.000000 } +AXSize: { 784.000000, 28.000000 } AXTitle: Heading Level 2 AXDescription: AXValue: Heading Level 2 @@ -67,8 +67,8 @@ AXPlatformAttributes: computed-role:heading, level:2, tag:h2, toolkit:WebKitGtk AXRole: AXHeading AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 111.000000 } -AXSize: { 784.000000, 22.000000 } +AXPosition: { 8.000000, 113.000000 } +AXSize: { 784.000000, 23.000000 } AXTitle: Heading Level 3 AXDescription: AXValue: Heading Level 3 @@ -86,8 +86,8 @@ AXPlatformAttributes: computed-role:heading, level:3, tag:h3, toolkit:WebKitGtk AXRole: AXHeading AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 153.000000 } -AXSize: { 784.000000, 18.000000 } +AXPosition: { 8.000000, 156.000000 } +AXSize: { 784.000000, 19.000000 } AXTitle: Heading Level 4 AXDescription: AXValue: Heading Level 4 @@ -105,8 +105,8 @@ AXPlatformAttributes: computed-role:heading, level:4, tag:h4, toolkit:WebKitGtk AXRole: AXHeading AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 192.000000 } -AXSize: { 784.000000, 16.000000 } +AXPosition: { 8.000000, 196.000000 } +AXSize: { 784.000000, 17.000000 } AXTitle: Heading Level 5 AXDescription: AXValue: Heading Level 5 @@ -124,7 +124,7 @@ AXPlatformAttributes: computed-role:heading, level:5, tag:h5, toolkit:WebKitGtk AXRole: AXHeading AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 232.000000 } +AXPosition: { 8.000000, 237.000000 } AXSize: { 784.000000, 13.000000 } AXTitle: Heading Level 6 AXDescription: @@ -143,8 +143,8 @@ AXPlatformAttributes: computed-role:heading, level:6, tag:h6, toolkit:WebKitGtk AXRole: AXSection AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 269.000000 } -AXSize: { 784.000000, 18.000000 } +AXPosition: { 8.000000, 274.000000 } +AXSize: { 784.000000, 19.000000 } AXTitle: AXDescription: AXValue: Link @@ -162,8 +162,8 @@ AXPlatformAttributes: toolkit:WebKitGtk AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 10.000000, 288.000000 } -AXSize: { 23.000000, 20.000000 } +AXPosition: { 10.000000, 294.000000 } +AXSize: { 23.000000, 21.000000 } AXTitle: AXDescription: AXValue: foo @@ -181,8 +181,8 @@ AXPlatformAttributes: tag:td, toolkit:WebKitGtk AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 35.000000, 288.000000 } -AXSize: { 22.000000, 20.000000 } +AXPosition: { 35.000000, 294.000000 } +AXSize: { 22.000000, 21.000000 } AXTitle: AXDescription: AXValue: bar @@ -200,8 +200,8 @@ AXPlatformAttributes: tag:td, toolkit:WebKitGtk AXRole: AXTable AXParent: AXWebArea AXChildren: 3 -AXPosition: { 8.000000, 309.000000 } -AXSize: { 81.000000, 74.000000 } +AXPosition: { 8.000000, 316.000000 } +AXSize: { 81.000000, 77.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -218,8 +218,8 @@ AXPlatformAttributes: computed-role:table, tag:table, toolkit:WebKitGtk AXRole: AXParagraph AXParent: AXWebArea AXChildren: 2 -AXPosition: { 8.000000, 398.000000 } -AXSize: { 784.000000, 51.000000 } +AXPosition: { 8.000000, 408.000000 } +AXSize: { 784.000000, 53.000000 } AXTitle: AXDescription: AXValue: This tests the exposure of Atk object attributes.<\n><\n>On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".<\n><\n><\n> diff --git a/LayoutTests/platform/gtk/accessibility/content-editable-as-textarea-expected.txt b/LayoutTests/platform/gtk/accessibility/content-editable-as-textarea-expected.txt index 75bdd91357e2..49bf47255990 100644 --- a/LayoutTests/platform/gtk/accessibility/content-editable-as-textarea-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/content-editable-as-textarea-expected.txt @@ -31,7 +31,7 @@ Line for index(0): 0 Line for index(7): 1 Range for line(0): {0, 6} Range for line(1): {6, 5} -Bounds for range: {8, 8, 31, 34} +Bounds for range: {8, 8, 31, 35} Selected text range: {0, 3} Selected text: hel Updated value: AXValue: qlo<\n>world diff --git a/LayoutTests/platform/gtk/accessibility/image-link-expected.txt b/LayoutTests/platform/gtk/accessibility/image-link-expected.txt index d9500b958a96..7dd712780078 100644 --- a/LayoutTests/platform/gtk/accessibility/image-link-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/image-link-expected.txt @@ -6,7 +6,7 @@ This test checks that the right accessibility tree is generated for a link insid AXRole: AXLink AXParent: AXSection AXChildren: 1 -AXPosition: { 8.000000, 97.000000 } +AXPosition: { 8.000000, 99.000000 } AXSize: { 280.000000, 214.000000 } AXTitle: Delicious cake AXDescription: @@ -27,7 +27,7 @@ Child 0: AXRole: AXImage AXParent: AXLink: Delicious cake AXChildren: 0 -AXPosition: { 8.000000, 98.000000 } +AXPosition: { 8.000000, 100.000000 } AXSize: { 280.000000, 210.000000 } AXTitle: Delicious cake AXDescription: diff --git a/LayoutTests/platform/gtk/accessibility/image-map2-expected.txt b/LayoutTests/platform/gtk/accessibility/image-map2-expected.txt index 8e04cb0dfec0..e0f4fc434cc9 100644 --- a/LayoutTests/platform/gtk/accessibility/image-map2-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/image-map2-expected.txt @@ -4,7 +4,7 @@ AXRole: AXSection AXParent: AXWebArea AXChildren: 0 AXPosition: { 8.000000, 8.000000 } -AXSize: { 784.000000, 34.000000 } +AXSize: { 784.000000, 36.000000 } AXTitle: AXDescription: AXValue: Image map - test 2 - 2 Links (alt tags)<\n>----------------------<\n> @@ -22,7 +22,7 @@ AXPlatformAttributes: html-id:result, tag:div, toolkit:WebKitGtk AXRole: AXLink AXParent: AXWebArea AXChildren: 0 -AXPosition: { 18.000000, 53.000000 } +AXPosition: { 18.000000, 55.000000 } AXSize: { 123.000000, 62.000000 } AXTitle: Link1 AXDescription: @@ -42,7 +42,7 @@ AXPlatformAttributes: computed-role:link, tag:area, toolkit:WebKitGtk AXRole: AXLink AXParent: AXWebArea AXChildren: 0 -AXPosition: { 20.000000, 117.000000 } +AXPosition: { 20.000000, 119.000000 } AXSize: { 122.000000, 14.000000 } AXTitle: Link2 AXDescription: diff --git a/LayoutTests/platform/gtk/accessibility/lists-expected.txt b/LayoutTests/platform/gtk/accessibility/lists-expected.txt index b5bf0cdf7758..feda7cff99c8 100644 --- a/LayoutTests/platform/gtk/accessibility/lists-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/lists-expected.txt @@ -15,7 +15,7 @@ AXRole: AXList AXParent: AXWebArea AXChildren: 2 AXPosition: { 8.000000, 16.000000 } -AXSize: { 784.000000, 34.000000 } +AXSize: { 784.000000, 36.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -32,8 +32,8 @@ AXPlatformAttributes: computed-role:list, tag:ul, toolkit:WebKitGtk AXRole: AXList AXParent: AXWebArea AXChildren: 2 -AXPosition: { 8.000000, 66.000000 } -AXSize: { 784.000000, 34.000000 } +AXPosition: { 8.000000, 68.000000 } +AXSize: { 784.000000, 36.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -50,8 +50,8 @@ AXPlatformAttributes: computed-role:list, tag:ol, toolkit:WebKitGtk AXRole: AXDescriptionList AXParent: AXWebArea AXChildren: 5 -AXPosition: { 8.000000, 116.000000 } -AXSize: { 784.000000, 85.000000 } +AXPosition: { 8.000000, 120.000000 } +AXSize: { 784.000000, 90.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -68,8 +68,8 @@ AXPlatformAttributes: tag:dl, toolkit:WebKitGtk AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 217.000000 } -AXSize: { 784.000000, 68.000000 } +AXPosition: { 8.000000, 226.000000 } +AXSize: { 784.000000, 72.000000 } AXTitle: AXDescription: AXValue: <\n><\n><\n><\n> @@ -90,7 +90,7 @@ AXRole: AXListItem AXParent: AXList AXChildren: 0 AXPosition: { 48.000000, 16.000000 } -AXSize: { 729.000000, 17.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: test 1 AXDescription: AXValue: • test 1 @@ -108,8 +108,8 @@ AXPlatformAttributes: computed-role:listitem, tag:li, toolkit:WebKitGtk AXRole: AXListItem AXParent: AXList AXChildren: 0 -AXPosition: { 48.000000, 33.000000 } -AXSize: { 729.000000, 17.000000 } +AXPosition: { 48.000000, 34.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: test 2 AXDescription: AXValue: • test 2 @@ -129,8 +129,8 @@ AXPlatformAttributes: computed-role:listitem, tag:li, toolkit:WebKitGtk AXRole: AXListItem AXParent: AXList AXChildren: 0 -AXPosition: { 48.000000, 66.000000 } -AXSize: { 729.000000, 17.000000 } +AXPosition: { 48.000000, 68.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: test 1 AXDescription: AXValue: 1. test 1 @@ -148,8 +148,8 @@ AXPlatformAttributes: computed-role:listitem, tag:li, toolkit:WebKitGtk AXRole: AXListItem AXParent: AXList AXChildren: 0 -AXPosition: { 48.000000, 83.000000 } -AXSize: { 729.000000, 17.000000 } +AXPosition: { 48.000000, 86.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: test 2 AXDescription: AXValue: 2. test 2 @@ -169,8 +169,8 @@ AXPlatformAttributes: computed-role:listitem, tag:li, toolkit:WebKitGtk AXRole: AXDescriptionTerm AXParent: AXDescriptionList AXChildren: 0 -AXPosition: { 8.000000, 116.000000 } -AXSize: { 769.000000, 17.000000 } +AXPosition: { 8.000000, 120.000000 } +AXSize: { 769.000000, 18.000000 } AXTitle: AXDescription: AXValue: term 1 @@ -188,8 +188,8 @@ AXPlatformAttributes: tag:dt, toolkit:WebKitGtk AXRole: AXDescriptionValue AXParent: AXDescriptionList AXChildren: 0 -AXPosition: { 48.000000, 133.000000 } -AXSize: { 729.000000, 17.000000 } +AXPosition: { 48.000000, 138.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: AXDescription: AXValue: meaning 2 @@ -207,8 +207,8 @@ AXPlatformAttributes: tag:dd, toolkit:WebKitGtk AXRole: AXDescriptionTerm AXParent: AXDescriptionList AXChildren: 0 -AXPosition: { 8.000000, 150.000000 } -AXSize: { 769.000000, 17.000000 } +AXPosition: { 8.000000, 156.000000 } +AXSize: { 769.000000, 18.000000 } AXTitle: AXDescription: AXValue: term b @@ -226,8 +226,8 @@ AXPlatformAttributes: tag:dt, toolkit:WebKitGtk AXRole: AXDescriptionValue AXParent: AXDescriptionList AXChildren: 0 -AXPosition: { 48.000000, 167.000000 } -AXSize: { 729.000000, 17.000000 } +AXPosition: { 48.000000, 174.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: AXDescription: AXValue: meaning 1 @@ -245,8 +245,8 @@ AXPlatformAttributes: tag:dd, toolkit:WebKitGtk AXRole: AXDescriptionValue AXParent: AXDescriptionList AXChildren: 0 -AXPosition: { 48.000000, 184.000000 } -AXSize: { 729.000000, 17.000000 } +AXPosition: { 48.000000, 192.000000 } +AXSize: { 729.000000, 18.000000 } AXTitle: AXDescription: AXValue: meaning 2 diff --git a/LayoutTests/platform/gtk/accessibility/table-attributes-expected.txt b/LayoutTests/platform/gtk/accessibility/table-attributes-expected.txt index df2049009e18..a20a9f1ae41b 100644 --- a/LayoutTests/platform/gtk/accessibility/table-attributes-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-attributes-expected.txt @@ -11,8 +11,8 @@ South 3333 1111 2222 AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 234.000000, 26.000000 } -AXSize: { 144.000000, 63.000000 } +AXPosition: { 234.000000, 27.000000 } +AXSize: { 144.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -30,8 +30,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 234.000000, 26.000000 } -AXSize: { 144.000000, 63.000000 } +AXPosition: { 234.000000, 27.000000 } +AXSize: { 144.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -49,8 +49,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 377.000000, 26.000000 } -AXSize: { 70.000000, 63.000000 } +AXPosition: { 377.000000, 27.000000 } +AXSize: { 70.000000, 66.000000 } AXTitle: AXDescription: AXValue: All<\n>Genders @@ -68,8 +68,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 446.000000, 26.000000 } -AXSize: { 120.000000, 29.000000 } +AXPosition: { 446.000000, 27.000000 } +AXSize: { 120.000000, 30.000000 } AXTitle: AXDescription: AXValue: By Gender @@ -87,8 +87,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 446.000000, 26.000000 } -AXSize: { 120.000000, 29.000000 } +AXPosition: { 446.000000, 27.000000 } +AXSize: { 120.000000, 30.000000 } AXTitle: AXDescription: AXValue: By Gender @@ -110,8 +110,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -129,8 +129,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -148,8 +148,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 89.000000 } -AXSize: { 90.000000, 58.000000 } +AXPosition: { 227.000000, 93.000000 } +AXSize: { 90.000000, 60.000000 } AXTitle: AXDescription: AXValue: All Regions @@ -167,8 +167,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 89.000000 } -AXSize: { 90.000000, 58.000000 } +AXPosition: { 227.000000, 93.000000 } +AXSize: { 90.000000, 60.000000 } AXTitle: AXDescription: AXValue: All Regions @@ -198,8 +198,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -217,8 +217,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -236,8 +236,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 370.000000, 26.000000 } -AXSize: { 69.000000, 63.000000 } +AXPosition: { 370.000000, 27.000000 } +AXSize: { 69.000000, 66.000000 } AXTitle: AXDescription: AXValue: All<\n>Genders @@ -255,8 +255,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 439.000000, 26.000000 } -AXSize: { 119.000000, 29.000000 } +AXPosition: { 439.000000, 27.000000 } +AXSize: { 119.000000, 30.000000 } AXTitle: AXDescription: AXValue: By Gender @@ -274,8 +274,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 439.000000, 26.000000 } -AXSize: { 119.000000, 29.000000 } +AXPosition: { 439.000000, 27.000000 } +AXSize: { 119.000000, 30.000000 } AXTitle: AXDescription: AXValue: By Gender @@ -293,8 +293,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -312,8 +312,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -331,8 +331,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 370.000000, 26.000000 } -AXSize: { 69.000000, 63.000000 } +AXPosition: { 370.000000, 27.000000 } +AXSize: { 69.000000, 66.000000 } AXTitle: AXDescription: AXValue: All<\n>Genders @@ -350,8 +350,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 439.000000, 55.000000 } -AXSize: { 52.000000, 34.000000 } +AXPosition: { 439.000000, 57.000000 } +AXSize: { 52.000000, 36.000000 } AXTitle: AXDescription: AXValue: Males @@ -369,8 +369,8 @@ AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 491.000000, 55.000000 } -AXSize: { 67.000000, 34.000000 } +AXPosition: { 491.000000, 57.000000 } +AXSize: { 67.000000, 36.000000 } AXTitle: AXDescription: AXValue: Females @@ -388,8 +388,8 @@ AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 89.000000 } -AXSize: { 90.000000, 58.000000 } +AXPosition: { 227.000000, 93.000000 } +AXSize: { 90.000000, 60.000000 } AXTitle: AXDescription: AXValue: All Regions @@ -407,8 +407,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 317.000000, 89.000000 } -AXSize: { 53.000000, 29.000000 } +AXPosition: { 317.000000, 93.000000 } +AXSize: { 53.000000, 30.000000 } AXTitle: AXDescription: AXValue: North @@ -426,8 +426,8 @@ AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 370.000000, 89.000000 } -AXSize: { 69.000000, 29.000000 } +AXPosition: { 370.000000, 93.000000 } +AXSize: { 69.000000, 30.000000 } AXTitle: AXDescription: AXValue: 3333 @@ -445,8 +445,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 439.000000, 89.000000 } -AXSize: { 52.000000, 29.000000 } +AXPosition: { 439.000000, 93.000000 } +AXSize: { 52.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1111 @@ -464,8 +464,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 491.000000, 89.000000 } -AXSize: { 67.000000, 29.000000 } +AXPosition: { 491.000000, 93.000000 } +AXSize: { 67.000000, 30.000000 } AXTitle: AXDescription: AXValue: 2222 @@ -483,8 +483,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 89.000000 } -AXSize: { 90.000000, 58.000000 } +AXPosition: { 227.000000, 93.000000 } +AXSize: { 90.000000, 60.000000 } AXTitle: AXDescription: AXValue: All Regions @@ -502,8 +502,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 317.000000, 118.000000 } -AXSize: { 53.000000, 29.000000 } +AXPosition: { 317.000000, 123.000000 } +AXSize: { 53.000000, 30.000000 } AXTitle: AXDescription: AXValue: South @@ -521,8 +521,8 @@ AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 370.000000, 118.000000 } -AXSize: { 69.000000, 29.000000 } +AXPosition: { 370.000000, 123.000000 } +AXSize: { 69.000000, 30.000000 } AXTitle: AXDescription: AXValue: 3333 @@ -540,8 +540,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 439.000000, 118.000000 } -AXSize: { 52.000000, 29.000000 } +AXPosition: { 439.000000, 123.000000 } +AXSize: { 52.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1111 @@ -559,8 +559,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 491.000000, 118.000000 } -AXSize: { 67.000000, 29.000000 } +AXPosition: { 491.000000, 123.000000 } +AXSize: { 67.000000, 30.000000 } AXTitle: AXDescription: AXValue: 2222 diff --git a/LayoutTests/platform/gtk/accessibility/table-cell-spans-expected.txt b/LayoutTests/platform/gtk/accessibility/table-cell-spans-expected.txt index 3902024d70eb..9f6256ed4c06 100644 --- a/LayoutTests/platform/gtk/accessibility/table-cell-spans-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-cell-spans-expected.txt @@ -12,7 +12,7 @@ AXRole: AXCell AXParent: AXRow AXChildren: 0 AXPosition: { 154.000000, 9.000000 } -AXSize: { 246.000000, 75.000000 } +AXSize: { 246.000000, 78.000000 } AXTitle: AXDescription: AXValue: Cell A<\n>COLSPAN="2"<\n>ROWSPAN="2" @@ -34,7 +34,7 @@ AXRole: AXCell AXParent: AXRow AXChildren: 0 AXPosition: { 154.000000, 9.000000 } -AXSize: { 246.000000, 75.000000 } +AXSize: { 246.000000, 78.000000 } AXTitle: AXDescription: AXValue: Cell A<\n>COLSPAN="2"<\n>ROWSPAN="2" @@ -55,8 +55,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 146.000000, 84.000000 } -AXSize: { 124.000000, 58.000000 } +AXPosition: { 146.000000, 87.000000 } +AXSize: { 124.000000, 60.000000 } AXTitle: AXDescription: AXValue: Cell C<\n>ROWSPAN="2" @@ -77,8 +77,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 146.000000, 84.000000 } -AXSize: { 124.000000, 58.000000 } +AXPosition: { 146.000000, 87.000000 } +AXSize: { 124.000000, 60.000000 } AXTitle: AXDescription: AXValue: Cell C<\n>ROWSPAN="2" @@ -99,8 +99,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 515.000000, 84.000000 } -AXSize: { 124.000000, 29.000000 } +AXPosition: { 515.000000, 87.000000 } +AXSize: { 124.000000, 30.000000 } AXTitle: AXDescription: AXValue: 3,4 diff --git a/LayoutTests/platform/gtk/accessibility/table-cells-expected.txt b/LayoutTests/platform/gtk/accessibility/table-cells-expected.txt index e4fe8b68562b..3bd558b8419a 100644 --- a/LayoutTests/platform/gtk/accessibility/table-cells-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-cells-expected.txt @@ -13,8 +13,8 @@ South 3333 1111 2222 AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 234.000000, 26.000000 } -AXSize: { 144.000000, 63.000000 } +AXPosition: { 234.000000, 27.000000 } +AXSize: { 144.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -33,8 +33,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 446.000000, 55.000000 } -AXSize: { 53.000000, 34.000000 } +AXPosition: { 446.000000, 57.000000 } +AXSize: { 53.000000, 36.000000 } AXTitle: AXDescription: AXValue: Males @@ -53,8 +53,8 @@ AXPlatformAttributes: computed-role:cell, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 227.000000, 26.000000 } -AXSize: { 143.000000, 63.000000 } +AXPosition: { 227.000000, 27.000000 } +AXSize: { 143.000000, 66.000000 } AXTitle: AXDescription: AXValue: Ruritanian<\n>Population <\n>Survey @@ -73,8 +73,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 370.000000, 89.000000 } -AXSize: { 69.000000, 29.000000 } +AXPosition: { 370.000000, 93.000000 } +AXSize: { 69.000000, 30.000000 } AXTitle: AXDescription: AXValue: 3333 @@ -93,8 +93,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 439.000000, 176.000000 } -AXSize: { 52.000000, 29.000000 } +AXPosition: { 439.000000, 183.000000 } +AXSize: { 52.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1111 diff --git a/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt b/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt index 201e6b354417..f0eb932c2dd8 100644 --- a/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt @@ -4,8 +4,8 @@ This should be a table because it has a thead. AXRole: AXTable AXParent: AXWebArea AXChildren: 2 -AXPosition: { 8.000000, 65.000000 } -AXSize: { 62.000000, 45.000000 } +AXPosition: { 8.000000, 66.000000 } +AXSize: { 62.000000, 47.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -27,8 +27,8 @@ This should be a table because cells have borders. AXRole: AXTable AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 483.000000 } -AXSize: { 68.000000, 28.000000 } +AXPosition: { 8.000000, 488.000000 } +AXSize: { 68.000000, 29.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -49,8 +49,8 @@ This should not be a table because its cells do not have borders. AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 11.000000, 335.000000 } -AXSize: { 28.000000, 20.000000 } +AXPosition: { 11.000000, 336.000000 } +AXSize: { 28.000000, 21.000000 } AXTitle: AXDescription: AXValue: asdf @@ -73,7 +73,7 @@ AXRole: AXTable AXParent: AXWebArea AXChildren: 1 AXPosition: { 8.000000, 333.000000 } -AXSize: { 58.000000, 22.000000 } +AXSize: { 58.000000, 23.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -95,7 +95,7 @@ AXRole: AXTable AXParent: AXWebArea AXChildren: 1 AXPosition: { 8.000000, 333.000000 } -AXSize: { 58.000000, 22.000000 } +AXSize: { 58.000000, 23.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -116,8 +116,8 @@ This should be a table because a cell has a special attribute. AXRole: AXTable AXParent: AXWebArea AXChildren: 2 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 58.000000, 41.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 58.000000, 43.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -139,8 +139,8 @@ This should be a table because cells have different colors. AXRole: AXTable AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 58.000000, 22.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 58.000000, 23.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -161,8 +161,8 @@ This should not be a table because cells have different but no spacing. AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 26.000000, 18.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 26.000000, 19.000000 } AXTitle: AXDescription: AXValue: asdf @@ -184,8 +184,8 @@ This should not be a table because cells have the same colors even though there AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 11.000000, 349.000000 } -AXSize: { 26.000000, 18.000000 } +AXPosition: { 11.000000, 350.000000 } +AXSize: { 26.000000, 19.000000 } AXTitle: AXDescription: AXValue: asdf @@ -208,7 +208,7 @@ AXRole: AXTable AXParent: AXWebArea AXChildren: 1 AXPosition: { 8.000000, 333.000000 } -AXSize: { 53.000000, 18.000000 } +AXSize: { 53.000000, 19.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -229,7 +229,7 @@ This should not be a table because it only has one valid cell (need more than on AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 8.000000, 345.000000 } +AXPosition: { 8.000000, 346.000000 } AXSize: { 769.000000, 27.000000 } AXTitle: AXDescription: @@ -252,8 +252,8 @@ This should not be a table because it does not have enough cell borders or backg AXRole: AXSection AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 345.000000 } -AXSize: { 130.000000, 18.000000 } +AXPosition: { 8.000000, 346.000000 } +AXSize: { 130.000000, 19.000000 } AXTitle: AXDescription: AXValue: Politics @@ -281,8 +281,8 @@ This should be a table because it's editable. AXRole: AXTable AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 64.000000, 26.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 64.000000, 27.000000 } AXTitle: AXDescription: AXValue: asdf asdf<\n> @@ -305,7 +305,7 @@ AXRole: AXTable AXParent: AXWebArea AXChildren: 2 AXPosition: { 8.000000, 333.000000 } -AXSize: { 62.000000, 47.000000 } +AXSize: { 62.000000, 49.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -328,7 +328,7 @@ AXRole: AXSection AXParent: AXWebArea AXChildren: 0 AXPosition: { 10.000000, 335.000000 } -AXSize: { 28.000000, 20.000000 } +AXSize: { 28.000000, 21.000000 } AXTitle: AXDescription: AXValue: asdf @@ -352,7 +352,7 @@ AXRole: AXTable AXParent: AXWebArea AXChildren: 3 AXPosition: { 8.000000, 333.000000 } -AXSize: { 64.000000, 67.000000 } +AXSize: { 64.000000, 70.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -375,8 +375,8 @@ This should be a table because it sets empty-cells: hide on a cell. AXRole: AXTable AXParent: AXWebArea AXChildren: 3 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 64.000000, 68.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 64.000000, 71.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -399,8 +399,8 @@ This should be a table because it has a col. AXRole: AXTable AXParent: AXWebArea AXChildren: 2 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 62.000000, 45.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 62.000000, 47.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -422,8 +422,8 @@ This should be a table because it has at least 20 rows AXRole: AXTable AXParent: AXWebArea AXChildren: 24 -AXPosition: { 8.000000, 332.000000 } -AXSize: { 32.000000, 507.000000 } +AXPosition: { 8.000000, 333.000000 } +AXSize: { 32.000000, 531.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -467,8 +467,8 @@ This should be a table even though it uses table-row-group for it's display type AXRole: AXTable AXParent: AXWebArea AXChildren: 2 -AXPosition: { 8.000000, 548.000000 } -AXSize: { 84.000000, 45.000000 } +AXPosition: { 8.000000, 546.000000 } +AXSize: { 84.000000, 47.000000 } AXTitle: AXDescription: AXFocusable: 0 diff --git a/LayoutTests/platform/gtk/accessibility/table-one-cell-expected.txt b/LayoutTests/platform/gtk/accessibility/table-one-cell-expected.txt index a88ab7832921..f99026145903 100644 --- a/LayoutTests/platform/gtk/accessibility/table-one-cell-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-one-cell-expected.txt @@ -5,7 +5,7 @@ AXRole: AXParagraph AXParent: AXWebArea AXChildren: 1 AXPosition: { 11.000000, 11.000000 } -AXSize: { 132.000000, 85.000000 } +AXSize: { 132.000000, 90.000000 } AXTitle: AXDescription: AXValue: Pick Your Location!<\n>Get specific content for your area. <\n>http://web.apple.com<\n> diff --git a/LayoutTests/platform/gtk/accessibility/table-sections-expected.txt b/LayoutTests/platform/gtk/accessibility/table-sections-expected.txt index 9df4f15ef592..416366ab0179 100644 --- a/LayoutTests/platform/gtk/accessibility/table-sections-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-sections-expected.txt @@ -20,8 +20,8 @@ THEAD, TFOOT table AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 362.000000, 60.000000 } -AXSize: { 21.000000, 29.000000 } +AXPosition: { 362.000000, 63.000000 } +AXSize: { 21.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -39,8 +39,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 382.000000, 60.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 382.000000, 63.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: a @@ -58,8 +58,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 409.000000, 60.000000 } -AXSize: { 29.000000, 29.000000 } +AXPosition: { 409.000000, 63.000000 } +AXSize: { 29.000000, 30.000000 } AXTitle: AXDescription: AXValue: b @@ -81,8 +81,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 60.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 63.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -100,8 +100,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 89.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 93.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -119,8 +119,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 118.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 123.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -166,8 +166,8 @@ AXPlatformAttributes: AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 60.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 63.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -185,8 +185,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 60.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 63.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: a @@ -204,8 +204,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 60.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 63.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: b @@ -223,8 +223,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 89.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 93.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -242,8 +242,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 89.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 93.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: c @@ -261,8 +261,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 89.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 93.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: d @@ -280,8 +280,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 118.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 123.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -299,8 +299,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 118.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 123.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: c1 @@ -318,8 +318,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 118.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 123.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: d1 @@ -337,8 +337,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 147.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 153.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -356,8 +356,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 147.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 153.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: e @@ -375,8 +375,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 147.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 153.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: f @@ -406,8 +406,8 @@ Multi-TBODY table AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 60.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 63.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -425,8 +425,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 60.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 63.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: a @@ -444,8 +444,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 60.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 63.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: b @@ -467,8 +467,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 60.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 63.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -486,8 +486,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 89.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 93.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -505,8 +505,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 118.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 123.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -552,8 +552,8 @@ AXPlatformAttributes: AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 60.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 63.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -571,8 +571,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXColumnHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 60.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 63.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: a @@ -590,8 +590,8 @@ AXPlatformAttributes: computed-role:columnheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 60.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 63.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: b @@ -609,8 +609,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 89.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 93.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -628,8 +628,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 89.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 93.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: c @@ -647,8 +647,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 89.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 93.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: d @@ -666,8 +666,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXRowHeader AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 118.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 123.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -685,8 +685,8 @@ AXPlatformAttributes: computed-role:rowheader, tag:th, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 118.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 123.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: c1 @@ -704,8 +704,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 118.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 123.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: d1 @@ -723,8 +723,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 355.000000, 147.000000 } -AXSize: { 20.000000, 29.000000 } +AXPosition: { 355.000000, 153.000000 } +AXSize: { 20.000000, 30.000000 } AXTitle: AXDescription: AXValue: 1 @@ -742,8 +742,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 375.000000, 147.000000 } -AXSize: { 27.000000, 29.000000 } +AXPosition: { 375.000000, 153.000000 } +AXSize: { 27.000000, 30.000000 } AXTitle: AXDescription: AXValue: e @@ -761,8 +761,8 @@ AXPlatformAttributes: computed-role:cell, tag:td, toolkit:WebKitGtk AXRole: AXCell AXParent: AXRow AXChildren: 0 -AXPosition: { 402.000000, 147.000000 } -AXSize: { 28.000000, 29.000000 } +AXPosition: { 402.000000, 153.000000 } +AXSize: { 28.000000, 30.000000 } AXTitle: AXDescription: AXValue: f diff --git a/LayoutTests/platform/gtk/accessibility/table-with-rules-expected.txt b/LayoutTests/platform/gtk/accessibility/table-with-rules-expected.txt index 6a75407e53b6..20d6e6488607 100644 --- a/LayoutTests/platform/gtk/accessibility/table-with-rules-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/table-with-rules-expected.txt @@ -8,8 +8,8 @@ asdf asdf AXRole: AXTable AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 27.000000 } -AXSize: { 57.000000, 19.000000 } +AXPosition: { 8.000000, 28.000000 } +AXSize: { 57.000000, 20.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -26,8 +26,8 @@ AXPlatformAttributes: computed-role:table, html-id:testTable2, tag:table, toolki AXRole: AXTable AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 46.000000 } -AXSize: { 62.000000, 23.000000 } +AXPosition: { 8.000000, 48.000000 } +AXSize: { 62.000000, 24.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -44,8 +44,8 @@ AXPlatformAttributes: computed-role:table, html-id:testTable3, tag:table, toolki AXRole: AXTable AXParent: AXWebArea AXChildren: 1 -AXPosition: { 8.000000, 69.000000 } -AXSize: { 56.000000, 19.000000 } +AXPosition: { 8.000000, 72.000000 } +AXSize: { 56.000000, 20.000000 } AXTitle: AXDescription: AXFocusable: 0 @@ -62,8 +62,8 @@ AXPlatformAttributes: computed-role:table, html-id:testTable4, tag:table, toolki AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 10.000000, 90.000000 } -AXSize: { 28.000000, 19.000000 } +AXPosition: { 10.000000, 94.000000 } +AXSize: { 28.000000, 20.000000 } AXTitle: AXDescription: AXValue: asdf @@ -81,8 +81,8 @@ AXPlatformAttributes: tag:td, toolkit:WebKitGtk AXRole: AXSection AXParent: AXWebArea AXChildren: 0 -AXPosition: { 40.000000, 90.000000 } -AXSize: { 28.000000, 19.000000 } +AXPosition: { 40.000000, 94.000000 } +AXSize: { 28.000000, 20.000000 } AXTitle: AXDescription: AXValue: asdf diff --git a/LayoutTests/platform/gtk/accessibility/transformed-element-expected.txt b/LayoutTests/platform/gtk/accessibility/transformed-element-expected.txt index d1c09f5e6c26..fbb14b2062c2 100644 --- a/LayoutTests/platform/gtk/accessibility/transformed-element-expected.txt +++ b/LayoutTests/platform/gtk/accessibility/transformed-element-expected.txt @@ -3,7 +3,7 @@ AXRole: AXSection AXParent: AXWebArea AXChildren: 1 AXPosition: { 8.000000, 9.000000 } -AXSize: { 291.000000, 122.000000 } +AXSize: { 291.000000, 123.000000 } AXTitle: AXDescription: AXValue: hello diff --git a/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.png b/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.png index 5de4d978403f..522d3419ebf5 100644 Binary files a/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.png and b/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.txt b/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.txt index a855523b5153..28db2b4a9372 100644 --- a/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.txt +++ b/LayoutTests/platform/gtk/animations/3d/change-transform-in-end-event-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x159 - RenderBlock {HTML} at (0,0) size 800x159 - RenderBody {BODY} at (8,16) size 784x135 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x160 + RenderBlock {HTML} at (0,0) size 800x160 + RenderBody {BODY} at (8,16) size 784x136 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 399x17 text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." - RenderBlock {DIV} at (0,135) size 784x0 -layer at (8,49) size 402x102 - RenderBlock (relative positioned) {DIV} at (0,33) size 402x102 [border: (1px solid #000000)] -layer at (159,50) size 100x100 + RenderBlock {DIV} at (0,136) size 784x0 +layer at (8,50) size 402x102 + RenderBlock (relative positioned) {DIV} at (0,34) size 402x102 [border: (1px solid #000000)] +layer at (159,51) size 100x100 RenderBlock (positioned) {DIV} at (151,1) size 100x100 [bgcolor=#FF0000] -layer at (9,50) size 100x100 +layer at (9,51) size 100x100 RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.png b/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.png index 4679952736f4..3dd2411eef31 100644 Binary files a/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.png and b/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.txt b/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.txt index 38286ecf60de..ffe215876bba 100644 --- a/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.txt +++ b/LayoutTests/platform/gtk/animations/3d/matrix-transform-type-animation-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,8) size 784x117 - RenderBlock {DIV} at (0,100) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,8) size 784x118 + RenderBlock {DIV} at (0,100) size 784x18 RenderText {#text} at (0,0) size 568x17 text run at (0,0) width 568: "PASS - \"webkitTransform.4\" property for \"box\" element at 1s saw something close to: 50" RenderBR {BR} at (568,0) size 0x17 diff --git a/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.png b/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.png index 1204ce1ad324..66525400af30 100644 Binary files a/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.png and b/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.txt b/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.txt index 4b4774cb0596..dae86b9d6ac8 100644 --- a/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.txt +++ b/LayoutTests/platform/gtk/animations/3d/state-at-end-event-transform-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x159 - RenderBlock {HTML} at (0,0) size 800x159 - RenderBody {BODY} at (8,16) size 784x135 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x160 + RenderBlock {HTML} at (0,0) size 800x160 + RenderBody {BODY} at (8,16) size 784x136 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 399x17 text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." - RenderBlock {DIV} at (0,135) size 784x0 -layer at (8,49) size 402x102 - RenderBlock (relative positioned) {DIV} at (0,33) size 402x102 [border: (1px solid #000000)] -layer at (9,50) size 100x100 + RenderBlock {DIV} at (0,136) size 784x0 +layer at (8,50) size 402x102 + RenderBlock (relative positioned) {DIV} at (0,34) size 402x102 [border: (1px solid #000000)] +layer at (9,51) size 100x100 RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#FF0000] -layer at (9,50) size 100x100 +layer at (9,51) size 100x100 RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.png b/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.png index a4f1f041b0ae..50296e3a155a 100644 Binary files a/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.png and b/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.txt b/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.txt index 22626ad5dbec..7aa45de2f016 100644 --- a/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.txt +++ b/LayoutTests/platform/gtk/animations/additive-transform-animations-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,8) size 784x117 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,8) size 784x118 layer at (8,8) size 100x100 RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#0000FF] -layer at (8,108) size 784x17 - RenderBlock {DIV} at (0,100) size 784x17 +layer at (8,108) size 784x18 + RenderBlock {DIV} at (0,100) size 784x18 RenderText {#text} at (0,0) size 629x17 text run at (0,0) width 629: "PASS - \"webkitTransform\" property for \"box\" element at 1s saw something close to: 0,1,-1,0,0,100" RenderBR {BR} at (629,0) size 0x17 diff --git a/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.png b/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.png index 6f092634b43d..cc85f1d82c15 100644 Binary files a/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.png and b/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.txt b/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.txt index 8f35a32015cd..e5c38a8dd177 100644 --- a/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.txt +++ b/LayoutTests/platform/gtk/animations/cross-fade-border-image-source-expected.txt @@ -3,17 +3,17 @@ layer 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 - RenderBlock {DIV} at (0,0) size 784x68 - RenderText {#text} at (0,0) size 756x34 + RenderBlock {DIV} at (0,0) size 784x72 + RenderText {#text} at (0,0) size 756x35 text run at (0,0) width 756: "PASS - \"borderImageSource\" property for \"box\" element at 2.5s saw something close to: -webkit-cross-fade(url(stripes-" - text run at (0,17) width 217: "100.png), url(green-100.png), 0.5)" - RenderBR {BR} at (217,31) size 0x0 - RenderText {#text} at (0,34) size 714x17 - text run at (0,34) width 714: "PASS - \"borderImageSource\" property for \"box\" and \"boxStatic\" elements at 2.5s are close enough to each other" - RenderBR {BR} at (714,48) size 0x0 - RenderText {#text} at (0,51) size 779x17 - text run at (0,51) width 779: "PASS - \"borderImageSource\" property for \"boxShorthand\" and \"boxStatic\" elements at 2.5s are close enough to each other" - RenderBR {BR} at (779,65) size 0x0 + text run at (0,18) width 217: "100.png), url(green-100.png), 0.5)" + RenderBR {BR} at (217,32) size 0x0 + RenderText {#text} at (0,36) size 714x17 + text run at (0,36) width 714: "PASS - \"borderImageSource\" property for \"box\" and \"boxStatic\" elements at 2.5s are close enough to each other" + RenderBR {BR} at (714,50) size 0x0 + RenderText {#text} at (0,54) size 779x17 + text run at (0,54) width 779: "PASS - \"borderImageSource\" property for \"boxShorthand\" and \"boxStatic\" elements at 2.5s are close enough to each other" + RenderBR {BR} at (779,68) size 0x0 layer at (100,100) size 106x106 RenderBlock (positioned) {DIV} at (100,100) size 106x106 [bgcolor=#008000] [border: (3px none #000000)] layer at (100,250) size 106x106 diff --git a/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.png b/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.png index 9a9a2b68367f..78d179d814fe 100644 Binary files a/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.png and b/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.txt b/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.txt index f78bae831535..87cc5528581d 100644 --- a/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.txt +++ b/LayoutTests/platform/gtk/animations/cross-fade-list-style-image-expected.txt @@ -3,44 +3,44 @@ layer 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 - RenderBlock {DIV} at (0,0) size 784x68 - RenderText {#text} at (0,0) size 769x34 + RenderBlock {DIV} at (0,0) size 784x72 + RenderText {#text} at (0,0) size 769x35 text run at (0,0) width 769: "PASS - \"listStyleImage\" property for \"box\" element at 2.5s saw something close to: -webkit-cross-fade(url(blue-100.png)," - text run at (0,17) width 161: "url(green-100.png), 50%)" - RenderBR {BR} at (161,31) size 0x0 - RenderText {#text} at (0,34) size 679x17 - text run at (0,34) width 679: "PASS - \"listStyleImage\" property for \"box\" and \"boxStatic\" elements at 2.5s are close enough to each other" - RenderBR {BR} at (679,48) size 0x0 - RenderText {#text} at (0,51) size 744x17 - text run at (0,51) width 744: "PASS - \"listStyleImage\" property for \"boxShorthand\" and \"boxStatic\" elements at 2.5s are close enough to each other" - RenderBR {BR} at (744,65) size 0x0 + text run at (0,18) width 161: "url(green-100.png), 50%)" + RenderBR {BR} at (161,32) size 0x0 + RenderText {#text} at (0,36) size 679x17 + text run at (0,36) width 679: "PASS - \"listStyleImage\" property for \"box\" and \"boxStatic\" elements at 2.5s are close enough to each other" + RenderBR {BR} at (679,50) size 0x0 + RenderText {#text} at (0,54) size 744x17 + text run at (0,54) width 744: "PASS - \"listStyleImage\" property for \"boxShorthand\" and \"boxStatic\" elements at 2.5s are close enough to each other" + RenderBR {BR} at (744,68) size 0x0 layer at (100,116) size 140x100 RenderBlock (positioned) {UL} at (100,116) size 140x100 - RenderListItem {LI} at (40,0) size 100x103 + RenderListItem {LI} at (40,0) size 100x104 RenderListMarker at (-107,0) size 100x100 RenderText {#text} at (0,86) size 23x17 text run at (0,86) width 23: "one" - RenderListItem {LI} at (40,103) size 100x103 + RenderListItem {LI} at (40,104) size 100x104 RenderListMarker at (-107,0) size 100x100 RenderText {#text} at (0,86) size 24x17 text run at (0,86) width 24: "two" layer at (100,366) size 140x100 RenderBlock (positioned) {UL} at (100,366) size 140x100 - RenderListItem {LI} at (40,0) size 100x103 + RenderListItem {LI} at (40,0) size 100x104 RenderListMarker at (-107,0) size 100x100 RenderText {#text} at (0,86) size 23x17 text run at (0,86) width 23: "one" - RenderListItem {LI} at (40,103) size 100x103 + RenderListItem {LI} at (40,104) size 100x104 RenderListMarker at (-107,0) size 100x100 RenderText {#text} at (0,86) size 24x17 text run at (0,86) width 24: "two" layer at (400,116) size 140x100 RenderBlock (positioned) {UL} at (400,116) size 140x100 - RenderListItem {LI} at (40,0) size 100x103 + RenderListItem {LI} at (40,0) size 100x104 RenderListMarker at (-107,0) size 100x100 RenderText {#text} at (0,86) size 23x17 text run at (0,86) width 23: "one" - RenderListItem {LI} at (40,103) size 100x103 + RenderListItem {LI} at (40,104) size 100x104 RenderListMarker at (-107,0) size 100x100 RenderText {#text} at (0,86) size 24x17 text run at (0,86) width 24: "two" diff --git a/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.png b/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.png index f85da895999f..89b429f49b53 100644 Binary files a/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.png and b/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.txt b/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.txt index ee09edd04a52..facdc5d945bc 100644 --- a/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.txt +++ b/LayoutTests/platform/gtk/animations/cross-fade-webkit-mask-box-image-expected.txt @@ -3,14 +3,14 @@ layer 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 - RenderBlock {DIV} at (0,0) size 784x51 - RenderText {#text} at (0,0) size 784x34 + RenderBlock {DIV} at (0,0) size 784x54 + RenderText {#text} at (0,0) size 784x35 text run at (0,0) width 784: "PASS - \"webkitMaskBoxImage\" property for \"box\" element at 2.25s saw something close to: -webkit-cross-fade(url(stripes-" - text run at (0,17) width 226: "100.png), url(green-100.png), 25%)" - RenderBR {BR} at (226,31) size 0x0 - RenderText {#text} at (0,34) size 742x17 - text run at (0,34) width 742: "PASS - \"webkitMaskBoxImage\" property for \"box\" and \"boxStatic\" elements at 2.25s are close enough to each other" - RenderBR {BR} at (742,48) size 0x0 + text run at (0,18) width 226: "100.png), url(green-100.png), 25%)" + RenderBR {BR} at (226,32) size 0x0 + RenderText {#text} at (0,36) size 742x17 + text run at (0,36) width 742: "PASS - \"webkitMaskBoxImage\" property for \"box\" and \"boxStatic\" elements at 2.25s are close enough to each other" + RenderBR {BR} at (742,50) size 0x0 layer at (100,100) size 200x200 RenderImage {IMG} at (100,100) size 200x200 [bgcolor=#FF0000] layer at (100,300) size 200x200 diff --git a/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.png b/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.png index b0961311d1de..ee0761a846e5 100644 Binary files a/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.png and b/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.txt b/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.txt index 50085b607109..d76d4125d082 100644 --- a/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.txt +++ b/LayoutTests/platform/gtk/animations/missing-values-first-keyframe-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x234 - RenderBlock {HTML} at (0,0) size 800x234 - RenderBody {BODY} at (0,0) size 800x234 - RenderBlock {DIV} at (0,200) size 800x34 +layer at (0,0) size 800x236 + RenderBlock {HTML} at (0,0) size 800x236 + RenderBody {BODY} at (0,0) size 800x236 + RenderBlock {DIV} at (0,200) size 800x36 RenderText {#text} at (0,0) size 495x17 text run at (0,0) width 495: "PASS - \"left\" property for \"box1\" element at 0.5s saw something close to: 100" RenderBR {BR} at (495,0) size 0x17 - RenderText {#text} at (0,17) size 596x17 - text run at (0,17) width 596: "PASS - \"webkitTransform.4\" property for \"box2\" element at 0.5s saw something close to: 100" - RenderBR {BR} at (596,17) size 0x17 + RenderText {#text} at (0,18) size 596x17 + text run at (0,18) width 596: "PASS - \"webkitTransform.4\" property for \"box2\" element at 0.5s saw something close to: 100" + RenderBR {BR} at (596,18) size 0x17 layer at (100,0) size 100x100 RenderBlock (positioned) {DIV} at (100,0) size 100x100 [bgcolor=#FF0000] layer at (100,100) size 100x100 diff --git a/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.png b/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.png index b0961311d1de..f3da8a912502 100644 Binary files a/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.png and b/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.txt b/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.txt index f741255252a1..4c393f49fa48 100644 --- a/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.txt +++ b/LayoutTests/platform/gtk/animations/missing-values-last-keyframe-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x234 - RenderBlock {HTML} at (0,0) size 800x234 - RenderBody {BODY} at (0,0) size 800x234 - RenderBlock {DIV} at (0,200) size 800x34 +layer at (0,0) size 800x236 + RenderBlock {HTML} at (0,0) size 800x236 + RenderBody {BODY} at (0,0) size 800x236 + RenderBlock {DIV} at (0,200) size 800x36 RenderText {#text} at (0,0) size 495x17 text run at (0,0) width 495: "PASS - \"left\" property for \"box1\" element at 1.5s saw something close to: 100" RenderBR {BR} at (495,0) size 0x17 - RenderText {#text} at (0,17) size 596x17 - text run at (0,17) width 596: "PASS - \"webkitTransform.4\" property for \"box2\" element at 1.5s saw something close to: 100" - RenderBR {BR} at (596,17) size 0x17 + RenderText {#text} at (0,18) size 596x17 + text run at (0,18) width 596: "PASS - \"webkitTransform.4\" property for \"box2\" element at 1.5s saw something close to: 100" + RenderBR {BR} at (596,18) size 0x17 layer at (100,0) size 100x100 RenderBlock (positioned) {DIV} at (100,0) size 100x100 [bgcolor=#FF0000] layer at (100,100) size 100x100 diff --git a/LayoutTests/platform/gtk/animations/state-at-end-event-expected.png b/LayoutTests/platform/gtk/animations/state-at-end-event-expected.png index 1204ce1ad324..66525400af30 100644 Binary files a/LayoutTests/platform/gtk/animations/state-at-end-event-expected.png and b/LayoutTests/platform/gtk/animations/state-at-end-event-expected.png differ diff --git a/LayoutTests/platform/gtk/animations/state-at-end-event-expected.txt b/LayoutTests/platform/gtk/animations/state-at-end-event-expected.txt index 4b4774cb0596..dae86b9d6ac8 100644 --- a/LayoutTests/platform/gtk/animations/state-at-end-event-expected.txt +++ b/LayoutTests/platform/gtk/animations/state-at-end-event-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x159 - RenderBlock {HTML} at (0,0) size 800x159 - RenderBody {BODY} at (8,16) size 784x135 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x160 + RenderBlock {HTML} at (0,0) size 800x160 + RenderBody {BODY} at (8,16) size 784x136 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 399x17 text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." - RenderBlock {DIV} at (0,135) size 784x0 -layer at (8,49) size 402x102 - RenderBlock (relative positioned) {DIV} at (0,33) size 402x102 [border: (1px solid #000000)] -layer at (9,50) size 100x100 + RenderBlock {DIV} at (0,136) size 784x0 +layer at (8,50) size 402x102 + RenderBlock (relative positioned) {DIV} at (0,34) size 402x102 [border: (1px solid #000000)] +layer at (9,51) size 100x100 RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#FF0000] -layer at (9,50) size 100x100 +layer at (9,51) size 100x100 RenderBlock (positioned) {DIV} at (1,1) size 100x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/gtk/css1/basic/containment-expected.png b/LayoutTests/platform/gtk/css1/basic/containment-expected.png index df08096c088f..cd268f775f2b 100644 Binary files a/LayoutTests/platform/gtk/css1/basic/containment-expected.png and b/LayoutTests/platform/gtk/css1/basic/containment-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/basic/containment-expected.txt b/LayoutTests/platform/gtk/css1/basic/containment-expected.txt index fe23b8663882..1f69e2d20658 100644 --- a/LayoutTests/platform/gtk/css1/basic/containment-expected.txt +++ b/LayoutTests/platform/gtk/css1/basic/containment-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x944 +layer at (0,0) size 785x961 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x944 - RenderBlock {HTML} at (0,0) size 785x944 - RenderBody {BODY} at (8,8) size 769x928 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x961 + RenderBlock {HTML} at (0,0) size 785x961 + RenderBody {BODY} at (8,8) size 769x945 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x150 + RenderBlock {PRE} at (0,34) size 769x150 RenderText {#text} at (0,0) size 728x150 text run at (0,0) width 624: "" text run at (0,15) width 728: "" @@ -18,8 +18,8 @@ layer at (0,0) size 785x944 text run at (0,105) width 32: "" - RenderBlock {HR} at (0,196) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,214) size 769x18 + RenderBlock {HR} at (0,197) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,215) size 769x18 RenderText {#text} at (0,0) size 404x17 text run at (0,0) width 404: "This sentence should be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 96x15 @@ -27,7 +27,7 @@ layer at (0,0) size 785x944 text run at (404,3) width 96: "linktest.css" RenderText {#text} at (500,0) size 254x17 text run at (500,0) width 254: ", the reference to which is shown above." - RenderBlock {P} at (0,248) size 769x35 + RenderBlock {P} at (0,249) size 769x36 RenderText {#text} at (0,0) size 442x17 text run at (0,0) width 442: "This sentence should NOT be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 104x15 @@ -41,7 +41,7 @@ layer at (0,0) size 785x944 RenderText {#text} at (595,0) size 741x35 text run at (595,0) width 146: " the external style sheet" text run at (0,18) width 325: "\"Alternate SS\" has been selected via the user agent." - RenderBlock {UL} at (0,299) size 769x54 [color=#FF0000] + RenderBlock {UL} at (0,301) size 769x54 [color=#FF0000] RenderListItem {LI} at (40,0) size 729x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 390x17 @@ -69,52 +69,52 @@ layer at (0,0) size 785x944 text run at (393,3) width 168: "STYLE=\"color: green;\"" RenderText {#text} at (561,0) size 9x17 text run at (561,0) width 9: "]." - RenderBlock {P} at (0,369) size 769x17 [color=#800080] + RenderBlock {P} at (0,371) size 769x18 [color=#800080] RenderText {#text} at (0,0) size 500x17 text run at (0,0) width 500: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - RenderBlock {OL} at (0,402) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {OL} at (0,405) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-20,0) size 16x17: "1" RenderText {#text} at (0,0) size 201x17 text run at (0,0) width 201: "This list should NOT be purple." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-20,0) size 16x17: "2" RenderText {#text} at (0,0) size 172x17 text run at (0,0) width 172: "It should, instead, be black." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-20,0) size 16x17: "3" RenderText {#text} at (0,0) size 501x17 text run at (0,0) width 501: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - RenderBlock {P} at (0,469) size 769x35 + RenderBlock {P} at (0,475) size 769x36 RenderText {#text} at (0,0) size 697x17 text run at (0,0) width 197: "This sentence should be black. " text run at (197,0) width 500: "If it is red, then the browser has inappropriately imported the styles from the file" RenderInline {TT} at (0,0) size 96x15 - RenderText {#text} at (0,20) size 96x15 - text run at (0,20) width 96: "imptest2.css" - RenderText {#text} at (96,17) size 33x17 - text run at (96,17) width 33: " (see " + RenderText {#text} at (0,21) size 96x15 + text run at (0,21) width 96: "imptest2.css" + RenderText {#text} at (96,18) size 33x17 + text run at (96,18) width 33: " (see " RenderInline {A} at (0,0) size 68x17 [color=#0000FF] - RenderText {#text} at (129,17) size 68x17 - text run at (129,17) width 68: "section 3.0" - RenderText {#text} at (197,17) size 275x17 - text run at (197,17) width 275: " of the CSS1 specification for more details)." - RenderBlock {P} at (0,520) size 769x17 [color=#008000] + RenderText {#text} at (129,18) size 68x17 + text run at (129,18) width 68: "section 3.0" + RenderText {#text} at (197,18) size 275x17 + text run at (197,18) width 275: " of the CSS1 specification for more details)." + RenderBlock {P} at (0,527) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This paragraph should be green." - RenderTable {TABLE} at (0,553) size 769x375 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x373 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,561) size 769x384 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x382 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x348 - RenderTableCell {TD} at (0,186) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x35 + RenderTableRow {TR} at (0,26) size 767x356 + RenderTableCell {TD} at (0,191) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x356 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 RenderText {#text} at (0,0) size 404x17 text run at (0,0) width 404: "This sentence should be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 96x15 @@ -123,7 +123,7 @@ layer at (0,0) size 785x944 RenderText {#text} at (500,0) size 708x35 text run at (500,0) width 208: ", the reference to which is shown" text run at (0,18) width 42: "above." - RenderBlock {P} at (4,55) size 747x35 + RenderBlock {P} at (4,56) size 747x36 RenderText {#text} at (0,0) size 442x17 text run at (0,0) width 442: "This sentence should NOT be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 104x15 @@ -137,7 +137,7 @@ layer at (0,0) size 785x944 RenderText {#text} at (595,0) size 741x35 text run at (595,0) width 146: " the external style sheet" text run at (0,18) width 325: "\"Alternate SS\" has been selected via the user agent." - RenderBlock {UL} at (4,106) size 747x54 [color=#FF0000] + RenderBlock {UL} at (4,108) size 747x54 [color=#FF0000] RenderListItem {LI} at (40,0) size 707x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 390x17 @@ -165,36 +165,36 @@ layer at (0,0) size 785x944 text run at (393,3) width 168: "STYLE=\"color: green;\"" RenderText {#text} at (561,0) size 9x17 text run at (561,0) width 9: "]." - RenderBlock {P} at (4,176) size 747x17 [color=#800080] + RenderBlock {P} at (4,178) size 747x18 [color=#800080] RenderText {#text} at (0,0) size 500x17 text run at (0,0) width 500: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - RenderBlock {OL} at (4,209) size 747x51 - RenderListItem {LI} at (40,0) size 707x17 + RenderBlock {OL} at (4,212) size 747x54 + RenderListItem {LI} at (40,0) size 707x18 RenderListMarker at (-20,0) size 16x17: "1" RenderText {#text} at (0,0) size 201x17 text run at (0,0) width 201: "This list should NOT be purple." - RenderListItem {LI} at (40,17) size 707x17 + RenderListItem {LI} at (40,18) size 707x18 RenderListMarker at (-20,0) size 16x17: "2" RenderText {#text} at (0,0) size 172x17 text run at (0,0) width 172: "It should, instead, be black." - RenderListItem {LI} at (40,34) size 707x17 + RenderListItem {LI} at (40,36) size 707x18 RenderListMarker at (-20,0) size 16x17: "3" RenderText {#text} at (0,0) size 501x17 text run at (0,0) width 501: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - RenderBlock {P} at (4,276) size 747x35 + RenderBlock {P} at (4,282) size 747x36 RenderText {#text} at (0,0) size 697x17 text run at (0,0) width 197: "This sentence should be black. " text run at (197,0) width 500: "If it is red, then the browser has inappropriately imported the styles from the file" RenderInline {TT} at (0,0) size 96x15 - RenderText {#text} at (0,20) size 96x15 - text run at (0,20) width 96: "imptest2.css" - RenderText {#text} at (96,17) size 33x17 - text run at (96,17) width 33: " (see " + RenderText {#text} at (0,21) size 96x15 + text run at (0,21) width 96: "imptest2.css" + RenderText {#text} at (96,18) size 33x17 + text run at (96,18) width 33: " (see " RenderInline {A} at (0,0) size 68x17 [color=#0000FF] - RenderText {#text} at (129,17) size 68x17 - text run at (129,17) width 68: "section 3.0" - RenderText {#text} at (197,17) size 275x17 - text run at (197,17) width 275: " of the CSS1 specification for more details)." - RenderBlock {P} at (4,327) size 747x17 [color=#008000] + RenderText {#text} at (129,18) size 68x17 + text run at (129,18) width 68: "section 3.0" + RenderText {#text} at (197,18) size 275x17 + text run at (197,18) width 275: " of the CSS1 specification for more details)." + RenderBlock {P} at (4,334) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This paragraph should be green." diff --git a/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.png b/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.png index fd5100826a3e..8b269ecdcf2d 100644 Binary files a/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.png and b/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.txt b/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.txt index 4bb8803434c2..22087521f3b1 100644 --- a/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.txt +++ b/LayoutTests/platform/gtk/css1/basic/contextual_selectors-expected.txt @@ -3,20 +3,20 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 472x60 text run at (0,0) width 288: "P {color: navy; font-family: serif;}" text run at (0,15) width 472: "HTML BODY TABLE P {color: purple; font-family: sans-serif;}" text run at (0,30) width 224: "EM, UL LI LI {color: green;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x17 [color=#000080] + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 625x17 text run at (0,0) width 625: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - RenderBlock {P} at (0,157) size 784x17 [color=#000080] + RenderBlock {P} at (0,159) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 559x17 text run at (0,0) width 559: "This sentence should be normal for its section, except for the last word, which should be " RenderInline {EM} at (0,0) size 36x17 [color=#008000] @@ -24,9 +24,9 @@ layer at (0,0) size 800x600 text run at (559,0) width 36: "green" RenderText {#text} at (595,0) size 4x17 text run at (595,0) width 4: "." - RenderBlock {UL} at (0,190) size 784x34 - RenderListItem {LI} at (40,0) size 744x34 - RenderBlock (anonymous) at (0,0) size 744x17 + RenderBlock {UL} at (0,193) size 784x36 + RenderListItem {LI} at (40,0) size 744x36 + RenderBlock (anonymous) at (0,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderInline {EM} at (0,0) size 39x17 [color=#008000] RenderText {#text} at (0,0) size 39x17 @@ -34,27 +34,27 @@ layer at (0,0) size 800x600 RenderText {#text} at (39,0) size 399x17 text run at (39,0) width 4: " " text run at (43,0) width 395: "The first \"hello\" should be green, but this part should be black." - RenderBlock {UL} at (0,17) size 744x17 - RenderListItem {LI} at (40,0) size 704x17 [color=#008000] + RenderBlock {UL} at (0,18) size 744x18 + RenderListItem {LI} at (40,0) size 704x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderTable {TABLE} at (0,240) size 722x151 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 720x149 - RenderTableRow {TR} at (0,0) size 720x25 - RenderTableCell {TD} at (0,0) size 720x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,245) size 722x156 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 720x154 + RenderTableRow {TR} at (0,0) size 720x26 + RenderTableCell {TD} at (0,0) size 720x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 720x124 - RenderTableCell {TD} at (0,74) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 708x124 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 700x17 [color=#800080] + RenderTableRow {TR} at (0,26) size 720x128 + RenderTableCell {TD} at (0,77) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 708x128 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 700x18 [color=#800080] RenderText {#text} at (0,0) size 700x17 text run at (0,0) width 700: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - RenderBlock {P} at (4,37) size 700x17 [color=#800080] + RenderBlock {P} at (4,38) size 700x18 [color=#800080] RenderText {#text} at (0,0) size 623x17 text run at (0,0) width 623: "This sentence should be normal for its section, except for the last word, which should be " RenderInline {EM} at (0,0) size 41x17 [color=#008000] @@ -62,9 +62,9 @@ layer at (0,0) size 800x600 text run at (623,0) width 41: "green" RenderText {#text} at (664,0) size 4x17 text run at (664,0) width 4: "." - RenderBlock {UL} at (4,70) size 700x34 - RenderListItem {LI} at (40,0) size 660x34 - RenderBlock (anonymous) at (0,0) size 660x17 + RenderBlock {UL} at (4,72) size 700x36 + RenderListItem {LI} at (40,0) size 660x36 + RenderBlock (anonymous) at (0,0) size 660x18 RenderListMarker at (-17,0) size 7x17: bullet RenderInline {EM} at (0,0) size 39x17 [color=#008000] RenderText {#text} at (0,0) size 39x17 @@ -72,8 +72,8 @@ layer at (0,0) size 800x600 RenderText {#text} at (39,0) size 399x17 text run at (39,0) width 4: " " text run at (43,0) width 395: "The first \"hello\" should be green, but this part should be black." - RenderBlock {UL} at (0,17) size 660x17 - RenderListItem {LI} at (40,0) size 620x17 [color=#008000] + RenderBlock {UL} at (0,18) size 660x18 + RenderListItem {LI} at (40,0) size 620x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css1/basic/grouping-expected.png b/LayoutTests/platform/gtk/css1/basic/grouping-expected.png index 1fece37c38ae..654daef89b80 100644 Binary files a/LayoutTests/platform/gtk/css1/basic/grouping-expected.png and b/LayoutTests/platform/gtk/css1/basic/grouping-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/basic/grouping-expected.txt b/LayoutTests/platform/gtk/css1/basic/grouping-expected.txt index 9486810bd80e..d1ae71ec44f5 100644 --- a/LayoutTests/platform/gtk/css1/basic/grouping-expected.txt +++ b/LayoutTests/platform/gtk/css1/basic/grouping-expected.txt @@ -3,41 +3,41 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x30 + RenderBlock {PRE} at (0,34) size 784x30 RenderText {#text} at (0,0) size 272x30 text run at (0,0) width 272: ".one, .two, .three {color: green;}" text run at (0,15) width 0: " " - RenderBlock {HR} at (0,76) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 784x17 [color=#008000] + RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,127) size 784x17 [color=#008000] + RenderBlock {P} at (0,129) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,160) size 784x17 [color=#008000] + RenderBlock {P} at (0,163) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderTable {TABLE} at (0,193) size 216x118 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 214x116 - RenderTableRow {TR} at (0,0) size 214x25 - RenderTableCell {TD} at (0,0) size 214x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,197) size 216x122 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 214x120 + RenderTableRow {TR} at (0,0) size 214x26 + RenderTableCell {TD} at (0,0) size 214x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 214x91 - RenderTableCell {TD} at (0,58) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 214x94 + RenderTableCell {TD} at (0,60) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 202x91 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 194x17 [color=#008000] + RenderTableCell {TD} at (12,26) size 202x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 194x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,37) size 194x17 [color=#008000] + RenderBlock {P} at (4,38) size 194x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,70) size 194x17 [color=#008000] + RenderBlock {P} at (4,72) size 194x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.png b/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.png index 68eaf3af7cc2..bd4a9c230783 100644 Binary files a/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.png and b/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.txt b/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.txt index f268f86e37bc..f531ef8ad8a8 100644 --- a/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.txt +++ b/LayoutTests/platform/gtk/css1/basic/id_as_selector-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x619 +layer at (0,0) size 785x627 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x619 - RenderBlock {HTML} at (0,0) size 785x619 - RenderBody {BODY} at (8,8) size 769x603 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x627 + RenderBlock {HTML} at (0,0) size 785x627 + RenderBody {BODY} at (8,8) size 769x611 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x120 + RenderBlock {PRE} at (0,34) size 769x120 RenderText {#text} at (0,0) size 272x120 text run at (0,0) width 160: "#one {color: green;}" text run at (0,15) width 152: "#a1 {color: green;}" @@ -16,14 +16,14 @@ layer at (0,0) size 785x619 text run at (0,75) width 152: "#a2 {color: green;}" text run at (0,90) width 240: "P#five, P#five2 {color: blue;}" text run at (0,105) width 240: "P#six, P#six2 {color: purple;}" - RenderBlock {HR} at (0,166) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,184) size 769x17 [color=#008000] + RenderBlock {HR} at (0,167) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,185) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,217) size 769x17 [color=#008000] + RenderBlock {P} at (0,219) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,250) size 769x18 [color=#0000FF] + RenderBlock {P} at (0,253) size 769x18 [color=#0000FF] RenderText {#text} at (0,0) size 200x17 text run at (0,0) width 200: "This paragraph should be blue [" RenderInline {TT} at (0,0) size 64x15 @@ -31,36 +31,36 @@ layer at (0,0) size 785x619 text run at (200,3) width 64: "ID=\"two\"" RenderText {#text} at (264,0) size 9x17 text run at (264,0) width 9: "]." - RenderBlock {PRE} at (0,284) size 769x15 + RenderBlock {PRE} at (0,287) size 769x15 RenderText {#text} at (0,0) size 392x15 text run at (0,0) width 392: "This sentence should NOT be blue [PRE ID=\"two2\"]." - RenderBlock {PRE} at (0,312) size 769x15 + RenderBlock {PRE} at (0,315) size 769x15 RenderText {#text} at (0,0) size 472x15 text run at (0,0) width 472: "This sentence should be black, not purple [PRE ID=\"three\"]." - RenderBlock {UL} at (0,343) size 769x17 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {UL} at (0,346) size 769x18 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 237x17 text run at (0,0) width 237: "This sentence should NOT be purple." - RenderTable {TABLE} at (0,376) size 422x227 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 420x225 - RenderTableRow {TR} at (0,0) size 420x25 - RenderTableCell {TD} at (0,0) size 420x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,380) size 422x231 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 420x229 + RenderTableRow {TR} at (0,0) size 420x26 + RenderTableCell {TD} at (0,0) size 420x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 420x200 - RenderTableCell {TD} at (0,112) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 420x203 + RenderTableCell {TD} at (0,114) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 408x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 400x17 [color=#008000] + RenderTableCell {TD} at (12,26) size 408x203 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 400x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,37) size 400x17 [color=#008000] + RenderBlock {P} at (4,38) size 400x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,70) size 400x18 [color=#0000FF] + RenderBlock {P} at (4,72) size 400x18 [color=#0000FF] RenderText {#text} at (0,0) size 200x17 text run at (0,0) width 200: "This paragraph should be blue [" RenderInline {TT} at (0,0) size 72x15 @@ -68,14 +68,14 @@ layer at (0,0) size 785x619 text run at (200,3) width 72: "ID=\"five\"" RenderText {#text} at (272,0) size 9x17 text run at (272,0) width 9: "]." - RenderBlock {PRE} at (4,104) size 400x15 + RenderBlock {PRE} at (4,106) size 400x15 RenderText {#text} at (0,0) size 400x15 text run at (0,0) width 400: "This sentence should NOT be blue [PRE ID=\"five2\"]." - RenderBlock {PRE} at (4,132) size 400x15 + RenderBlock {PRE} at (4,134) size 400x15 RenderText {#text} at (0,0) size 360x15 text run at (0,0) width 360: "This sentence should be black [PRE ID=\"six\"]." - RenderBlock {UL} at (4,163) size 400x17 - RenderListItem {LI} at (40,0) size 360x17 + RenderBlock {UL} at (4,165) size 400x18 + RenderListItem {LI} at (40,0) size 360x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 237x17 text run at (0,0) width 237: "This sentence should NOT be purple." diff --git a/LayoutTests/platform/gtk/css1/basic/inheritance-expected.png b/LayoutTests/platform/gtk/css1/basic/inheritance-expected.png index 2c28a07547e5..4ef6c69a9894 100644 Binary files a/LayoutTests/platform/gtk/css1/basic/inheritance-expected.png and b/LayoutTests/platform/gtk/css1/basic/inheritance-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/basic/inheritance-expected.txt b/LayoutTests/platform/gtk/css1/basic/inheritance-expected.txt index ecce3ac30d70..aabb59e5a4c4 100644 --- a/LayoutTests/platform/gtk/css1/basic/inheritance-expected.txt +++ b/LayoutTests/platform/gtk/css1/basic/inheritance-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x718 +layer at (0,0) size 785x730 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x718 - RenderBlock {HTML} at (0,0) size 785x719 - RenderBody {BODY} at (8,8) size 769x703 [color=#008000] [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x730 + RenderBlock {HTML} at (0,0) size 785x731 + RenderBody {BODY} at (8,8) size 769x715 [color=#008000] [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x105 + RenderBlock {PRE} at (0,34) size 769x105 RenderText {#text} at (0,0) size 272x105 text run at (0,0) width 160: "BODY {color: green;}" text run at (0,15) width 136: "H3 {color: blue;}" @@ -15,8 +15,8 @@ layer at (0,0) size 785x718 text run at (0,60) width 272: ".two {text-decoration: underline;}" text run at (0,75) width 152: "#two {color: navy;}" text run at (0,90) width 184: ".three {color: purple;}" - RenderBlock {HR} at (0,151) size 769x2 [border: (1px inset #008000)] - RenderBlock {H3} at (0,171) size 769x22 [color=#0000FF] + RenderBlock {HR} at (0,152) size 769x2 [border: (1px inset #008000)] + RenderBlock {H3} at (0,172) size 769x23 [color=#0000FF] RenderText {#text} at (0,0) size 220x21 text run at (0,0) width 220: "This sentence should show " RenderInline {STRONG} at (0,0) size 35x21 @@ -29,7 +29,7 @@ layer at (0,0) size 785x718 text run at (297,0) width 51: "purple" RenderText {#text} at (348,0) size 5x21 text run at (348,0) width 5: "." - RenderBlock {H3} at (0,211) size 769x22 [color=#0000FF] + RenderBlock {H3} at (0,213) size 769x23 [color=#0000FF] RenderText {#text} at (0,0) size 197x21 text run at (0,0) width 197: "This sentence should be " RenderInline {SPAN} at (0,0) size 34x21 @@ -37,7 +37,7 @@ layer at (0,0) size 785x718 text run at (197,0) width 34: "blue" RenderText {#text} at (231,0) size 104x21 text run at (231,0) width 104: " throughout." - RenderBlock {P} at (0,251) size 769x18 + RenderBlock {P} at (0,254) size 769x19 RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "This should be green except for the " RenderInline {EM} at (0,0) size 117x17 [color=#800080] @@ -45,10 +45,10 @@ layer at (0,0) size 785x718 text run at (226,0) width 117: "emphasized words" RenderText {#text} at (343,0) size 160x17 text run at (343,0) width 160: ", which should be purple." - RenderBlock {H3} at (0,286) size 769x22 [color=#0000FF] + RenderBlock {H3} at (0,290) size 769x23 [color=#0000FF] RenderText {#text} at (0,0) size 296x21 text run at (0,0) width 296: "This should be blue and underlined." - RenderBlock {P} at (0,326) size 769x19 + RenderBlock {P} at (0,331) size 769x19 RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "This sentence should be underlined, including " RenderInline {TT} at (0,0) size 72x15 @@ -71,7 +71,7 @@ layer at (0,0) size 785x718 text run at (520,0) width 57: "this part" RenderText {#text} at (577,0) size 4x17 text run at (577,0) width 4: "." - RenderBlock {P} at (0,360) size 769x19 [color=#000080] + RenderBlock {P} at (0,365) size 769x19 [color=#000080] RenderText {#text} at (0,0) size 436x17 text run at (0,0) width 436: "This sentence should also be underlined, as well as dark blue (navy), " RenderInline {TT} at (0,0) size 152x15 @@ -79,7 +79,7 @@ layer at (0,0) size 785x718 text run at (436,3) width 152: "including this part" RenderText {#text} at (588,0) size 4x17 text run at (588,0) width 4: "." - RenderBlock {P} at (0,394) size 769x18 [color=#800080] + RenderBlock {P} at (0,399) size 769x19 [color=#800080] RenderText {#text} at (0,0) size 266x17 text run at (0,0) width 266: "This sentence should be purple, including " RenderInline {STRONG} at (0,0) size 57x17 @@ -92,19 +92,19 @@ layer at (0,0) size 785x718 text run at (354,0) width 173: "this part (which is spanned)" RenderText {#text} at (527,0) size 4x17 text run at (527,0) width 4: "." - RenderTable {TABLE} at (0,427) size 614x276 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 612x273 - RenderTableRow {TR} at (0,0) size 612x25 - RenderTableCell {TD} at (0,0) size 612x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,433) size 614x282 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 612x279 + RenderTableRow {TR} at (0,0) size 612x26 + RenderTableCell {TD} at (0,0) size 612x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 612x248 - RenderTableCell {TD} at (0,136) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 612x253 + RenderTableCell {TD} at (0,139) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x18 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 600x248 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {H3} at (4,4) size 592x21 [color=#0000FF] + RenderTableCell {TD} at (12,26) size 600x253 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {H3} at (4,4) size 592x22 [color=#0000FF] RenderText {#text} at (0,0) size 220x21 text run at (0,0) width 220: "This sentence should show " RenderInline {STRONG} at (0,0) size 35x21 @@ -117,7 +117,7 @@ layer at (0,0) size 785x718 text run at (297,0) width 51: "purple" RenderText {#text} at (348,0) size 5x21 text run at (348,0) width 5: "." - RenderBlock {H3} at (4,43) size 592x22 [color=#0000FF] + RenderBlock {H3} at (4,44) size 592x23 [color=#0000FF] RenderText {#text} at (0,0) size 197x21 text run at (0,0) width 197: "This sentence should be " RenderInline {SPAN} at (0,0) size 34x21 @@ -125,7 +125,7 @@ layer at (0,0) size 785x718 text run at (197,0) width 34: "blue" RenderText {#text} at (231,0) size 104x21 text run at (231,0) width 104: " throughout." - RenderBlock {P} at (4,83) size 592x18 + RenderBlock {P} at (4,85) size 592x19 RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "This should be green except for the " RenderInline {EM} at (0,0) size 117x17 [color=#800080] @@ -133,10 +133,10 @@ layer at (0,0) size 785x718 text run at (226,0) width 117: "emphasized words" RenderText {#text} at (343,0) size 160x17 text run at (343,0) width 160: ", which should be purple." - RenderBlock {H3} at (4,119) size 592x22 [color=#0000FF] + RenderBlock {H3} at (4,122) size 592x23 [color=#0000FF] RenderText {#text} at (0,0) size 296x21 text run at (0,0) width 296: "This should be blue and underlined." - RenderBlock {P} at (4,158) size 592x19 + RenderBlock {P} at (4,162) size 592x19 RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "This sentence should be underlined, including " RenderInline {TT} at (0,0) size 72x15 @@ -159,7 +159,7 @@ layer at (0,0) size 785x718 text run at (520,0) width 57: "this part" RenderText {#text} at (577,0) size 4x17 text run at (577,0) width 4: "." - RenderBlock {P} at (4,192) size 592x19 [color=#000080] + RenderBlock {P} at (4,196) size 592x19 [color=#000080] RenderText {#text} at (0,0) size 436x17 text run at (0,0) width 436: "This sentence should also be underlined, as well as dark blue (navy), " RenderInline {TT} at (0,0) size 152x15 @@ -167,7 +167,7 @@ layer at (0,0) size 785x718 text run at (436,3) width 152: "including this part" RenderText {#text} at (588,0) size 4x17 text run at (588,0) width 4: "." - RenderBlock {P} at (4,226) size 592x18 [color=#800080] + RenderBlock {P} at (4,230) size 592x19 [color=#800080] RenderText {#text} at (0,0) size 266x17 text run at (0,0) width 266: "This sentence should be purple, including " RenderInline {STRONG} at (0,0) size 57x17 diff --git a/LayoutTests/platform/gtk/css1/box_properties/border-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border-expected.png index e3654de4e657..261fc08e1d15 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border-expected.txt index 15acf01cf4b0..be55f567b781 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1364 +layer at (0,0) size 785x1396 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1364 - RenderBlock {HTML} at (0,0) size 785x1364 - RenderBody {BODY} at (8,8) size 769x1348 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1396 + RenderBlock {HTML} at (0,0) size 785x1396 + RenderBody {BODY} at (8,8) size 769x1380 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x135 + RenderBlock {PRE} at (0,34) size 769x135 RenderText {#text} at (0,0) size 272x135 text run at (0,0) width 272: ".one {border: medium black solid;}" text run at (0,15) width 264: ".two {border: thin maroon ridge;}" @@ -17,25 +17,25 @@ layer at (0,0) size 785x1364 text run at (0,90) width 256: ".seven {border: left red solid;}" text run at (0,105) width 168: ".eight {border: 0px;}" text run at (0,120) width 232: "TD {border: 2px solid green;}" - RenderBlock {HR} at (0,181) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,199) size 769x34 - RenderText {#text} at (0,0) size 748x34 + RenderBlock {HR} at (0,182) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,200) size 769x36 + RenderText {#text} at (0,0) size 748x35 text run at (0,0) width 627: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " text run at (627,0) width 121: "This border applies" - text run at (0,17) width 317: "only to the cells, not the rows which contain them." - RenderBlock {P} at (0,249) size 769x23 [border: (3px solid #000000)] + text run at (0,18) width 317: "only to the cells, not the rows which contain them." + RenderBlock {P} at (0,252) size 769x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 483x17 text run at (3,3) width 483: "This paragraph should have a medium black solid border all the way around." - RenderBlock {P} at (0,288) size 769x19 [border: (1px ridge #800000)] + RenderBlock {P} at (0,292) size 769x20 [border: (1px ridge #800000)] RenderText {#text} at (1,1) size 480x17 text run at (1,1) width 480: "This paragraph should have a thin maroon ridged border all the way around." - RenderBlock {P} at (0,323) size 769x37 [border: (10px outset #008080)] + RenderBlock {P} at (0,328) size 769x38 [border: (10px outset #008080)] RenderText {#text} at (10,10) size 518x17 text run at (10,10) width 518: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - RenderBlock {P} at (0,376) size 769x37 [border: (10px inset #808000)] + RenderBlock {P} at (0,382) size 769x38 [border: (10px inset #808000)] RenderText {#text} at (10,10) size 519x17 text run at (10,10) width 519: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - RenderBlock {P} at (0,429) size 769x18 + RenderBlock {P} at (0,436) size 769x18 RenderText {#text} at (0,0) size 348x17 text run at (0,0) width 348: "This paragraph should have no border around it, as the " RenderInline {TT} at (0,0) size 96x15 @@ -43,7 +43,7 @@ layer at (0,0) size 785x1364 text run at (348,3) width 96: "border-style" RenderText {#text} at (444,0) size 323x17 text run at (444,0) width 323: " was not set, and it should not be offset in any way." - RenderBlock {P} at (0,463) size 769x41 [border: (3px double #800000)] + RenderBlock {P} at (0,470) size 769x42 [border: (3px double #800000)] RenderText {#text} at (3,3) size 535x17 text run at (3,3) width 535: "This paragraph should have a medium maroon double border around it, even though " RenderInline {CODE} at (0,0) size 96x15 @@ -52,10 +52,10 @@ layer at (0,0) size 785x1364 RenderText {#text} at (634,3) size 746x35 text run at (634,3) width 115: " was not explicitly" text run at (3,21) width 21: "set." - RenderBlock {P} at (0,520) size 769x17 + RenderBlock {P} at (0,528) size 769x18 RenderText {#text} at (0,0) size 621x17 text run at (0,0) width 621: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - RenderBlock {P} at (0,553) size 769x18 + RenderBlock {P} at (0,562) size 769x19 RenderInline {A} at (0,0) size 25x17 RenderText {#text} at (0,1) size 25x17 text run at (0,1) width 25: "The" @@ -65,61 +65,61 @@ layer at (0,0) size 785x1364 RenderImage {IMG} at (740,0) size 15x15 RenderText {#text} at (755,1) size 4x17 text run at (755,1) width 4: "." - RenderTable {TABLE} at (0,587) size 769x109 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x107 - RenderTableRow {TR} at (0,5) size 767x40 - RenderTableCell {TD} at (5,5) size 758x40 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,3) size 711x34 + RenderTable {TABLE} at (0,597) size 769x113 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x111 + RenderTableRow {TR} at (0,5) size 767x42 + RenderTableCell {TD} at (5,5) size 758x42 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (3,3) size 711x35 text run at (3,3) width 405: "Every cell in this table should have a 2-pixel solid green border. " text run at (408,3) width 306: "This is also true of the table-testing section in the" - text run at (3,20) width 175: "second half of the test page." - RenderTableRow {TR} at (0,50) size 767x52 - RenderTableCell {TD} at (5,64) size 195x24 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 53x18 - text run at (3,4) width 53: "Cell one" - RenderTableCell {TD} at (204,50) size 559x52 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,3) size 552x17 + text run at (3,21) width 175: "second half of the test page." + RenderTableRow {TR} at (0,52) size 767x54 + RenderTableCell {TD} at (5,67) size 195x24 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 53x17 + text run at (3,3) width 53: "Cell one" + RenderTableCell {TD} at (204,52) size 559x54 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,3) size 552x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (3,20) size 163x29 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 161x27 - RenderTableRow {TR} at (0,2) size 161x23 - RenderTableCell {TD} at (2,2) size 157x23 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (3,21) size 163x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 161x28 + RenderTableRow {TR} at (0,2) size 161x24 + RenderTableCell {TD} at (2,2) size 157x24 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (3,3) size 151x17 text run at (3,3) width 151: "Nested single-cell table!" - RenderBlock {P} at (0,712) size 769x17 + RenderBlock {P} at (0,726) size 769x18 RenderText {#text} at (0,0) size 175x17 text run at (0,0) width 175: "This is an unstyled element." - RenderTable {TABLE} at (0,745) size 769x603 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x601 - RenderTableRow {TR} at (0,0) size 767x27 - RenderTableCell {TD} at (0,0) size 767x27 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,760) size 769x620 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x618 + RenderTableRow {TR} at (0,0) size 767x28 + RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (5,5) size 163x17 text run at (5,5) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,27) size 767x574 - RenderTableCell {TD} at (0,300) size 14x28 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (5,5) size 4x18 - text run at (5,6) width 4: " " - RenderTableCell {TD} at (14,27) size 753x574 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (5,5) size 743x34 - RenderText {#text} at (0,0) size 700x34 + RenderTableRow {TR} at (0,28) size 767x590 + RenderTableCell {TD} at (0,309) size 14x28 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (5,5) size 4x17 + text run at (5,5) width 4: " " + RenderTableCell {TD} at (14,28) size 753x590 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (5,5) size 743x36 + RenderText {#text} at (0,0) size 700x35 text run at (0,0) width 627: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " text run at (627,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (5,55) size 743x23 [border: (3px solid #000000)] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (5,57) size 743x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 483x17 text run at (3,3) width 483: "This paragraph should have a medium black solid border all the way around." - RenderBlock {P} at (5,94) size 743x19 [border: (1px ridge #800000)] + RenderBlock {P} at (5,97) size 743x20 [border: (1px ridge #800000)] RenderText {#text} at (1,1) size 480x17 text run at (1,1) width 480: "This paragraph should have a thin maroon ridged border all the way around." - RenderBlock {P} at (5,129) size 743x37 [border: (10px outset #008080)] + RenderBlock {P} at (5,133) size 743x38 [border: (10px outset #008080)] RenderText {#text} at (10,10) size 518x17 text run at (10,10) width 518: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - RenderBlock {P} at (5,182) size 743x37 [border: (10px inset #808000)] + RenderBlock {P} at (5,187) size 743x38 [border: (10px inset #808000)] RenderText {#text} at (10,10) size 519x17 text run at (10,10) width 519: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - RenderBlock {P} at (5,235) size 743x35 + RenderBlock {P} at (5,241) size 743x36 RenderText {#text} at (0,0) size 348x17 text run at (0,0) width 348: "This paragraph should have no border around it, as the " RenderInline {TT} at (0,0) size 96x15 @@ -128,7 +128,7 @@ layer at (0,0) size 785x1364 RenderText {#text} at (444,0) size 732x35 text run at (444,0) width 288: " was not set, and it should not be offset in any" text run at (0,18) width 31: "way." - RenderBlock {P} at (5,286) size 743x41 [border: (3px double #800000)] + RenderBlock {P} at (5,293) size 743x42 [border: (3px double #800000)] RenderText {#text} at (3,3) size 535x17 text run at (3,3) width 535: "This paragraph should have a medium maroon double border around it, even though " RenderInline {CODE} at (0,0) size 96x15 @@ -137,41 +137,41 @@ layer at (0,0) size 785x1364 RenderText {#text} at (634,3) size 684x35 text run at (634,3) width 53: " was not" text run at (3,21) width 83: "explicitly set." - RenderBlock {P} at (5,343) size 743x17 + RenderBlock {P} at (5,351) size 743x18 RenderText {#text} at (0,0) size 621x17 text run at (0,0) width 621: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - RenderBlock {P} at (5,376) size 743x35 + RenderBlock {P} at (5,385) size 743x37 RenderInline {A} at (0,0) size 25x17 RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "The" RenderText {#text} at (25,0) size 715x17 text run at (25,0) width 715: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " RenderInline {A} at (0,0) size 15x17 [color=#0000FF] - RenderImage {IMG} at (0,17) size 15x15 - RenderText {#text} at (15,18) size 4x17 - text run at (15,18) width 4: "." - RenderTable {TABLE} at (5,427) size 743x109 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 741x107 - RenderTableRow {TR} at (0,5) size 741x40 - RenderTableCell {TD} at (5,5) size 732x40 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,3) size 711x34 + RenderImage {IMG} at (0,18) size 15x15 + RenderText {#text} at (15,19) size 4x17 + text run at (15,19) width 4: "." + RenderTable {TABLE} at (5,438) size 743x113 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 741x111 + RenderTableRow {TR} at (0,5) size 741x42 + RenderTableCell {TD} at (5,5) size 732x42 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (3,3) size 711x35 text run at (3,3) width 405: "Every cell in this table should have a 2-pixel solid green border. " text run at (408,3) width 306: "This is also true of the table-testing section in the" - text run at (3,20) width 175: "second half of the test page." - RenderTableRow {TR} at (0,50) size 741x52 - RenderTableCell {TD} at (5,64) size 188x24 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 53x18 - text run at (3,4) width 53: "Cell one" - RenderTableCell {TD} at (197,50) size 540x52 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,3) size 533x17 + text run at (3,21) width 175: "second half of the test page." + RenderTableRow {TR} at (0,52) size 741x54 + RenderTableCell {TD} at (5,67) size 188x24 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 53x17 + text run at (3,3) width 53: "Cell one" + RenderTableCell {TD} at (197,52) size 540x54 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,3) size 533x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (3,20) size 163x29 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 161x27 - RenderTableRow {TR} at (0,2) size 161x23 - RenderTableCell {TD} at (2,2) size 157x23 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (3,21) size 163x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 161x28 + RenderTableRow {TR} at (0,2) size 161x24 + RenderTableCell {TD} at (2,2) size 157x24 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (3,3) size 151x17 text run at (3,3) width 151: "Nested single-cell table!" - RenderBlock {P} at (5,552) size 743x17 + RenderBlock {P} at (5,567) size 743x18 RenderText {#text} at (0,0) size 175x17 text run at (0,0) width 175: "This is an unstyled element." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.png index 16757d5166ee..2e668db9d8a5 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.txt index d6d1ee47cfb0..8226ab5a88d1 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_bottom-expected.txt @@ -1,159 +1,159 @@ -layer at (0,0) size 785x963 +layer at (0,0) size 785x995 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x963 - RenderBlock {HTML} at (0,0) size 785x963 - RenderBody {BODY} at (8,8) size 769x947 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x995 + RenderBlock {HTML} at (0,0) size 785x995 + RenderBody {BODY} at (8,8) size 769x979 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 344x60 text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" text run at (0,15) width 320: ".two {border-bottom: purple thin solid;}" text run at (0,30) width 344: ".three {border-bottom: black medium solid;}" text run at (0,45) width 288: "TD {border-bottom: green 2px solid;}" - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 769x34 - RenderText {#text} at (0,0) size 731x34 + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 769x36 + RenderText {#text} at (0,0) size 731x35 text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " text run at (658,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (0,174) size 769x27 [border: none (10px double #800080) none] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (0,177) size 769x28 [border: none (10px double #800080) none] RenderText {#text} at (0,0) size 438x17 text run at (0,0) width 438: "This paragraph should have a purple, double, 10-pixel bottom border." - RenderBlock {P} at (0,217) size 769x18 [border: none (1px solid #800080) none] + RenderBlock {P} at (0,221) size 769x19 [border: none (1px solid #800080) none] RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "This paragraph should have a thin purple bottom border." - RenderTable {TABLE} at (0,251) size 769x106 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x104 - RenderTableRow {TR} at (0,5) size 767x39 - RenderTableCell {TD} at (5,5) size 758x39 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 736x34 + RenderTable {TABLE} at (0,256) size 769x110 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x108 + RenderTableRow {TR} at (0,5) size 767x41 + RenderTableCell {TD} at (5,5) size 758x41 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (2,2) size 736x35 text run at (2,2) width 453: "Every cell in this table should have a 2-pixel solid green bottom border. " text run at (455,2) width 283: "This is also true of the table-testing section in" - text run at (2,19) width 198: "the second half of the test page." - RenderTableRow {TR} at (0,49) size 767x50 - RenderTableCell {TD} at (5,63) size 194x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 53x17 - text run at (2,2) width 53: "Cell one" - RenderTableCell {TD} at (203,49) size 560x50 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 555x17 + text run at (2,20) width 198: "the second half of the test page." + RenderTableRow {TR} at (0,51) size 767x52 + RenderTableCell {TD} at (5,65) size 194x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x18 + text run at (2,3) width 53: "Cell one" + RenderTableCell {TD} at (203,51) size 560x52 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 555x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (2,19) size 161x28 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 159x26 - RenderTableRow {TR} at (0,2) size 159x22 - RenderTableCell {TD} at (2,2) size 155x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,20) size 161x29 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x27 + RenderTableRow {TR} at (0,2) size 159x23 + RenderTableCell {TD} at (2,2) size 155x23 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 151x17 text run at (2,2) width 151: "Nested single-cell table!" - RenderBlock {UL} at (0,373) size 769x128 - RenderListItem {LI} at (40,0) size 729x71 [border: none (3px solid #000000) none] - RenderBlock (anonymous) at (0,0) size 729x17 + RenderBlock {UL} at (0,382) size 769x135 + RenderListItem {LI} at (40,0) size 729x75 [border: none (3px solid #000000) none] + RenderBlock (anonymous) at (0,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (0,17) size 729x51 - RenderListItem {LI} at (40,0) size 689x17 + RenderBlock {UL} at (0,18) size 729x54 + RenderListItem {LI} at (40,0) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 689x17 + RenderListItem {LI} at (40,18) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 689x17 + RenderListItem {LI} at (40,36) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,71) size 729x20 [border: none (3px solid #000000) none] + RenderListItem {LI} at (40,75) size 729x21 [border: none (3px solid #000000) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 158x17 text run at (0,0) width 158: "This is a second list item." - RenderListItem {LI} at (40,91) size 729x37 [border: none (3px solid #000000) none] + RenderListItem {LI} at (40,96) size 729x39 [border: none (3px solid #000000) none] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 722x34 + RenderText {#text} at (0,0) size 722x35 text run at (0,0) width 722: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that" - text run at (0,17) width 104: "it should appear " + text run at (0,18) width 104: "it should appear " RenderInline {EM} at (0,0) size 50x17 - RenderText {#text} at (104,17) size 50x17 - text run at (104,17) width 50: "beneath" - RenderText {#text} at (154,17) size 390x17 - text run at (154,17) width 390: " the nested list (below the line \"...nested within the list item.\")." - RenderTable {TABLE} at (0,517) size 769x430 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x428 - RenderTableRow {TR} at (0,0) size 767x26 - RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (104,18) size 50x17 + text run at (104,18) width 50: "beneath" + RenderText {#text} at (154,18) size 390x17 + text run at (154,18) width 390: " the nested list (below the line \"...nested within the list item.\")." + RenderTable {TABLE} at (0,533) size 769x446 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x444 + RenderTableRow {TR} at (0,0) size 767x27 + RenderTableCell {TD} at (0,0) size 767x27 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,26) size 767x402 - RenderTableCell {TD} at (0,214) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,27) size 767x417 + RenderTableCell {TD} at (0,222) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,26) size 755x402 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 731x34 + RenderTableCell {TD} at (12,27) size 755x417 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 731x35 text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " text run at (658,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (4,54) size 747x27 [border: none (10px double #800080) none] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (4,56) size 747x28 [border: none (10px double #800080) none] RenderText {#text} at (0,0) size 438x17 text run at (0,0) width 438: "This paragraph should have a purple, double, 10-pixel bottom border." - RenderBlock {P} at (4,97) size 747x18 [border: none (1px solid #800080) none] + RenderBlock {P} at (4,100) size 747x19 [border: none (1px solid #800080) none] RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "This paragraph should have a thin purple bottom border." - RenderTable {TABLE} at (4,131) size 747x106 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 745x104 - RenderTableRow {TR} at (0,5) size 745x39 - RenderTableCell {TD} at (5,5) size 736x39 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 720x34 + RenderTable {TABLE} at (4,135) size 747x110 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 745x108 + RenderTableRow {TR} at (0,5) size 745x41 + RenderTableCell {TD} at (5,5) size 736x41 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (2,2) size 720x35 text run at (2,2) width 453: "Every cell in this table should have a 2-pixel solid green bottom border. " text run at (455,2) width 267: "This is also true of the table-testing section" - text run at (2,19) width 214: "in the second half of the test page." - RenderTableRow {TR} at (0,49) size 745x50 - RenderTableCell {TD} at (5,63) size 188x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 53x17 - text run at (2,2) width 53: "Cell one" - RenderTableCell {TD} at (197,49) size 544x50 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 539x17 + text run at (2,20) width 214: "in the second half of the test page." + RenderTableRow {TR} at (0,51) size 745x52 + RenderTableCell {TD} at (5,65) size 188x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x18 + text run at (2,3) width 53: "Cell one" + RenderTableCell {TD} at (197,51) size 544x52 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 539x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (2,19) size 161x28 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 159x26 - RenderTableRow {TR} at (0,2) size 159x22 - RenderTableCell {TD} at (2,2) size 155x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,20) size 161x29 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x27 + RenderTableRow {TR} at (0,2) size 159x23 + RenderTableCell {TD} at (2,2) size 155x23 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 151x17 text run at (2,2) width 151: "Nested single-cell table!" - RenderBlock {UL} at (4,253) size 747x128 - RenderListItem {LI} at (40,0) size 707x71 [border: none (3px solid #000000) none] - RenderBlock (anonymous) at (0,0) size 707x17 + RenderBlock {UL} at (4,261) size 747x135 + RenderListItem {LI} at (40,0) size 707x75 [border: none (3px solid #000000) none] + RenderBlock (anonymous) at (0,0) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (0,17) size 707x51 - RenderListItem {LI} at (40,0) size 667x17 + RenderBlock {UL} at (0,18) size 707x54 + RenderListItem {LI} at (40,0) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 667x17 + RenderListItem {LI} at (40,18) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 667x17 + RenderListItem {LI} at (40,36) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,71) size 707x20 [border: none (3px solid #000000) none] + RenderListItem {LI} at (40,75) size 707x21 [border: none (3px solid #000000) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 158x17 text run at (0,0) width 158: "This is a second list item." - RenderListItem {LI} at (40,91) size 707x37 [border: none (3px solid #000000) none] + RenderListItem {LI} at (40,96) size 707x39 [border: none (3px solid #000000) none] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 695x34 + RenderText {#text} at (0,0) size 695x35 text run at (0,0) width 695: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means" - text run at (0,17) width 131: "that it should appear " + text run at (0,18) width 131: "that it should appear " RenderInline {EM} at (0,0) size 50x17 - RenderText {#text} at (131,17) size 50x17 - text run at (131,17) width 50: "beneath" - RenderText {#text} at (181,17) size 390x17 - text run at (181,17) width 390: " the nested list (below the line \"...nested within the list item.\")." + RenderText {#text} at (131,18) size 50x17 + text run at (131,18) width 50: "beneath" + RenderText {#text} at (181,18) size 390x17 + text run at (181,18) width 390: " the nested list (below the line \"...nested within the list item.\")." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.png index 812bc06cc3dd..a9fbb049abee 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.txt index 560b38748027..331243b72ba4 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_inline-expected.txt @@ -3,55 +3,55 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 328x45 text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" text run at (0,15) width 320: ".two {border-bottom: purple thin solid;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x51 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 666x17 text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " RenderInline {SPAN} at (0,0) size 57x27 [border: none (10px double #800080) none] RenderText {#text} at (666,0) size 57x17 text run at (666,0) width 57: "class one" - RenderText {#text} at (723,0) size 770x34 + RenderText {#text} at (723,0) size 770x35 text run at (723,0) width 47: ", which" - text run at (0,17) width 362: "should have a 10-pixel purple double bottom border; and " + text run at (0,18) width 362: "should have a 10-pixel purple double bottom border; and " RenderInline {SPAN} at (0,0) size 58x18 [border: none (1px solid #800080) none] - RenderText {#text} at (362,17) size 58x17 - text run at (362,17) width 58: "class two" - RenderText {#text} at (420,17) size 761x34 - text run at (420,17) width 341: ", which should have a thin solid purple bottom border." - text run at (0,34) width 429: "The line-height of the parent element should not change on any line." - RenderTable {TABLE} at (0,176) size 784x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x84 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (362,18) size 58x17 + text run at (362,18) width 58: "class two" + RenderText {#text} at (420,18) size 761x35 + text run at (420,18) width 341: ", which should have a thin solid purple bottom border." + text run at (0,36) width 429: "The line-height of the parent element should not change on any line." + RenderTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x88 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x51 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 666x17 text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " RenderInline {SPAN} at (0,0) size 57x27 [border: none (10px double #800080) none] RenderText {#text} at (666,0) size 57x17 text run at (666,0) width 57: "class one" - RenderText {#text} at (723,0) size 727x34 + RenderText {#text} at (723,0) size 727x35 text run at (723,0) width 4: "," - text run at (0,17) width 405: "which should have a 10-pixel purple double bottom border; and " + text run at (0,18) width 405: "which should have a 10-pixel purple double bottom border; and " RenderInline {SPAN} at (0,0) size 58x18 [border: none (1px solid #800080) none] - RenderText {#text} at (405,17) size 58x17 - text run at (405,17) width 58: "class two" - RenderText {#text} at (463,17) size 755x34 - text run at (463,17) width 292: ", which should have a thin solid purple bottom" - text run at (0,34) width 49: "border. " - text run at (49,34) width 429: "The line-height of the parent element should not change on any line." + RenderText {#text} at (405,18) size 58x17 + text run at (405,18) width 58: "class two" + RenderText {#text} at (463,18) size 755x35 + text run at (463,18) width 292: ", which should have a thin solid purple bottom" + text run at (0,36) width 49: "border. " + text run at (49,36) width 429: "The line-height of the parent element should not change on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.png index a7e6f972392e..1ad2de394c32 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.txt index 4f26e55c570e..40a260c2dea6 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x863 +layer at (0,0) size 785x877 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x863 - RenderBlock {HTML} at (0,0) size 785x863 - RenderBody {BODY} at (8,8) size 769x847 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x877 + RenderBlock {HTML} at (0,0) size 785x877 + RenderBody {BODY} at (8,8) size 769x861 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 464x90 text run at (0,0) width 456: ".zero {background-color: silver; border-bottom-width: 0;}" text run at (0,15) width 432: ".one {border-bottom-width: 50px; border-style: solid;}" @@ -14,8 +14,8 @@ layer at (0,0) size 785x863 text run at (0,45) width 464: ".three {border-bottom-width: medium; border-style: solid;}" text run at (0,60) width 440: ".four {border-bottom-width: thin; border-style: solid;}" text run at (0,75) width 272: ".five {border-bottom-width: 25px;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x18 + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x15 @@ -23,22 +23,22 @@ layer at (0,0) size 785x863 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (0,188) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,221) size 769x70 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,223) size 769x71 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 387x17 text run at (3,3) width 387: "This element should have a bottom border width of 50 pixels." - RenderBlock {P} at (0,307) size 769x25 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,310) size 769x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 344x17 text run at (3,3) width 344: "This element should have a thick bottom border width." - RenderBlock {P} at (0,348) size 769x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,352) size 769x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 364x17 text run at (3,3) width 364: "This element should have a medium bottom border width." - RenderBlock {P} at (0,387) size 769x21 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,392) size 769x22 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 337x17 text run at (3,3) width 337: "This element should have a thin bottom border width." - RenderBlock {P} at (0,424) size 769x18 + RenderBlock {P} at (0,430) size 769x18 RenderText {#text} at (0,0) size 537x17 text run at (0,0) width 537: "This element should have no border and no extra \"padding\" on its bottom side, as no " RenderInline {CODE} at (0,0) size 96x15 @@ -46,21 +46,21 @@ layer at (0,0) size 785x863 text run at (537,3) width 96: "border-style" RenderText {#text} at (633,0) size 54x17 text run at (633,0) width 54: " was set." - RenderBlock {P} at (0,458) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,464) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderTable {TABLE} at (0,491) size 709x356 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 707x354 - RenderTableRow {TR} at (0,0) size 707x25 - RenderTableCell {TD} at (0,0) size 707x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,498) size 709x363 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 707x361 + RenderTableRow {TR} at (0,0) size 707x26 + RenderTableCell {TD} at (0,0) size 707x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 707x329 - RenderTableCell {TD} at (0,177) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 695x329 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 707x335 + RenderTableCell {TD} at (0,180) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 695x335 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 687x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " @@ -69,22 +69,22 @@ layer at (0,0) size 785x863 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (4,38) size 687x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,38) size 687x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,71) size 687x70 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] + RenderBlock {P} at (4,72) size 687x71 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 387x17 text run at (3,3) width 387: "This element should have a bottom border width of 50 pixels." - RenderBlock {P} at (4,157) size 687x25 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderBlock {P} at (4,159) size 687x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 344x17 text run at (3,3) width 344: "This element should have a thick bottom border width." - RenderBlock {P} at (4,198) size 687x23 [border: (3px solid #000000)] + RenderBlock {P} at (4,201) size 687x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 364x17 text run at (3,3) width 364: "This element should have a medium bottom border width." - RenderBlock {P} at (4,237) size 687x21 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderBlock {P} at (4,241) size 687x22 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 337x17 text run at (3,3) width 337: "This element should have a thin bottom border width." - RenderBlock {P} at (4,274) size 687x18 + RenderBlock {P} at (4,279) size 687x18 RenderText {#text} at (0,0) size 537x17 text run at (0,0) width 537: "This element should have no border and no extra \"padding\" on its bottom side, as no " RenderInline {CODE} at (0,0) size 96x15 @@ -92,6 +92,6 @@ layer at (0,0) size 785x863 text run at (537,3) width 96: "border-style" RenderText {#text} at (633,0) size 54x17 text run at (633,0) width 54: " was set." - RenderBlock {P} at (4,308) size 687x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,313) size 687x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.png index 6eb3169eb64a..e64fb5db39b4 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.txt index ba6ee05a3f0c..2bc065a71dce 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_bottom_width_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 432x45 text run at (0,0) width 432: ".one {border-bottom-width: 25px; border-style: solid;}" text run at (0,15) width 432: ".two {border-bottom-width: thin; border-style: solid;}" text run at (0,30) width 280: ".three {border-bottom-width: 25px;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x98 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x100 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 172x17 text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -27,33 +27,33 @@ layer at (0,0) size 800x600 RenderInline {TT} at (0,0) size 24x15 RenderText {#text} at (507,6) size 24x15 text run at (507,6) width 24: "two" - RenderText {#text} at (534,3) size 767x52 + RenderText {#text} at (534,3) size 767x53 text run at (534,3) width 220: ", which should result in a thin solid" text run at (3,21) width 716: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " text run at (719,21) width 51: "There is" - text run at (3,38) width 48: "also an " + text run at (3,39) width 48: "also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (51,38) size 143x17 - text run at (51,38) width 143: "inline element of class " + RenderText {#text} at (51,39) size 143x17 + text run at (51,39) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (194,41) size 40x15 - text run at (194,41) width 40: "three" - RenderText {#text} at (234,38) size 770x35 - text run at (234,38) width 539: ", which should have no bottom border width or visible border because no border style" - text run at (3,56) width 50: "was set." - RenderTable {TABLE} at (0,223) size 784x133 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x131 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (194,42) size 40x15 + text run at (194,42) width 40: "three" + RenderText {#text} at (234,39) size 770x35 + text run at (234,39) width 539: ", which should have no bottom border width or visible border because no border style" + text run at (3,57) width 50: "was set." + RenderTable {TABLE} at (0,226) size 784x136 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x134 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x106 - RenderTableCell {TD} at (0,65) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x106 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x98 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderTableRow {TR} at (0,26) size 782x108 + RenderTableCell {TD} at (0,67) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x108 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x100 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 172x17 text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -68,17 +68,17 @@ layer at (0,0) size 800x600 RenderInline {TT} at (0,0) size 24x15 RenderText {#text} at (507,6) size 24x15 text run at (507,6) width 24: "two" - RenderText {#text} at (534,3) size 753x52 + RenderText {#text} at (534,3) size 753x53 text run at (534,3) width 220: ", which should result in a thin solid" text run at (3,21) width 716: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " text run at (719,21) width 37: "There" - text run at (3,38) width 62: "is also an " + text run at (3,39) width 62: "is also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (65,38) size 143x17 - text run at (65,38) width 143: "inline element of class " + RenderText {#text} at (65,39) size 143x17 + text run at (65,39) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (208,41) size 40x15 - text run at (208,41) width 40: "three" - RenderText {#text} at (248,38) size 751x35 - text run at (248,38) width 506: ", which should have no bottom border width or visible border because no border" - text run at (3,56) width 83: "style was set." + RenderText {#text} at (208,42) size 40x15 + text run at (208,42) width 40: "three" + RenderText {#text} at (248,39) size 751x35 + text run at (248,39) width 506: ", which should have no bottom border width or visible border because no border" + text run at (3,57) width 83: "style was set." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.png index b3778d0c4729..eaca1c5d40ef 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.txt index 87ff073de523..a95855707330 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_color-expected.txt @@ -3,44 +3,44 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 728x45 text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" text run at (0,15) width 568: ".two {border-color: purple; border-width: medium; border-style: solid;}" text run at (0,30) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x23 [border: (3px solid #800080)] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x24 [border: (3px solid #800080)] RenderText {#text} at (3,3) size 357x17 text run at (3,3) width 357: "This element should have a purple border surrounding it." - RenderBlock {P} at (0,148) size 784x23 [border: (3px solid #800080)] + RenderBlock {P} at (0,150) size 784x24 [border: (3px solid #800080)] RenderText {#text} at (3,3) size 453x17 text run at (3,3) width 453: "This element should have a medium-width purple border surrounding it." - RenderBlock {P} at (0,187) size 784x40 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (3,3) size 763x34 + RenderBlock {P} at (0,190) size 784x42 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] + RenderText {#text} at (3,3) size 763x35 text run at (3,3) width 763: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the" - text run at (3,20) width 222: "bottom, and yellow on the left side." - RenderTable {TABLE} at (0,243) size 784x153 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x151 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (3,21) width 222: "bottom, and yellow on the left side." + RenderTable {TABLE} at (0,248) size 784x158 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x156 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x126 - RenderTableCell {TD} at (0,75) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x126 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x23 [border: (3px solid #800080)] + RenderTableRow {TR} at (0,26) size 782x130 + RenderTableCell {TD} at (0,78) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x130 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x24 [border: (3px solid #800080)] RenderText {#text} at (3,3) size 357x17 text run at (3,3) width 357: "This element should have a purple border surrounding it." - RenderBlock {P} at (4,43) size 762x23 [border: (3px solid #800080)] + RenderBlock {P} at (4,44) size 762x24 [border: (3px solid #800080)] RenderText {#text} at (3,3) size 453x17 text run at (3,3) width 453: "This element should have a medium-width purple border surrounding it." - RenderBlock {P} at (4,82) size 762x40 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (3,3) size 740x34 + RenderBlock {P} at (4,84) size 762x42 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] + RenderText {#text} at (3,3) size 740x35 text run at (3,3) width 740: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on" - text run at (3,20) width 245: "the bottom, and yellow on the left side." + text run at (3,21) width 245: "the bottom, and yellow on the left side." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.png index 493d06f8aed8..54e5d584ca44 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.txt index edfe645fef32..0d6a2073af39 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_color_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 728x45 text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" text run at (0,15) width 568: ".two {border-color: purple; border-width: medium; border-style: solid;}" text run at (0,30) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x68 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x72 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 677x17 text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " RenderInline {SPAN} at (0,0) size 63x23 [border: (3px solid #800080)] @@ -20,34 +20,34 @@ layer at (0,0) size 800x600 text run at (680,0) width 57: "class one" RenderText {#text} at (740,0) size 8x17 text run at (740,0) width 8: ", " - RenderInline {SPAN} at (0,0) size 781x40 [border: (3px solid #800080)] - RenderText {#text} at (751,0) size 781x34 + RenderInline {SPAN} at (0,0) size 781x41 [border: (3px solid #800080)] + RenderText {#text} at (751,0) size 781x35 text run at (751,0) width 30: "class" - text run at (0,17) width 24: "two" - RenderText {#text} at (27,17) size 35x17 - text run at (27,17) width 35: ", and " + text run at (0,18) width 24: "two" + RenderText {#text} at (27,18) size 35x17 + text run at (27,18) width 35: ", and " RenderInline {SPAN} at (0,0) size 71x23 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (65,17) size 65x17 - text run at (65,17) width 65: "class three" - RenderText {#text} at (133,17) size 764x51 - text run at (133,17) width 8: ". " - text run at (141,17) width 623: "The effect for each inline element should be to have a purple medium-width solid border in the first" - text run at (0,34) width 569: "and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (569,34) width 179: "The line-height of the parent" - text run at (0,51) width 284: "element should not change at all, on any line." - RenderTable {TABLE} at (0,193) size 784x103 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x101 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (65,18) size 65x17 + text run at (65,18) width 65: "class three" + RenderText {#text} at (133,18) size 764x53 + text run at (133,18) width 8: ". " + text run at (141,18) width 623: "The effect for each inline element should be to have a purple medium-width solid border in the first" + text run at (0,36) width 569: "and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " + text run at (569,36) width 179: "The line-height of the parent" + text run at (0,54) width 284: "element should not change at all, on any line." + RenderTable {TABLE} at (0,198) size 784x108 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x106 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x76 - RenderTableCell {TD} at (0,50) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x76 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x68 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 782x80 + RenderTableCell {TD} at (0,53) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x80 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x72 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 677x17 text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " RenderInline {SPAN} at (0,0) size 63x23 [border: (3px solid #800080)] @@ -56,16 +56,16 @@ layer at (0,0) size 800x600 RenderText {#text} at (740,0) size 4x17 text run at (740,0) width 4: "," RenderInline {SPAN} at (0,0) size 64x23 [border: (3px solid #800080)] - RenderText {#text} at (3,17) size 58x17 - text run at (3,17) width 58: "class two" - RenderText {#text} at (64,17) size 35x17 - text run at (64,17) width 35: ", and " + RenderText {#text} at (3,18) size 58x17 + text run at (3,18) width 58: "class two" + RenderText {#text} at (64,18) size 35x17 + text run at (64,18) width 35: ", and " RenderInline {SPAN} at (0,0) size 71x23 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (102,17) size 65x17 - text run at (102,17) width 65: "class three" - RenderText {#text} at (170,17) size 756x51 - text run at (170,17) width 8: ". " - text run at (178,17) width 572: "The effect for each inline element should be to have a purple medium-width solid border in" - text run at (0,34) width 620: "the first and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (620,34) width 136: "The line-height of the" - text run at (0,51) width 327: "parent element should not change at all, on any line." + RenderText {#text} at (102,18) size 65x17 + text run at (102,18) width 65: "class three" + RenderText {#text} at (170,18) size 756x53 + text run at (170,18) width 8: ". " + text run at (178,18) width 572: "The effect for each inline element should be to have a purple medium-width solid border in" + text run at (0,36) width 620: "the first and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " + text run at (620,36) width 136: "The line-height of the" + text run at (0,54) width 327: "parent element should not change at all, on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.png index fd461c17e31a..2b68eaa777ff 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.txt index 6b27b88f37a2..0331f6294a31 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_inline-expected.txt @@ -3,54 +3,54 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 256x45 text run at (0,0) width 256: ".one {border: 10px teal outset;}" text run at (0,15) width 256: ".two {border: 10px olive inset;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x51 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 677x17 text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " RenderInline {SPAN} at (0,0) size 77x37 [border: (10px outset #008080)] RenderText {#text} at (687,0) size 57x17 text run at (687,0) width 57: "class one" - RenderText {#text} at (754,0) size 758x34 + RenderText {#text} at (754,0) size 758x35 text run at (754,0) width 4: "," - text run at (0,17) width 353: "which should result in a 10-pixel outset teal border; and " + text run at (0,18) width 353: "which should result in a 10-pixel outset teal border; and " RenderInline {SPAN} at (0,0) size 78x37 [border: (10px inset #808000)] - RenderText {#text} at (363,17) size 58x17 - text run at (363,17) width 58: "class two" - RenderText {#text} at (431,17) size 762x34 - text run at (431,17) width 331: ", which should result in a 10-pixel inset olive border." - text run at (0,34) width 429: "The line-height of the parent element should not change on any line." - RenderTable {TABLE} at (0,176) size 784x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x84 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (363,18) size 58x17 + text run at (363,18) width 58: "class two" + RenderText {#text} at (431,18) size 762x35 + text run at (431,18) width 331: ", which should result in a 10-pixel inset olive border." + text run at (0,36) width 429: "The line-height of the parent element should not change on any line." + RenderTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x88 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x51 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 677x17 text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " RenderInline {SPAN} at (0,0) size 77x37 [border: (10px outset #008080)] RenderText {#text} at (687,0) size 57x17 text run at (687,0) width 57: "class one" - RenderText {#text} at (754,0) size 758x34 + RenderText {#text} at (754,0) size 758x35 text run at (754,0) width 4: "," - text run at (0,17) width 353: "which should result in a 10-pixel outset teal border; and " + text run at (0,18) width 353: "which should result in a 10-pixel outset teal border; and " RenderInline {SPAN} at (0,0) size 78x37 [border: (10px inset #808000)] - RenderText {#text} at (363,17) size 58x17 - text run at (363,17) width 58: "class two" - RenderText {#text} at (431,17) size 762x34 - text run at (431,17) width 331: ", which should result in a 10-pixel inset olive border." - text run at (0,34) width 429: "The line-height of the parent element should not change on any line." + RenderText {#text} at (363,18) size 58x17 + text run at (363,18) width 58: "class two" + RenderText {#text} at (431,18) size 762x35 + text run at (431,18) width 331: ", which should result in a 10-pixel inset olive border." + text run at (0,36) width 429: "The line-height of the parent element should not change on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.png index 792f8557826a..3d091294ad14 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.txt index 92940db74b00..c11c85f8a376 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_left-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x994 +layer at (0,0) size 785x1028 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x994 - RenderBlock {HTML} at (0,0) size 785x994 - RenderBody {BODY} at (8,8) size 769x978 [bgcolor=#CCCCCC] - RenderBlock {P} at (20,0) size 749x17 +layer at (0,0) size 785x1028 + RenderBlock {HTML} at (0,0) size 785x1028 + RenderBody {BODY} at (8,8) size 769x1012 [bgcolor=#CCCCCC] + RenderBlock {P} at (20,0) size 749x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x105 + RenderBlock {PRE} at (0,34) size 769x105 RenderText {#text} at (0,0) size 344x105 text run at (0,0) width 176: "P {margin-left: 20px;}" text run at (0,15) width 312: ".one {border-left: purple double 10px;}" @@ -15,141 +15,141 @@ layer at (0,0) size 785x994 text run at (0,60) width 344: ".threeb {border-left: purple medium solid;}" text run at (0,75) width 328: ".threec {border-left: blue medium solid;}" text run at (0,90) width 272: "TD {border-left: green 2px solid;}" - RenderBlock {HR} at (0,151) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (20,169) size 749x34 - RenderText {#text} at (0,0) size 707x34 + RenderBlock {HR} at (0,152) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (20,170) size 749x36 + RenderText {#text} at (0,0) size 707x35 text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " text run at (634,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (20,219) size 749x17 [border: none (10px double #800080)] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (20,222) size 749x18 [border: none (10px double #800080)] RenderText {#text} at (10,0) size 414x17 text run at (10,0) width 414: "This paragraph should have a purple, double, 10-pixel left border." - RenderBlock {P} at (20,252) size 749x17 [border: none (1px solid #800080)] + RenderBlock {P} at (20,256) size 749x18 [border: none (1px solid #800080)] RenderText {#text} at (1,0) size 331x17 text run at (1,0) width 331: "This paragraph should have a thin purple left border." - RenderTable {TABLE} at (0,285) size 769x103 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x101 - RenderTableRow {TR} at (0,5) size 767x38 - RenderTableCell {TD} at (5,5) size 758x38 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,2) size 735x34 + RenderTable {TABLE} at (0,290) size 769x107 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x105 + RenderTableRow {TR} at (0,5) size 767x40 + RenderTableCell {TD} at (5,5) size 758x40 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (3,2) size 735x35 text run at (3,2) width 429: "Every cell in this table should have a 2-pixel solid green left border. " text run at (432,2) width 306: "This is also true of the table-testing section in the" - text run at (3,19) width 175: "second half of the test page." - RenderTableRow {TR} at (0,48) size 767x48 - RenderTableCell {TD} at (5,61) size 194x22 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,2) size 53x18 - text run at (3,3) width 53: "Cell one" - RenderTableCell {TD} at (203,48) size 560x48 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,2) size 554x17 + text run at (3,20) width 175: "second half of the test page." + RenderTableRow {TR} at (0,50) size 767x50 + RenderTableCell {TD} at (5,64) size 194x22 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,2) size 53x17 + text run at (3,2) width 53: "Cell one" + RenderTableCell {TD} at (203,50) size 560x50 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,2) size 554x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (3,19) size 162x27 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 160x25 - RenderTableRow {TR} at (0,2) size 160x21 - RenderTableCell {TD} at (2,2) size 156x21 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (3,20) size 162x28 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x26 + RenderTableRow {TR} at (0,2) size 160x22 + RenderTableCell {TD} at (2,2) size 156x22 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (3,2) size 151x17 text run at (3,2) width 151: "Nested single-cell table!" - RenderBlock {UL} at (0,404) size 769x136 - RenderListItem {LI} at (40,0) size 729x68 [border: none (3px solid #000000)] - RenderBlock (anonymous) at (3,0) size 726x17 + RenderBlock {UL} at (0,413) size 769x144 + RenderListItem {LI} at (40,0) size 729x72 [border: none (3px solid #000000)] + RenderBlock (anonymous) at (3,0) size 726x18 RenderListMarker at (-20,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (3,17) size 726x51 - RenderListItem {LI} at (40,0) size 686x17 + RenderBlock {UL} at (3,18) size 726x54 + RenderListItem {LI} at (40,0) size 686x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 686x17 + RenderListItem {LI} at (40,18) size 686x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 686x17 + RenderListItem {LI} at (40,36) size 686x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,68) size 729x17 [border: none (3px solid #800080)] + RenderListItem {LI} at (40,72) size 729x18 [border: none (3px solid #800080)] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (3,0) size 158x17 text run at (3,0) width 158: "This is a second list item." - RenderListItem {LI} at (40,85) size 729x51 [border: none (3px solid #0000FF)] + RenderListItem {LI} at (40,90) size 729x54 [border: none (3px solid #0000FF)] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (3,0) size 720x51 + RenderText {#text} at (3,0) size 720x53 text run at (3,0) width 695: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " text run at (698,0) width 25: "The" - text run at (3,17) width 719: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within" - text run at (3,34) width 490: "the list item.\"), even though the nested list does not have any border styles set." - RenderTable {TABLE} at (0,556) size 769x422 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x420 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] + text run at (3,18) width 719: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within" + text run at (3,36) width 490: "the list item.\"), even though the nested list does not have any border styles set." + RenderTable {TABLE} at (0,573) size 769x439 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x437 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (5,4) size 163x17 text run at (5,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x395 - RenderTableCell {TD} at (0,210) size 13x25 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (5,4) size 4x17 - text run at (5,4) width 4: " " - RenderTableCell {TD} at (13,25) size 754x395 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (25,4) size 725x34 - RenderText {#text} at (0,0) size 707x34 + RenderTableRow {TR} at (0,26) size 767x411 + RenderTableCell {TD} at (0,218) size 13x27 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (5,4) size 4x18 + text run at (5,5) width 4: " " + RenderTableCell {TD} at (13,26) size 754x411 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (25,4) size 725x36 + RenderText {#text} at (0,0) size 707x35 text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " text run at (634,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (25,54) size 725x17 [border: none (10px double #800080)] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (25,56) size 725x18 [border: none (10px double #800080)] RenderText {#text} at (10,0) size 414x17 text run at (10,0) width 414: "This paragraph should have a purple, double, 10-pixel left border." - RenderBlock {P} at (25,87) size 725x17 [border: none (1px solid #800080)] + RenderBlock {P} at (25,90) size 725x18 [border: none (1px solid #800080)] RenderText {#text} at (1,0) size 331x17 text run at (1,0) width 331: "This paragraph should have a thin purple left border." - RenderTable {TABLE} at (5,120) size 745x103 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 743x101 - RenderTableRow {TR} at (0,5) size 743x38 - RenderTableCell {TD} at (5,5) size 734x38 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,2) size 712x34 + RenderTable {TABLE} at (5,124) size 745x107 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 743x105 + RenderTableRow {TR} at (0,5) size 743x40 + RenderTableCell {TD} at (5,5) size 734x40 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (3,2) size 712x35 text run at (3,2) width 429: "Every cell in this table should have a 2-pixel solid green left border. " text run at (432,2) width 283: "This is also true of the table-testing section in" - text run at (3,19) width 198: "the second half of the test page." - RenderTableRow {TR} at (0,48) size 743x48 - RenderTableCell {TD} at (5,61) size 188x22 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,2) size 53x18 - text run at (3,3) width 53: "Cell one" - RenderTableCell {TD} at (197,48) size 542x48 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,2) size 536x17 + text run at (3,20) width 198: "the second half of the test page." + RenderTableRow {TR} at (0,50) size 743x50 + RenderTableCell {TD} at (5,64) size 188x22 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,2) size 53x17 + text run at (3,2) width 53: "Cell one" + RenderTableCell {TD} at (197,50) size 542x50 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,2) size 536x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (3,19) size 162x27 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 160x25 - RenderTableRow {TR} at (0,2) size 160x21 - RenderTableCell {TD} at (2,2) size 156x21 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (3,20) size 162x28 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x26 + RenderTableRow {TR} at (0,2) size 160x22 + RenderTableCell {TD} at (2,2) size 156x22 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (3,2) size 151x17 text run at (3,2) width 151: "Nested single-cell table!" - RenderBlock {UL} at (5,239) size 745x136 - RenderListItem {LI} at (40,0) size 705x68 [border: none (3px solid #000000)] - RenderBlock (anonymous) at (3,0) size 702x17 + RenderBlock {UL} at (5,247) size 745x144 + RenderListItem {LI} at (40,0) size 705x72 [border: none (3px solid #000000)] + RenderBlock (anonymous) at (3,0) size 702x18 RenderListMarker at (-20,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (3,17) size 702x51 - RenderListItem {LI} at (40,0) size 662x17 + RenderBlock {UL} at (3,18) size 702x54 + RenderListItem {LI} at (40,0) size 662x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 662x17 + RenderListItem {LI} at (40,18) size 662x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 662x17 + RenderListItem {LI} at (40,36) size 662x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,68) size 705x17 [border: none (3px solid #800080)] + RenderListItem {LI} at (40,72) size 705x18 [border: none (3px solid #800080)] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (3,0) size 158x17 text run at (3,0) width 158: "This is a second list item." - RenderListItem {LI} at (40,85) size 705x51 [border: none (3px solid #0000FF)] + RenderListItem {LI} at (40,90) size 705x54 [border: none (3px solid #0000FF)] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (3,0) size 691x51 + RenderText {#text} at (3,0) size 691x53 text run at (3,0) width 691: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors." - text run at (3,17) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" - text run at (3,34) width 597: "\"...nested within the list item.\"), even though the nested list does not have any border styles set." + text run at (3,18) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" + text run at (3,36) width 597: "\"...nested within the list item.\"), even though the nested list does not have any border styles set." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.png index fe1b33dd0cef..a853c5588a70 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.txt index 68874a1db442..5a2d6145db16 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_left_inline-expected.txt @@ -3,56 +3,56 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (20,0) size 764x17 + RenderBlock {P} at (20,0) size 764x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 312x60 text run at (0,0) width 176: "P {margin-left: 20px;}" text run at (0,15) width 312: ".one {border-left: purple double 10px;}" text run at (0,30) width 304: ".two {border-left: purple thin solid;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (20,124) size 764x51 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (20,125) size 764x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 760x17 text run at (0,0) width 760: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of" RenderInline {SPAN} at (0,0) size 67x17 [border: none (10px double #800080)] - RenderText {#text} at (10,17) size 57x17 - text run at (10,17) width 57: "class one" - RenderText {#text} at (67,17) size 389x17 - text run at (67,17) width 389: ", which should have a 10-pixel purple double left border; and " + RenderText {#text} at (10,18) size 57x17 + text run at (10,18) width 57: "class one" + RenderText {#text} at (67,18) size 389x17 + text run at (67,18) width 389: ", which should have a 10-pixel purple double left border; and " RenderInline {SPAN} at (0,0) size 59x17 [border: none (1px solid #800080)] - RenderText {#text} at (457,17) size 58x17 - text run at (457,17) width 58: "class two" - RenderText {#text} at (515,17) size 759x34 - text run at (515,17) width 244: ", which should have a thin solid purple" - text run at (0,34) width 73: "left border. " - text run at (73,34) width 429: "The line-height of the parent element should not change on any line." - RenderTable {TABLE} at (0,191) size 784x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x84 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (457,18) size 58x17 + text run at (457,18) width 58: "class two" + RenderText {#text} at (515,18) size 759x35 + text run at (515,18) width 244: ", which should have a thin solid purple" + text run at (0,36) width 73: "left border. " + text run at (73,36) width 429: "The line-height of the parent element should not change on any line." + RenderTable {TABLE} at (0,195) size 784x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x88 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (24,4) size 742x51 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 696x34 + RenderTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (24,4) size 742x54 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 696x35 text run at (0,0) width 696: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with" - text run at (0,17) width 64: "classes of " + text run at (0,18) width 64: "classes of " RenderInline {SPAN} at (0,0) size 67x17 [border: none (10px double #800080)] - RenderText {#text} at (74,17) size 57x17 - text run at (74,17) width 57: "class one" - RenderText {#text} at (131,17) size 389x17 - text run at (131,17) width 389: ", which should have a 10-pixel purple double left border; and " + RenderText {#text} at (74,18) size 57x17 + text run at (74,18) width 57: "class one" + RenderText {#text} at (131,18) size 389x17 + text run at (131,18) width 389: ", which should have a 10-pixel purple double left border; and " RenderInline {SPAN} at (0,0) size 59x17 [border: none (1px solid #800080)] - RenderText {#text} at (521,17) size 58x17 - text run at (521,17) width 58: "class two" - RenderText {#text} at (579,17) size 717x34 - text run at (579,17) width 138: ", which should have a" - text run at (0,34) width 179: "thin solid purple left border. " - text run at (179,34) width 429: "The line-height of the parent element should not change on any line." + RenderText {#text} at (521,18) size 58x17 + text run at (521,18) width 58: "class two" + RenderText {#text} at (579,18) size 717x35 + text run at (579,18) width 138: ", which should have a" + text run at (0,36) width 179: "thin solid purple left border. " + text run at (179,36) width 429: "The line-height of the parent element should not change on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.png index ce8e730ed6e0..ef3ccce477aa 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.txt index 92a6f9752211..8c8f24a0e0a9 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_left_width-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x805 +layer at (0,0) size 785x823 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x805 - RenderBlock {HTML} at (0,0) size 785x805 - RenderBody {BODY} at (8,8) size 769x789 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x823 + RenderBlock {HTML} at (0,0) size 785x823 + RenderBody {BODY} at (8,8) size 769x807 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 448x90 text run at (0,0) width 440: ".zero {background-color: silver; border-left-width: 0;}" text run at (0,15) width 416: ".one {border-left-width: 50px; border-style: solid;}" @@ -14,8 +14,8 @@ layer at (0,0) size 785x805 text run at (0,45) width 448: ".three {border-left-width: medium; border-style: solid;}" text run at (0,60) width 424: ".four {border-left-width: thin; border-style: solid;}" text run at (0,75) width 256: ".five {border-left-width: 25px;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x18 + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x15 @@ -23,24 +23,24 @@ layer at (0,0) size 785x805 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (0,188) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,221) size 769x40 [border: (3px solid #000000) (50px solid #000000)] - RenderText {#text} at (50,3) size 713x34 + RenderBlock {P} at (0,223) size 769x42 [border: (3px solid #000000) (50px solid #000000)] + RenderText {#text} at (50,3) size 713x35 text run at (50,3) width 713: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than" - text run at (50,20) width 86: "one line long." - RenderBlock {P} at (0,277) size 769x23 [border: (3px solid #000000) (5px solid #000000)] + text run at (50,21) width 86: "one line long." + RenderBlock {P} at (0,281) size 769x24 [border: (3px solid #000000) (5px solid #000000)] RenderText {#text} at (5,3) size 760x17 text run at (5,3) width 760: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,316) size 769x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 744x34 + RenderBlock {P} at (0,321) size 769x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 744x35 text run at (3,3) width 744: "This element should have a medium left border width, which will be more obvious if the element is more than one line" - text run at (3,20) width 32: "long." - RenderBlock {P} at (0,372) size 769x23 [border: (3px solid #000000) (1px solid #000000)] + text run at (3,21) width 32: "long." + RenderBlock {P} at (0,379) size 769x24 [border: (3px solid #000000) (1px solid #000000)] RenderText {#text} at (1,3) size 753x17 text run at (1,3) width 753: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,411) size 769x18 + RenderBlock {P} at (0,419) size 769x18 RenderText {#text} at (0,0) size 513x17 text run at (0,0) width 513: "This element should have no border and no extra \"padding\" on its left side, as no " RenderInline {CODE} at (0,0) size 96x15 @@ -48,18 +48,18 @@ layer at (0,0) size 785x805 text run at (513,3) width 96: "border-style" RenderText {#text} at (609,0) size 54x17 text run at (609,0) width 54: " was set." - RenderTable {TABLE} at (0,445) size 769x344 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x342 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,453) size 769x354 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x352 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x317 - RenderTableCell {TD} at (0,171) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x326 + RenderTableCell {TD} at (0,176) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x317 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 755x326 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " @@ -68,26 +68,26 @@ layer at (0,0) size 785x805 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (4,38) size 747x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,38) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,71) size 747x40 [border: (3px solid #000000) (50px solid #000000)] - RenderText {#text} at (50,3) size 682x34 + RenderBlock {P} at (4,72) size 747x42 [border: (3px solid #000000) (50px solid #000000)] + RenderText {#text} at (50,3) size 682x35 text run at (50,3) width 682: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more" - text run at (50,20) width 117: "than one line long." - RenderBlock {P} at (4,127) size 747x40 [border: (3px solid #000000) (5px solid #000000)] - RenderText {#text} at (5,3) size 724x34 + text run at (50,21) width 117: "than one line long." + RenderBlock {P} at (4,130) size 747x42 [border: (3px solid #000000) (5px solid #000000)] + RenderText {#text} at (5,3) size 724x35 text run at (5,3) width 724: "This element should have a thick left border width, which will be more obvious if the element is more than one line" - text run at (5,20) width 32: "long." - RenderBlock {P} at (4,183) size 747x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 717x34 + text run at (5,21) width 32: "long." + RenderBlock {P} at (4,188) size 747x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 717x35 text run at (3,3) width 717: "This element should have a medium left border width, which will be more obvious if the element is more than one" - text run at (3,20) width 59: "line long." - RenderBlock {P} at (4,239) size 747x40 [border: (3px solid #000000) (1px solid #000000)] - RenderText {#text} at (1,3) size 717x34 + text run at (3,21) width 59: "line long." + RenderBlock {P} at (4,246) size 747x42 [border: (3px solid #000000) (1px solid #000000)] + RenderText {#text} at (1,3) size 717x35 text run at (1,3) width 717: "This element should have a thin left border width, which will be more obvious if the element is more than one line" - text run at (1,20) width 32: "long." - RenderBlock {P} at (4,295) size 747x18 + text run at (1,21) width 32: "long." + RenderBlock {P} at (4,304) size 747x18 RenderText {#text} at (0,0) size 513x17 text run at (0,0) width 513: "This element should have no border and no extra \"padding\" on its left side, as no " RenderInline {CODE} at (0,0) size 96x15 diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.png index 499864a889c2..fdbec31daaa8 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.txt index 26a55662e1ae..59cff3967bd9 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_left_width_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 416x45 text run at (0,0) width 416: ".one {border-left-width: 25px; border-style: solid;}" text run at (0,15) width 416: ".two {border-left-width: thin; border-style: solid;}" text run at (0,30) width 264: ".three {border-left-width: 25px;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x76 [border: (3px solid #000000) (25px solid #000000)] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x78 [border: (3px solid #000000) (25px solid #000000)] RenderText {#text} at (25,3) size 172x17 text run at (25,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -33,32 +33,32 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 27x17 RenderText {#text} at (206,21) size 27x17 text run at (206,21) width 27: "first" - RenderText {#text} at (233,21) size 750x34 + RenderText {#text} at (233,21) size 750x35 text run at (233,21) width 505: " box in the inline element (and the UA's default border on the other three sides). " text run at (738,21) width 37: "There" - text run at (25,38) width 62: "is also an " + text run at (25,39) width 62: "is also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (87,38) size 143x17 - text run at (87,38) width 143: "inline element of class " + RenderText {#text} at (87,39) size 143x17 + text run at (87,39) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (230,41) size 40x15 - text run at (230,41) width 40: "three" - RenderText {#text} at (270,38) size 727x35 - text run at (270,38) width 482: ", which should have no left border width or visible border because no border" - text run at (25,56) width 83: "style was set." - RenderTable {TABLE} at (0,201) size 784x111 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x109 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (230,42) size 40x15 + text run at (230,42) width 40: "three" + RenderText {#text} at (270,39) size 727x35 + text run at (270,39) width 482: ", which should have no left border width or visible border because no border" + text run at (25,57) width 83: "style was set." + RenderTable {TABLE} at (0,204) size 784x114 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x112 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x84 - RenderTableCell {TD} at (0,54) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x84 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x76 [border: (3px solid #000000) (25px solid #000000)] + RenderTableRow {TR} at (0,26) size 782x86 + RenderTableCell {TD} at (0,56) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x86 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x78 [border: (3px solid #000000) (25px solid #000000)] RenderText {#text} at (25,3) size 172x17 text run at (25,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -79,16 +79,16 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 27x17 RenderText {#text} at (240,21) size 27x17 text run at (240,21) width 27: "first" - RenderText {#text} at (267,21) size 699x34 + RenderText {#text} at (267,21) size 699x35 text run at (267,21) width 457: " box in the inline element (and the UA's default border on the other three" - text run at (25,38) width 44: "sides). " - text run at (69,38) width 103: "There is also an " + text run at (25,39) width 44: "sides). " + text run at (69,39) width 103: "There is also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (172,38) size 143x17 - text run at (172,38) width 143: "inline element of class " + RenderText {#text} at (172,39) size 143x17 + text run at (172,39) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (315,41) size 40x15 - text run at (315,41) width 40: "three" - RenderText {#text} at (355,38) size 693x35 - text run at (355,38) width 363: ", which should have no left border width or visible border" - text run at (25,56) width 202: "because no border style was set." + RenderText {#text} at (315,42) size 40x15 + text run at (315,42) width 40: "three" + RenderText {#text} at (355,39) size 693x35 + text run at (355,39) width 363: ", which should have no left border width or visible border" + text run at (25,57) width 202: "because no border style was set." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.png index 42b36352e021..53ac86d5d7d4 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.txt index d6efa7987d8c..9687cda7dae8 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_right-expected.txt @@ -3,57 +3,57 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 764x17 + RenderBlock {P} at (0,0) size 764x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 320x60 text run at (0,0) width 184: "P {margin-right: 20px;}" text run at (0,15) width 320: ".one {border-right: purple double 10px;}" text run at (0,30) width 312: ".two {border-right: purple thin solid;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 764x51 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 752x34 + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 764x54 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 752x35 text run at (0,0) width 752: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes" - text run at (0,17) width 17: "of " + text run at (0,18) width 17: "of " RenderInline {SPAN} at (0,0) size 67x17 [border: none (10px double #800080) none] - RenderText {#text} at (17,17) size 57x17 - text run at (17,17) width 57: "class one" - RenderText {#text} at (84,17) size 398x17 - text run at (84,17) width 398: ", which should have a 10-pixel purple double right border; and " + RenderText {#text} at (17,18) size 57x17 + text run at (17,18) width 57: "class one" + RenderText {#text} at (84,18) size 398x17 + text run at (84,18) width 398: ", which should have a 10-pixel purple double right border; and " RenderInline {SPAN} at (0,0) size 59x17 [border: none (1px solid #800080) none] - RenderText {#text} at (482,17) size 58x17 - text run at (482,17) width 58: "class two" - RenderText {#text} at (541,17) size 741x34 - text run at (541,17) width 200: ", which should have a thin solid" - text run at (0,34) width 126: "purple right border. " - text run at (126,34) width 429: "The line-height of the parent element should not change on any line." - RenderTable {TABLE} at (0,191) size 784x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x84 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (482,18) size 58x17 + text run at (482,18) width 58: "class two" + RenderText {#text} at (541,18) size 741x35 + text run at (541,18) width 200: ", which should have a thin solid" + text run at (0,36) width 126: "purple right border. " + text run at (126,36) width 429: "The line-height of the parent element should not change on any line." + RenderTable {TABLE} at (0,195) size 784x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x88 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 742x51 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 705x34 + RenderTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 742x54 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 705x35 text run at (0,0) width 705: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with" - text run at (0,17) width 64: "classes of " + text run at (0,18) width 64: "classes of " RenderInline {SPAN} at (0,0) size 67x17 [border: none (10px double #800080) none] - RenderText {#text} at (64,17) size 57x17 - text run at (64,17) width 57: "class one" - RenderText {#text} at (131,17) size 398x17 - text run at (131,17) width 398: ", which should have a 10-pixel purple double right border; and " + RenderText {#text} at (64,18) size 57x17 + text run at (64,18) width 57: "class one" + RenderText {#text} at (131,18) size 398x17 + text run at (131,18) width 398: ", which should have a 10-pixel purple double right border; and " RenderInline {SPAN} at (0,0) size 59x17 [border: none (1px solid #800080) none] - RenderText {#text} at (529,17) size 58x17 - text run at (529,17) width 58: "class two" - RenderText {#text} at (588,17) size 726x34 - text run at (588,17) width 138: ", which should have a" - text run at (0,34) width 188: "thin solid purple right border. " - text run at (188,34) width 429: "The line-height of the parent element should not change on any line." + RenderText {#text} at (529,18) size 58x17 + text run at (529,18) width 58: "class two" + RenderText {#text} at (588,18) size 726x35 + text run at (588,18) width 138: ", which should have a" + text run at (0,36) width 188: "thin solid purple right border. " + text run at (188,36) width 429: "The line-height of the parent element should not change on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.png index 25d7d1e7fa62..5354c43f6567 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.txt index 990a04dedb80..fd1708a4b9b2 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_right_inline-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1045 +layer at (0,0) size 785x1082 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1045 - RenderBlock {HTML} at (0,0) size 785x1045 - RenderBody {BODY} at (8,8) size 769x1029 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 749x17 +layer at (0,0) size 785x1082 + RenderBlock {HTML} at (0,0) size 785x1082 + RenderBody {BODY} at (8,8) size 769x1066 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 749x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x105 + RenderBlock {PRE} at (0,34) size 769x105 RenderText {#text} at (0,0) size 352x105 text run at (0,0) width 184: "P {margin-right: 20px;}" text run at (0,15) width 320: ".one {border-right: purple double 10px;}" @@ -15,145 +15,145 @@ layer at (0,0) size 785x1045 text run at (0,60) width 352: ".threeb {border-right: purple medium solid;}" text run at (0,75) width 336: ".threec {border-right: blue medium solid;}" text run at (0,90) width 280: "TD {border-right: green 2px solid;}" - RenderBlock {HR} at (0,151) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,169) size 749x34 - RenderText {#text} at (0,0) size 716x34 + RenderBlock {HR} at (0,152) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,170) size 749x36 + RenderText {#text} at (0,0) size 716x35 text run at (0,0) width 643: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " text run at (643,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (0,219) size 749x17 [border: none (10px double #800080) none] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (0,222) size 749x18 [border: none (10px double #800080) none] RenderText {#text} at (0,0) size 423x17 text run at (0,0) width 423: "This paragraph should have a purple, double, 10-pixel right border." - RenderBlock {P} at (0,252) size 749x17 [border: none (1px solid #800080) none] + RenderBlock {P} at (0,256) size 749x18 [border: none (1px solid #800080) none] RenderText {#text} at (0,0) size 340x17 text run at (0,0) width 340: "This paragraph should have a thin purple right border." - RenderTable {TABLE} at (0,285) size 769x103 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x101 - RenderTableRow {TR} at (0,5) size 767x38 - RenderTableCell {TD} at (5,5) size 758x38 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 744x34 + RenderTable {TABLE} at (0,290) size 769x107 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x105 + RenderTableRow {TR} at (0,5) size 767x40 + RenderTableCell {TD} at (5,5) size 758x40 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (2,2) size 744x35 text run at (2,2) width 438: "Every cell in this table should have a 2-pixel solid green right border. " text run at (440,2) width 306: "This is also true of the table-testing section in the" - text run at (2,19) width 175: "second half of the test page." - RenderTableRow {TR} at (0,48) size 767x48 - RenderTableCell {TD} at (5,61) size 194x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 53x18 - text run at (2,3) width 53: "Cell one" - RenderTableCell {TD} at (203,48) size 560x48 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 554x17 + text run at (2,20) width 175: "second half of the test page." + RenderTableRow {TR} at (0,50) size 767x50 + RenderTableCell {TD} at (5,64) size 194x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x17 + text run at (2,2) width 53: "Cell one" + RenderTableCell {TD} at (203,50) size 560x50 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 554x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (2,19) size 162x27 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 160x25 - RenderTableRow {TR} at (0,2) size 160x21 - RenderTableCell {TD} at (2,2) size 156x21 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,20) size 162x28 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x26 + RenderTableRow {TR} at (0,2) size 160x22 + RenderTableCell {TD} at (2,2) size 156x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 151x17 text run at (2,2) width 151: "Nested single-cell table!" - RenderBlock {UL} at (0,404) size 769x153 - RenderListItem {LI} at (40,0) size 729x68 [border: none (3px solid #000000) none] - RenderBlock (anonymous) at (0,0) size 726x17 + RenderBlock {UL} at (0,413) size 769x162 + RenderListItem {LI} at (40,0) size 729x72 [border: none (3px solid #000000) none] + RenderBlock (anonymous) at (0,0) size 726x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (0,17) size 726x51 - RenderListItem {LI} at (40,0) size 686x17 + RenderBlock {UL} at (0,18) size 726x54 + RenderListItem {LI} at (40,0) size 686x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 686x17 + RenderListItem {LI} at (40,18) size 686x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 686x17 + RenderListItem {LI} at (40,36) size 686x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,68) size 729x17 [border: none (3px solid #800080) none] + RenderListItem {LI} at (40,72) size 729x18 [border: none (3px solid #800080) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 158x17 text run at (0,0) width 158: "This is a second list item." - RenderListItem {LI} at (40,85) size 729x68 [border: none (3px solid #0000FF) none] + RenderListItem {LI} at (40,90) size 729x72 [border: none (3px solid #0000FF) none] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 707x68 + RenderText {#text} at (0,0) size 707x71 text run at (0,0) width 700: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." - text run at (0,17) width 704: "The first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested" - text run at (0,34) width 538: "within the list item.\"), even though the nested list does not have any border styles set. " - text run at (538,34) width 169: "The borders should line up" - text run at (0,51) width 621: "together at the right edge of the document's body, as each list element has a default width of 100%." - RenderTable {TABLE} at (0,573) size 769x456 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x454 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 704: "The first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested" + text run at (0,36) width 538: "within the list item.\"), even though the nested list does not have any border styles set. " + text run at (538,36) width 169: "The borders should line up" + text run at (0,54) width 621: "together at the right edge of the document's body, as each list element has a default width of 100%." + RenderTable {TABLE} at (0,591) size 769x475 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x473 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x429 - RenderTableCell {TD} at (0,227) size 13x25 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (13,25) size 754x429 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 725x34 - RenderText {#text} at (0,0) size 716x34 + RenderTableRow {TR} at (0,26) size 767x447 + RenderTableCell {TD} at (0,236) size 13x27 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (13,26) size 754x447 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 725x36 + RenderText {#text} at (0,0) size 716x35 text run at (0,0) width 643: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " text run at (643,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (4,54) size 725x17 [border: none (10px double #800080) none] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (4,56) size 725x18 [border: none (10px double #800080) none] RenderText {#text} at (0,0) size 423x17 text run at (0,0) width 423: "This paragraph should have a purple, double, 10-pixel right border." - RenderBlock {P} at (4,87) size 725x17 [border: none (1px solid #800080) none] + RenderBlock {P} at (4,90) size 725x18 [border: none (1px solid #800080) none] RenderText {#text} at (0,0) size 340x17 text run at (0,0) width 340: "This paragraph should have a thin purple right border." - RenderTable {TABLE} at (4,120) size 745x103 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 743x101 - RenderTableRow {TR} at (0,5) size 743x38 - RenderTableCell {TD} at (5,5) size 734x38 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 721x34 + RenderTable {TABLE} at (4,124) size 745x107 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 743x105 + RenderTableRow {TR} at (0,5) size 743x40 + RenderTableCell {TD} at (5,5) size 734x40 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (2,2) size 721x35 text run at (2,2) width 438: "Every cell in this table should have a 2-pixel solid green right border. " text run at (440,2) width 283: "This is also true of the table-testing section in" - text run at (2,19) width 198: "the second half of the test page." - RenderTableRow {TR} at (0,48) size 743x48 - RenderTableCell {TD} at (5,61) size 188x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 53x18 - text run at (2,3) width 53: "Cell one" - RenderTableCell {TD} at (197,48) size 542x48 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 536x17 + text run at (2,20) width 198: "the second half of the test page." + RenderTableRow {TR} at (0,50) size 743x50 + RenderTableCell {TD} at (5,64) size 188x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x17 + text run at (2,2) width 53: "Cell one" + RenderTableCell {TD} at (197,50) size 542x50 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 536x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (2,19) size 162x27 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 160x25 - RenderTableRow {TR} at (0,2) size 160x21 - RenderTableCell {TD} at (2,2) size 156x21 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,20) size 162x28 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x26 + RenderTableRow {TR} at (0,2) size 160x22 + RenderTableCell {TD} at (2,2) size 156x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 151x17 text run at (2,2) width 151: "Nested single-cell table!" - RenderBlock {UL} at (4,239) size 745x170 - RenderListItem {LI} at (40,0) size 705x68 [border: none (3px solid #000000) none] - RenderBlock (anonymous) at (0,0) size 702x17 + RenderBlock {UL} at (4,247) size 745x180 + RenderListItem {LI} at (40,0) size 705x72 [border: none (3px solid #000000) none] + RenderBlock (anonymous) at (0,0) size 702x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (0,17) size 702x51 - RenderListItem {LI} at (40,0) size 662x17 + RenderBlock {UL} at (0,18) size 702x54 + RenderListItem {LI} at (40,0) size 662x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 662x17 + RenderListItem {LI} at (40,18) size 662x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 662x17 + RenderListItem {LI} at (40,36) size 662x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,68) size 705x17 [border: none (3px solid #800080) none] + RenderListItem {LI} at (40,72) size 705x18 [border: none (3px solid #800080) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 158x17 text run at (0,0) width 158: "This is a second list item." - RenderListItem {LI} at (40,85) size 705x85 [border: none (3px solid #0000FF) none] + RenderListItem {LI} at (40,90) size 705x90 [border: none (3px solid #0000FF) none] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 700x85 + RenderText {#text} at (0,0) size 700x89 text run at (0,0) width 700: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." - text run at (0,17) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" - text run at (0,34) width 601: "\"...nested within the list item.\"), even though the nested list does not have any border styles set. " - text run at (601,34) width 76: "The borders" - text run at (0,51) width 669: "should line up together at the right edge of the document's body, as each list element has a default width of" - text run at (0,68) width 41: "100%." + text run at (0,18) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" + text run at (0,36) width 601: "\"...nested within the list item.\"), even though the nested list does not have any border styles set. " + text run at (601,36) width 76: "The borders" + text run at (0,54) width 669: "should line up together at the right edge of the document's body, as each list element has a default width of" + text run at (0,72) width 41: "100%." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.png index e93f25c3bc23..f30a6a731eca 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.txt index abf0ba2c4245..7c655c77339e 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_right_width-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x822 +layer at (0,0) size 785x841 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x822 - RenderBlock {HTML} at (0,0) size 785x822 - RenderBody {BODY} at (8,8) size 769x806 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x841 + RenderBlock {HTML} at (0,0) size 785x841 + RenderBody {BODY} at (8,8) size 769x825 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 456x90 text run at (0,0) width 448: ".zero {background-color: silver; border-right-width: 0;}" text run at (0,15) width 424: ".one {border-right-width: 25px; border-style: solid;}" @@ -14,8 +14,8 @@ layer at (0,0) size 785x822 text run at (0,45) width 456: ".three {border-right-width: medium; border-style: solid;}" text run at (0,60) width 432: ".four {border-right-width: thin; border-style: solid;}" text run at (0,75) width 272: ".five {border-right-width: 100px;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x18 + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x15 @@ -23,25 +23,25 @@ layer at (0,0) size 785x822 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (0,188) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,221) size 769x40 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 722x34 + RenderBlock {P} at (0,223) size 769x42 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 722x35 text run at (3,3) width 722: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than" - text run at (3,20) width 86: "one line long." - RenderBlock {P} at (0,277) size 769x40 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 733x34 + text run at (3,21) width 86: "one line long." + RenderBlock {P} at (0,281) size 769x42 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 733x35 text run at (3,3) width 733: "This element should have a thick right border width, which will be more obvious if the element is more than one line" - text run at (3,20) width 32: "long." - RenderBlock {P} at (0,333) size 769x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 753x34 + text run at (3,21) width 32: "long." + RenderBlock {P} at (0,339) size 769x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 753x35 text run at (3,3) width 753: "This element should have a medium right border width, which will be more obvious if the element is more than one line" - text run at (3,20) width 32: "long." - RenderBlock {P} at (0,389) size 769x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + text run at (3,21) width 32: "long." + RenderBlock {P} at (0,397) size 769x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 762x17 text run at (3,3) width 762: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,428) size 769x18 + RenderBlock {P} at (0,437) size 769x18 RenderText {#text} at (0,0) size 522x17 text run at (0,0) width 522: "This element should have no border and no extra \"padding\" on its right side, as no " RenderInline {CODE} at (0,0) size 96x15 @@ -49,18 +49,18 @@ layer at (0,0) size 785x822 text run at (522,3) width 96: "border-style" RenderText {#text} at (618,0) size 54x17 text run at (618,0) width 54: " was set." - RenderTable {TABLE} at (0,462) size 769x344 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x342 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,471) size 769x354 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x352 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x317 - RenderTableCell {TD} at (0,171) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x326 + RenderTableCell {TD} at (0,176) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x317 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 755x326 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " @@ -69,26 +69,26 @@ layer at (0,0) size 785x822 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (4,38) size 747x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,38) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,71) size 747x40 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 691x34 + RenderBlock {P} at (4,72) size 747x42 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 691x35 text run at (3,3) width 691: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more" - text run at (3,20) width 117: "than one line long." - RenderBlock {P} at (4,127) size 747x40 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 733x34 + text run at (3,21) width 117: "than one line long." + RenderBlock {P} at (4,130) size 747x42 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 733x35 text run at (3,3) width 733: "This element should have a thick right border width, which will be more obvious if the element is more than one line" - text run at (3,20) width 32: "long." - RenderBlock {P} at (4,183) size 747x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 726x34 + text run at (3,21) width 32: "long." + RenderBlock {P} at (4,188) size 747x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 726x35 text run at (3,3) width 726: "This element should have a medium right border width, which will be more obvious if the element is more than one" - text run at (3,20) width 59: "line long." - RenderBlock {P} at (4,239) size 747x40 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 726x34 + text run at (3,21) width 59: "line long." + RenderBlock {P} at (4,246) size 747x42 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 726x35 text run at (3,3) width 726: "This element should have a thin right border width, which will be more obvious if the element is more than one line" - text run at (3,20) width 32: "long." - RenderBlock {P} at (4,295) size 747x18 + text run at (3,21) width 32: "long." + RenderBlock {P} at (4,304) size 747x18 RenderText {#text} at (0,0) size 522x17 text run at (0,0) width 522: "This element should have no border and no extra \"padding\" on its right side, as no " RenderInline {CODE} at (0,0) size 96x15 diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.png index 2cc0ece0f41a..669831ce2c43 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.txt index 08b213dad3ed..3280187ae5cf 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_right_width_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 424x45 text run at (0,0) width 424: ".one {border-right-width: 25px; border-style: solid;}" text run at (0,15) width 424: ".two {border-right-width: thin; border-style: solid;}" text run at (0,30) width 272: ".three {border-right-width: 25px;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x76 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x78 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 172x17 text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -33,32 +33,32 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 23x17 RenderText {#text} at (193,21) size 23x17 text run at (193,21) width 23: "last" - RenderText {#text} at (216,21) size 756x34 + RenderText {#text} at (216,21) size 756x35 text run at (216,21) width 506: " box of the inline element (and the UA's default border on the other three sides). " text run at (722,21) width 37: "There" - text run at (3,38) width 62: "is also an " + text run at (3,39) width 62: "is also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (65,38) size 143x17 - text run at (65,38) width 143: "inline element of class " + RenderText {#text} at (65,39) size 143x17 + text run at (65,39) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (208,41) size 40x15 - text run at (208,41) width 40: "three" - RenderText {#text} at (248,38) size 736x35 - text run at (248,38) width 491: ", which should have no right border width or visible border because no border" - text run at (3,56) width 83: "style was set." - RenderTable {TABLE} at (0,201) size 784x111 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x109 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (208,42) size 40x15 + text run at (208,42) width 40: "three" + RenderText {#text} at (248,39) size 736x35 + text run at (248,39) width 491: ", which should have no right border width or visible border because no border" + text run at (3,57) width 83: "style was set." + RenderTable {TABLE} at (0,204) size 784x114 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x112 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x84 - RenderTableCell {TD} at (0,54) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x84 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x76 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderTableRow {TR} at (0,26) size 782x86 + RenderTableCell {TD} at (0,56) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x86 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x78 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 172x17 text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -79,16 +79,16 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 23x17 RenderText {#text} at (227,21) size 23x17 text run at (227,21) width 23: "last" - RenderText {#text} at (250,21) size 705x34 + RenderText {#text} at (250,21) size 705x35 text run at (250,21) width 458: " box of the inline element (and the UA's default border on the other three" - text run at (3,38) width 44: "sides). " - text run at (47,38) width 103: "There is also an " + text run at (3,39) width 44: "sides). " + text run at (47,39) width 103: "There is also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (150,38) size 143x17 - text run at (150,38) width 143: "inline element of class " + RenderText {#text} at (150,39) size 143x17 + text run at (150,39) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (293,41) size 40x15 - text run at (293,41) width 40: "three" - RenderText {#text} at (333,38) size 702x35 - text run at (333,38) width 372: ", which should have no right border width or visible border" - text run at (3,56) width 202: "because no border style was set." + RenderText {#text} at (293,42) size 40x15 + text run at (293,42) width 40: "three" + RenderText {#text} at (333,39) size 702x35 + text run at (333,39) width 372: ", which should have no right border width or visible border" + text run at (3,57) width 202: "because no border style was set." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.png index 7e9abbff3373..137d1db4af3c 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.txt index 42c84e71f3ce..7ec7e8dffb2d 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_style-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1273 +layer at (0,0) size 785x1301 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1273 - RenderBlock {HTML} at (0,0) size 785x1273 - RenderBody {BODY} at (8,8) size 769x1257 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1301 + RenderBlock {HTML} at (0,0) size 785x1301 + RenderBody {BODY} at (8,8) size 769x1285 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x180 + RenderBlock {PRE} at (0,34) size 769x180 RenderText {#text} at (0,0) size 632x180 text run at (0,0) width 560: ".one {border-style: dotted; border-color: black; border-width: thick;}" text run at (0,15) width 560: ".two {border-style: dashed; border-color: black; border-width: thick;}" @@ -20,90 +20,90 @@ layer at (0,0) size 785x1273 text run at (0,135) width 368: ".ten {border-style: double groove ridge inset;" text run at (0,150) width 368: " border-color: purple; border-width: thick;}" text run at (0,165) width 552: ".eleven {border-style: none; border-color: red; border-width: thick;}" - RenderBlock {HR} at (0,226) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,244) size 769x27 [border: (5px dotted #000000)] + RenderBlock {HR} at (0,227) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,245) size 769x28 [border: (5px dotted #000000)] RenderText {#text} at (5,5) size 472x17 text run at (5,5) width 472: "This paragraph should have a thick black dotted border all the way around." - RenderBlock {P} at (0,287) size 769x27 [border: (5px dashed #000000)] + RenderBlock {P} at (0,289) size 769x28 [border: (5px dashed #000000)] RenderText {#text} at (5,5) size 477x17 text run at (5,5) width 477: "This paragraph should have a thick black dashed border all the way around." - RenderBlock {P} at (0,330) size 769x27 [border: (5px solid #000000)] + RenderBlock {P} at (0,333) size 769x28 [border: (5px solid #000000)] RenderText {#text} at (5,5) size 463x17 text run at (5,5) width 463: "This paragraph should have a thick black solid border all the way around." - RenderBlock {P} at (0,373) size 769x27 [border: (5px double #000000)] + RenderBlock {P} at (0,377) size 769x28 [border: (5px double #000000)] RenderText {#text} at (5,5) size 476x17 text run at (5,5) width 476: "This paragraph should have a thick black double border all the way around." - RenderBlock {P} at (0,416) size 769x27 [border: (5px groove #808000)] + RenderBlock {P} at (0,421) size 769x28 [border: (5px groove #808000)] RenderText {#text} at (5,5) size 474x17 text run at (5,5) width 474: "This paragraph should have a thick olive groove border all the way around." - RenderBlock {P} at (0,459) size 769x27 [border: (5px ridge #808000)] + RenderBlock {P} at (0,465) size 769x28 [border: (5px ridge #808000)] RenderText {#text} at (5,5) size 462x17 text run at (5,5) width 462: "This paragraph should have a thick olive ridge border all the way around." - RenderBlock {P} at (0,502) size 769x27 [border: (5px inset #808000)] + RenderBlock {P} at (0,509) size 769x28 [border: (5px inset #808000)] RenderText {#text} at (5,5) size 459x17 text run at (5,5) width 459: "This paragraph should have a thick olive inset border all the way around." - RenderBlock {P} at (0,545) size 769x27 [border: (5px outset #808000)] + RenderBlock {P} at (0,553) size 769x28 [border: (5px outset #808000)] RenderText {#text} at (5,5) size 467x17 text run at (5,5) width 467: "This paragraph should have a thick olive outset border all the way around." - RenderBlock {P} at (0,588) size 769x44 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - RenderText {#text} at (5,5) size 744x34 + RenderBlock {P} at (0,597) size 769x46 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] + RenderText {#text} at (5,5) size 744x35 text run at (5,5) width 617: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " text run at (622,5) width 127: "The color of all four" - text run at (5,22) width 204: "sides should be based on purple." - RenderBlock {P} at (0,648) size 769x44 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - RenderText {#text} at (5,5) size 727x34 + text run at (5,23) width 204: "sides should be based on purple." + RenderBlock {P} at (0,659) size 769x46 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] + RenderText {#text} at (5,5) size 727x35 text run at (5,5) width 702: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " text run at (707,5) width 25: "The" - text run at (5,22) width 306: "color of all four sides should be based on purple." - RenderBlock {P} at (0,708) size 769x17 + text run at (5,23) width 306: "color of all four sides should be based on purple." + RenderBlock {P} at (0,721) size 769x18 RenderText {#text} at (0,0) size 278x17 text run at (0,0) width 278: "This paragraph should have no border at all." - RenderTable {TABLE} at (0,741) size 769x516 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x514 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,755) size 769x530 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x528 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x489 - RenderTableCell {TD} at (0,257) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x502 + RenderTableCell {TD} at (0,264) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x489 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x27 [border: (5px dotted #000000)] + RenderTableCell {TD} at (12,26) size 755x502 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x28 [border: (5px dotted #000000)] RenderText {#text} at (5,5) size 472x17 text run at (5,5) width 472: "This paragraph should have a thick black dotted border all the way around." - RenderBlock {P} at (4,47) size 747x27 [border: (5px dashed #000000)] + RenderBlock {P} at (4,48) size 747x28 [border: (5px dashed #000000)] RenderText {#text} at (5,5) size 477x17 text run at (5,5) width 477: "This paragraph should have a thick black dashed border all the way around." - RenderBlock {P} at (4,90) size 747x27 [border: (5px solid #000000)] + RenderBlock {P} at (4,92) size 747x28 [border: (5px solid #000000)] RenderText {#text} at (5,5) size 463x17 text run at (5,5) width 463: "This paragraph should have a thick black solid border all the way around." - RenderBlock {P} at (4,133) size 747x27 [border: (5px double #000000)] + RenderBlock {P} at (4,136) size 747x28 [border: (5px double #000000)] RenderText {#text} at (5,5) size 476x17 text run at (5,5) width 476: "This paragraph should have a thick black double border all the way around." - RenderBlock {P} at (4,176) size 747x27 [border: (5px groove #808000)] + RenderBlock {P} at (4,180) size 747x28 [border: (5px groove #808000)] RenderText {#text} at (5,5) size 474x17 text run at (5,5) width 474: "This paragraph should have a thick olive groove border all the way around." - RenderBlock {P} at (4,219) size 747x27 [border: (5px ridge #808000)] + RenderBlock {P} at (4,224) size 747x28 [border: (5px ridge #808000)] RenderText {#text} at (5,5) size 462x17 text run at (5,5) width 462: "This paragraph should have a thick olive ridge border all the way around." - RenderBlock {P} at (4,262) size 747x27 [border: (5px inset #808000)] + RenderBlock {P} at (4,268) size 747x28 [border: (5px inset #808000)] RenderText {#text} at (5,5) size 459x17 text run at (5,5) width 459: "This paragraph should have a thick olive inset border all the way around." - RenderBlock {P} at (4,305) size 747x27 [border: (5px outset #808000)] + RenderBlock {P} at (4,312) size 747x28 [border: (5px outset #808000)] RenderText {#text} at (5,5) size 467x17 text run at (5,5) width 467: "This paragraph should have a thick olive outset border all the way around." - RenderBlock {P} at (4,348) size 747x44 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - RenderText {#text} at (5,5) size 714x34 + RenderBlock {P} at (4,356) size 747x46 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] + RenderText {#text} at (5,5) size 714x35 text run at (5,5) width 617: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " text run at (622,5) width 97: "The color of all" - text run at (5,22) width 234: "four sides should be based on purple." - RenderBlock {P} at (4,408) size 747x44 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - RenderText {#text} at (5,5) size 727x34 + text run at (5,23) width 234: "four sides should be based on purple." + RenderBlock {P} at (4,418) size 747x46 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] + RenderText {#text} at (5,5) size 727x35 text run at (5,5) width 702: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " text run at (707,5) width 25: "The" - text run at (5,22) width 306: "color of all four sides should be based on purple." - RenderBlock {P} at (4,468) size 747x17 + text run at (5,23) width 306: "color of all four sides should be based on purple." + RenderBlock {P} at (4,480) size 747x18 RenderText {#text} at (0,0) size 278x17 text run at (0,0) width 278: "This paragraph should have no border at all." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.png index dcf7b58ce335..e6d3d737a76e 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.txt index a5528be361b2..bd770cd38dcb 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_style_inline-expected.txt @@ -3,65 +3,65 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 568x45 text run at (0,0) width 560: ".one {border-style: dashed; border-color: black; border-width: thick;}" text run at (0,15) width 544: ".two {border-style: groove; border-color: red; border-width: thick;}" text run at (0,30) width 568: ".three {border-style: none; border-color: purple; border-width: thick;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x51 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 664x17 text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " RenderInline {SPAN} at (0,0) size 67x27 [border: (5px dashed #000000)] RenderText {#text} at (669,0) size 57x17 text run at (669,0) width 57: "class one" - RenderText {#text} at (731,0) size 778x34 + RenderText {#text} at (731,0) size 778x35 text run at (731,0) width 47: ", which" - text run at (0,17) width 263: "will result in a dashed thick black border; " + text run at (0,18) width 263: "will result in a dashed thick black border; " RenderInline {SPAN} at (0,0) size 68x27 [border: (5px groove #FF0000)] - RenderText {#text} at (268,17) size 58x17 - text run at (268,17) width 58: "class two" - RenderText {#text} at (331,17) size 373x17 - text run at (331,17) width 373: ", which should result in a grooved thick purple border, and " + RenderText {#text} at (268,18) size 58x17 + text run at (268,18) width 58: "class two" + RenderText {#text} at (331,18) size 373x17 + text run at (331,18) width 373: ", which should result in a grooved thick purple border, and " RenderInline {SPAN} at (0,0) size 65x17 - RenderText {#text} at (704,17) size 65x17 - text run at (704,17) width 65: "class three" - RenderText {#text} at (769,17) size 773x34 - text run at (769,17) width 4: "," - text run at (0,34) width 246: "which should result in no border at all. " - text run at (246,34) width 433: "The line-height of the parent element should not change, on any line." - RenderTable {TABLE} at (0,176) size 784x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x84 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (704,18) size 65x17 + text run at (704,18) width 65: "class three" + RenderText {#text} at (769,18) size 773x35 + text run at (769,18) width 4: "," + text run at (0,36) width 246: "which should result in no border at all. " + text run at (246,36) width 433: "The line-height of the parent element should not change, on any line." + RenderTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x88 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x51 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 664x17 text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " RenderInline {SPAN} at (0,0) size 67x27 [border: (5px dashed #000000)] RenderText {#text} at (669,0) size 57x17 text run at (669,0) width 57: "class one" - RenderText {#text} at (731,0) size 735x34 + RenderText {#text} at (731,0) size 735x35 text run at (731,0) width 4: "," - text run at (0,17) width 306: "which will result in a dashed thick black border; " + text run at (0,18) width 306: "which will result in a dashed thick black border; " RenderInline {SPAN} at (0,0) size 68x27 [border: (5px groove #FF0000)] - RenderText {#text} at (311,17) size 58x17 - text run at (311,17) width 58: "class two" - RenderText {#text} at (374,17) size 369x17 - text run at (374,17) width 369: ", which should result in a grooved thick purple border, and" + RenderText {#text} at (311,18) size 58x17 + text run at (311,18) width 58: "class two" + RenderText {#text} at (374,18) size 369x17 + text run at (374,18) width 369: ", which should result in a grooved thick purple border, and" RenderInline {SPAN} at (0,0) size 65x17 - RenderText {#text} at (0,34) size 65x17 - text run at (0,34) width 65: "class three" - RenderText {#text} at (65,34) size 687x17 - text run at (65,34) width 254: ", which should result in no border at all. " - text run at (319,34) width 433: "The line-height of the parent element should not change, on any line." + RenderText {#text} at (0,36) size 65x17 + text run at (0,36) width 65: "class three" + RenderText {#text} at (65,36) size 687x17 + text run at (65,36) width 254: ", which should result in no border at all. " + text run at (319,36) width 433: "The line-height of the parent element should not change, on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.png index 893a02825f84..54e6de737363 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.txt index b907e33d345b..301c697eb98d 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_top-expected.txt @@ -1,147 +1,147 @@ -layer at (0,0) size 785x929 +layer at (0,0) size 785x959 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x929 - RenderBlock {HTML} at (0,0) size 785x929 - RenderBody {BODY} at (8,8) size 769x913 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x959 + RenderBlock {HTML} at (0,0) size 785x959 + RenderBody {BODY} at (8,8) size 769x943 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 320x60 text run at (0,0) width 304: ".one {border-top: purple double 10px;}" text run at (0,15) width 296: ".two {border-top: purple thin solid;}" text run at (0,30) width 320: ".three {border-top: black medium solid;}" text run at (0,45) width 264: "TD {border-top: green 2px solid;}" - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 769x34 - RenderText {#text} at (0,0) size 755x34 + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 769x36 + RenderText {#text} at (0,0) size 755x35 text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " text run at (634,0) width 121: "This border applies" - text run at (0,17) width 317: "only to the cells, not the rows which contain them." - RenderBlock {P} at (0,174) size 769x27 [border: (10px double #800080) none] + text run at (0,18) width 317: "only to the cells, not the rows which contain them." + RenderBlock {P} at (0,177) size 769x28 [border: (10px double #800080) none] RenderText {#text} at (0,10) size 414x17 text run at (0,10) width 414: "This paragraph should have a purple, double, 10-pixel top border." - RenderBlock {P} at (0,217) size 769x18 [border: (1px solid #800080) none] + RenderBlock {P} at (0,221) size 769x19 [border: (1px solid #800080) none] RenderText {#text} at (0,1) size 331x17 text run at (0,1) width 331: "This paragraph should have a thin purple top border." - RenderTable {TABLE} at (0,251) size 769x106 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x104 - RenderTableRow {TR} at (0,5) size 767x39 - RenderTableCell {TD} at (5,5) size 758x39 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,3) size 735x34 + RenderTable {TABLE} at (0,256) size 769x110 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x108 + RenderTableRow {TR} at (0,5) size 767x41 + RenderTableCell {TD} at (5,5) size 758x41 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (2,3) size 735x35 text run at (2,3) width 429: "Every cell in this table should have a 2-pixel solid green top border. " text run at (431,3) width 306: "This is also true of the table-testing section in the" - text run at (2,20) width 175: "second half of the test page." - RenderTableRow {TR} at (0,49) size 767x50 - RenderTableCell {TD} at (5,63) size 194x22 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,3) size 53x17 - text run at (2,3) width 53: "Cell one" - RenderTableCell {TD} at (203,49) size 560x50 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,3) size 555x17 + text run at (2,21) width 175: "second half of the test page." + RenderTableRow {TR} at (0,51) size 767x52 + RenderTableCell {TD} at (5,65) size 194x24 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,3) size 53x18 + text run at (2,4) width 53: "Cell one" + RenderTableCell {TD} at (203,51) size 560x52 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,3) size 555x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (2,20) size 161x28 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 159x26 - RenderTableRow {TR} at (0,2) size 159x22 - RenderTableCell {TD} at (2,2) size 155x22 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,21) size 161x29 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x27 + RenderTableRow {TR} at (0,2) size 159x23 + RenderTableCell {TD} at (2,2) size 155x23 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,3) size 151x17 text run at (2,3) width 151: "Nested single-cell table!" - RenderBlock {UL} at (0,373) size 769x111 - RenderListItem {LI} at (40,0) size 729x71 [border: (3px solid #000000) none] - RenderBlock (anonymous) at (0,3) size 729x17 + RenderBlock {UL} at (0,382) size 769x117 + RenderListItem {LI} at (40,0) size 729x75 [border: (3px solid #000000) none] + RenderBlock (anonymous) at (0,3) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (0,20) size 729x51 - RenderListItem {LI} at (40,0) size 689x17 + RenderBlock {UL} at (0,21) size 729x54 + RenderListItem {LI} at (40,0) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 689x17 + RenderListItem {LI} at (40,18) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 689x17 + RenderListItem {LI} at (40,36) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,71) size 729x20 [border: (3px solid #000000) none] + RenderListItem {LI} at (40,75) size 729x21 [border: (3px solid #000000) none] RenderListMarker at (-17,3) size 7x17: bullet RenderText {#text} at (0,3) size 158x17 text run at (0,3) width 158: "This is a second list item." - RenderListItem {LI} at (40,91) size 729x20 [border: (3px solid #000000) none] + RenderListItem {LI} at (40,96) size 729x21 [border: (3px solid #000000) none] RenderListMarker at (-17,3) size 7x17: bullet RenderText {#text} at (0,3) size 480x17 text run at (0,3) width 480: "Each list item in this list should have a medium-width black border at its top." - RenderTable {TABLE} at (0,500) size 769x413 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x411 - RenderTableRow {TR} at (0,0) size 767x26 - RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,515) size 769x428 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x426 + RenderTableRow {TR} at (0,0) size 767x27 + RenderTableCell {TD} at (0,0) size 767x27 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,5) size 163x17 text run at (4,5) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,26) size 767x385 - RenderTableCell {TD} at (0,205) size 12x27 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,5) size 4x18 - text run at (4,6) width 4: " " - RenderTableCell {TD} at (12,26) size 755x385 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,5) size 747x34 - RenderText {#text} at (0,0) size 707x34 + RenderTableRow {TR} at (0,27) size 767x399 + RenderTableCell {TD} at (0,213) size 12x27 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,5) size 4x17 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,27) size 755x399 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,5) size 747x36 + RenderText {#text} at (0,0) size 707x35 text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " text run at (634,0) width 73: "This border" - text run at (0,17) width 365: "applies only to the cells, not the rows which contain them." - RenderBlock {P} at (4,55) size 747x27 [border: (10px double #800080) none] + text run at (0,18) width 365: "applies only to the cells, not the rows which contain them." + RenderBlock {P} at (4,57) size 747x28 [border: (10px double #800080) none] RenderText {#text} at (0,10) size 414x17 text run at (0,10) width 414: "This paragraph should have a purple, double, 10-pixel top border." - RenderBlock {P} at (4,98) size 747x18 [border: (1px solid #800080) none] + RenderBlock {P} at (4,101) size 747x19 [border: (1px solid #800080) none] RenderText {#text} at (0,1) size 331x17 text run at (0,1) width 331: "This paragraph should have a thin purple top border." - RenderTable {TABLE} at (4,132) size 747x106 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 745x104 - RenderTableRow {TR} at (0,5) size 745x39 - RenderTableCell {TD} at (5,5) size 736x39 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,3) size 712x34 + RenderTable {TABLE} at (4,136) size 747x110 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 745x108 + RenderTableRow {TR} at (0,5) size 745x41 + RenderTableCell {TD} at (5,5) size 736x41 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (2,3) size 712x35 text run at (2,3) width 429: "Every cell in this table should have a 2-pixel solid green top border. " text run at (431,3) width 283: "This is also true of the table-testing section in" - text run at (2,20) width 198: "the second half of the test page." - RenderTableRow {TR} at (0,49) size 745x50 - RenderTableCell {TD} at (5,63) size 188x22 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,3) size 53x17 - text run at (2,3) width 53: "Cell one" - RenderTableCell {TD} at (197,49) size 544x50 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,3) size 539x17 + text run at (2,21) width 198: "the second half of the test page." + RenderTableRow {TR} at (0,51) size 745x52 + RenderTableCell {TD} at (5,65) size 188x24 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,3) size 53x18 + text run at (2,4) width 53: "Cell one" + RenderTableCell {TD} at (197,51) size 544x52 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,3) size 539x18 RenderText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Cell two" - RenderTable {TABLE} at (2,20) size 161x28 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 159x26 - RenderTableRow {TR} at (0,2) size 159x22 - RenderTableCell {TD} at (2,2) size 155x22 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,21) size 161x29 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x27 + RenderTableRow {TR} at (0,2) size 159x23 + RenderTableCell {TD} at (2,2) size 155x23 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,3) size 151x17 text run at (2,3) width 151: "Nested single-cell table!" - RenderBlock {UL} at (4,254) size 747x111 - RenderListItem {LI} at (40,0) size 707x71 [border: (3px solid #000000) none] - RenderBlock (anonymous) at (0,3) size 707x17 + RenderBlock {UL} at (4,262) size 747x117 + RenderListItem {LI} at (40,0) size 707x75 [border: (3px solid #000000) none] + RenderBlock (anonymous) at (0,3) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 118x17 text run at (0,0) width 118: "This is a list item..." - RenderBlock {UL} at (0,20) size 707x51 - RenderListItem {LI} at (40,0) size 667x17 + RenderBlock {UL} at (0,21) size 707x54 + RenderListItem {LI} at (40,0) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 73x17 text run at (0,0) width 73: "...and this..." - RenderListItem {LI} at (40,17) size 667x17 + RenderListItem {LI} at (40,18) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 115x17 text run at (0,0) width 115: "...is a second list..." - RenderListItem {LI} at (40,34) size 667x17 + RenderListItem {LI} at (40,36) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 176: "...nested within the list item." - RenderListItem {LI} at (40,71) size 707x20 [border: (3px solid #000000) none] + RenderListItem {LI} at (40,75) size 707x21 [border: (3px solid #000000) none] RenderListMarker at (-17,3) size 7x17: bullet RenderText {#text} at (0,3) size 158x17 text run at (0,3) width 158: "This is a second list item." - RenderListItem {LI} at (40,91) size 707x20 [border: (3px solid #000000) none] + RenderListItem {LI} at (40,96) size 707x21 [border: (3px solid #000000) none] RenderListMarker at (-17,3) size 7x17: bullet RenderText {#text} at (0,3) size 480x17 text run at (0,3) width 480: "Each list item in this list should have a medium-width black border at its top." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.png index 33ed17708907..bf787baf90c6 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.txt index 1e51db46621c..a3209e5d3144 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_top_inline-expected.txt @@ -3,55 +3,55 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 304x45 text run at (0,0) width 304: ".one {border-top: purple double 10px;}" text run at (0,15) width 296: ".two {border-top: purple thin solid;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x51 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 666x17 text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " RenderInline {SPAN} at (0,0) size 57x27 [border: (10px double #800080) none] RenderText {#text} at (666,0) size 57x17 text run at (666,0) width 57: "class one" - RenderText {#text} at (723,0) size 770x34 + RenderText {#text} at (723,0) size 770x35 text run at (723,0) width 47: ", which" - text run at (0,17) width 338: "should have a 10-pixel purple double top border; and " + text run at (0,18) width 338: "should have a 10-pixel purple double top border; and " RenderInline {SPAN} at (0,0) size 58x18 [border: (1px solid #800080) none] - RenderText {#text} at (338,17) size 58x17 - text run at (338,17) width 58: "class two" - RenderText {#text} at (396,17) size 774x34 - text run at (396,17) width 321: ", which should have a thin solid purple top border. " - text run at (717,17) width 57: "The line-" - text run at (0,34) width 372: "height of the parent element should not change on any line." - RenderTable {TABLE} at (0,176) size 784x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x84 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (338,18) size 58x17 + text run at (338,18) width 58: "class two" + RenderText {#text} at (396,18) size 774x35 + text run at (396,18) width 321: ", which should have a thin solid purple top border. " + text run at (717,18) width 57: "The line-" + text run at (0,36) width 372: "height of the parent element should not change on any line." + RenderTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x88 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x51 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 666x17 text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " RenderInline {SPAN} at (0,0) size 57x27 [border: (10px double #800080) none] RenderText {#text} at (666,0) size 57x17 text run at (666,0) width 57: "class one" - RenderText {#text} at (723,0) size 727x34 + RenderText {#text} at (723,0) size 727x35 text run at (723,0) width 4: "," - text run at (0,17) width 381: "which should have a 10-pixel purple double top border; and " + text run at (0,18) width 381: "which should have a 10-pixel purple double top border; and " RenderInline {SPAN} at (0,0) size 58x18 [border: (1px solid #800080) none] - RenderText {#text} at (381,17) size 58x17 - text run at (381,17) width 58: "class two" - RenderText {#text} at (439,17) size 756x34 - text run at (439,17) width 317: ", which should have a thin solid purple top border." - text run at (0,34) width 429: "The line-height of the parent element should not change on any line." + RenderText {#text} at (381,18) size 58x17 + text run at (381,18) width 58: "class two" + RenderText {#text} at (439,18) size 756x35 + text run at (439,18) width 317: ", which should have a thin solid purple top border." + text run at (0,36) width 429: "The line-height of the parent element should not change on any line." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.png index 6f447cbd59ca..47a04f1d682c 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.txt index 74f75d8ac400..1e17d28f3613 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_top_width-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x747 +layer at (0,0) size 785x759 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x747 - RenderBlock {HTML} at (0,0) size 785x747 - RenderBody {BODY} at (8,8) size 769x731 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x759 + RenderBlock {HTML} at (0,0) size 785x759 + RenderBody {BODY} at (8,8) size 769x743 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 440x90 text run at (0,0) width 432: ".zero {background-color: silver; border-top-width: 0;}" text run at (0,15) width 408: ".one {border-top-width: 25px; border-style: solid;}" @@ -14,8 +14,8 @@ layer at (0,0) size 785x747 text run at (0,45) width 440: ".three {border-top-width: medium; border-style: solid;}" text run at (0,60) width 416: ".four {border-top-width: thin; border-style: solid;}" text run at (0,75) width 248: ".five {border-top-width: 25px;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x18 + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x15 @@ -23,22 +23,22 @@ layer at (0,0) size 785x747 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (0,188) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,221) size 769x45 [border: (25px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,223) size 769x46 [border: (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,25) size 377x17 text run at (3,25) width 377: "This paragraph should have a top border width of 25 pixels." - RenderBlock {P} at (0,282) size 769x25 [border: (5px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,285) size 769x26 [border: (5px solid #000000) (3px solid #000000)] RenderText {#text} at (3,5) size 334x17 text run at (3,5) width 334: "This paragraph should have a thick top border width." - RenderBlock {P} at (0,323) size 769x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,327) size 769x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 354x17 text run at (3,3) width 354: "This paragraph should have a medium top border width." - RenderBlock {P} at (0,362) size 769x21 [border: (1px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,367) size 769x22 [border: (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,1) size 327x17 text run at (3,1) width 327: "This paragraph should have a thin top border width." - RenderBlock {P} at (0,399) size 769x18 + RenderBlock {P} at (0,405) size 769x18 RenderText {#text} at (0,0) size 527x17 text run at (0,0) width 527: "This paragraph should have no border and no extra \"padding\" on its top side, as no " RenderInline {CODE} at (0,0) size 96x15 @@ -46,18 +46,18 @@ layer at (0,0) size 785x747 text run at (527,3) width 96: "border-style" RenderText {#text} at (623,0) size 54x17 text run at (623,0) width 54: " was set." - RenderTable {TABLE} at (0,433) size 699x298 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 697x296 - RenderTableRow {TR} at (0,0) size 697x25 - RenderTableCell {TD} at (0,0) size 697x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,439) size 699x304 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 697x302 + RenderTableRow {TR} at (0,0) size 697x26 + RenderTableCell {TD} at (0,0) size 697x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 697x271 - RenderTableCell {TD} at (0,148) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 697x276 + RenderTableCell {TD} at (0,151) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 685x271 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 685x276 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 677x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " @@ -66,22 +66,22 @@ layer at (0,0) size 785x747 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (4,38) size 677x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,38) size 677x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,71) size 677x45 [border: (25px solid #000000) (3px solid #000000)] + RenderBlock {P} at (4,72) size 677x46 [border: (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,25) size 377x17 text run at (3,25) width 377: "This paragraph should have a top border width of 25 pixels." - RenderBlock {P} at (4,132) size 677x25 [border: (5px solid #000000) (3px solid #000000)] + RenderBlock {P} at (4,134) size 677x26 [border: (5px solid #000000) (3px solid #000000)] RenderText {#text} at (3,5) size 334x17 text run at (3,5) width 334: "This paragraph should have a thick top border width." - RenderBlock {P} at (4,173) size 677x23 [border: (3px solid #000000)] + RenderBlock {P} at (4,176) size 677x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 354x17 text run at (3,3) width 354: "This paragraph should have a medium top border width." - RenderBlock {P} at (4,212) size 677x21 [border: (1px solid #000000) (3px solid #000000)] + RenderBlock {P} at (4,216) size 677x22 [border: (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,1) size 327x17 text run at (3,1) width 327: "This paragraph should have a thin top border width." - RenderBlock {P} at (4,249) size 677x18 + RenderBlock {P} at (4,254) size 677x18 RenderText {#text} at (0,0) size 527x17 text run at (0,0) width 527: "This paragraph should have no border and no extra \"padding\" on its top side, as no " RenderInline {CODE} at (0,0) size 96x15 diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.png index 283ef4f2ff50..c5437a925b90 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.txt index b6fd6a1ff353..0d82a35470fa 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_top_width_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 408x45 text run at (0,0) width 408: ".one {border-top-width: 25px; border-style: solid;}" text run at (0,15) width 408: ".two {border-top-width: thin; border-style: solid;}" text run at (0,30) width 256: ".three {border-top-width: 25px;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x81 [border: (25px solid #000000) (3px solid #000000)] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x82 [border: (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,25) size 172x17 text run at (3,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -27,32 +27,32 @@ layer at (0,0) size 800x600 RenderInline {TT} at (0,0) size 24x15 RenderText {#text} at (507,28) size 24x15 text run at (507,28) width 24: "two" - RenderText {#text} at (534,25) size 772x52 + RenderText {#text} at (534,25) size 772x53 text run at (534,25) width 220: ", which should result in a thin solid" text run at (3,43) width 692: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " text run at (695,43) width 80: "There is also" - text run at (3,60) width 19: "an " + text run at (3,61) width 19: "an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (22,60) size 143x17 - text run at (22,60) width 143: "inline element of class " + RenderText {#text} at (22,61) size 143x17 + text run at (22,61) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (165,63) size 40x15 - text run at (165,63) width 40: "three" - RenderText {#text} at (205,60) size 569x17 - text run at (205,60) width 569: ", which should have no top border width or visible border because no border style was set." - RenderTable {TABLE} at (0,206) size 784x133 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x131 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (165,64) size 40x15 + text run at (165,64) width 40: "three" + RenderText {#text} at (205,61) size 569x17 + text run at (205,61) width 569: ", which should have no top border width or visible border because no border style was set." + RenderTable {TABLE} at (0,208) size 784x136 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x134 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x106 - RenderTableCell {TD} at (0,65) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x106 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x98 [border: (25px solid #000000) (3px solid #000000)] + RenderTableRow {TR} at (0,26) size 782x108 + RenderTableCell {TD} at (0,67) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x108 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x100 [border: (25px solid #000000) (3px solid #000000)] RenderText {#text} at (3,25) size 172x17 text run at (3,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -67,17 +67,17 @@ layer at (0,0) size 800x600 RenderInline {TT} at (0,0) size 24x15 RenderText {#text} at (507,28) size 24x15 text run at (507,28) width 24: "two" - RenderText {#text} at (534,25) size 751x52 + RenderText {#text} at (534,25) size 751x53 text run at (534,25) width 220: ", which should result in a thin solid" text run at (3,43) width 692: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " text run at (695,43) width 51: "There is" - text run at (3,60) width 48: "also an " + text run at (3,61) width 48: "also an " RenderInline {SPAN} at (0,0) size 183x17 - RenderText {#text} at (51,60) size 143x17 - text run at (51,60) width 143: "inline element of class " + RenderText {#text} at (51,61) size 143x17 + text run at (51,61) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x15 - RenderText {#text} at (194,63) size 40x15 - text run at (194,63) width 40: "three" - RenderText {#text} at (234,60) size 746x35 - text run at (234,60) width 515: ", which should have no top border width or visible border because no border style" - text run at (3,78) width 50: "was set." + RenderText {#text} at (194,64) size 40x15 + text run at (194,64) width 40: "three" + RenderText {#text} at (234,61) size 746x35 + text run at (234,61) width 515: ", which should have no top border width or visible border because no border style" + text run at (3,79) width 50: "was set." diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.png index 16082ae6eaab..333a08155e29 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.txt index 397bc69ee0fe..3baa3167682d 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_width-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x891 +layer at (0,0) size 785x903 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x891 - RenderBlock {HTML} at (0,0) size 785x891 - RenderBody {BODY} at (8,8) size 769x875 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x903 + RenderBlock {HTML} at (0,0) size 785x903 + RenderBody {BODY} at (8,8) size 769x887 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 408x90 text run at (0,0) width 400: ".zero {background-color: silver; border-width: 0;}" text run at (0,15) width 376: ".one {border-width: 50px; border-style: solid;}" @@ -14,8 +14,8 @@ layer at (0,0) size 785x891 text run at (0,45) width 408: ".three {border-width: medium; border-style: solid;}" text run at (0,60) width 384: ".four {border-width: thin; border-style: solid;}" text run at (0,75) width 216: ".five {border-width: 25px;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x18 + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x15 @@ -23,22 +23,22 @@ layer at (0,0) size 785x891 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (0,188) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,221) size 769x117 [border: (50px solid #000000)] + RenderBlock {P} at (0,223) size 769x118 [border: (50px solid #000000)] RenderText {#text} at (50,50) size 394x17 text run at (50,50) width 394: "This element should have an overall border width of 50 pixels." - RenderBlock {P} at (0,354) size 769x27 [border: (5px solid #000000)] + RenderBlock {P} at (0,357) size 769x28 [border: (5px solid #000000)] RenderText {#text} at (5,5) size 343x17 text run at (5,5) width 343: "This element should have a thick overall border width." - RenderBlock {P} at (0,397) size 769x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,401) size 769x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 363x17 text run at (3,3) width 363: "This element should have a medium overall border width." - RenderBlock {P} at (0,436) size 769x19 [border: (1px solid #000000)] + RenderBlock {P} at (0,441) size 769x20 [border: (1px solid #000000)] RenderText {#text} at (1,1) size 336x17 text run at (1,1) width 336: "This element should have a thin overall border width." - RenderBlock {P} at (0,471) size 769x18 + RenderBlock {P} at (0,477) size 769x18 RenderText {#text} at (0,0) size 498x17 text run at (0,0) width 498: "This element should have no border and no extra \"padding\" on any side, as no " RenderInline {CODE} at (0,0) size 96x15 @@ -46,18 +46,18 @@ layer at (0,0) size 785x891 text run at (498,3) width 96: "border-style" RenderText {#text} at (594,0) size 54x17 text run at (594,0) width 54: " was set." - RenderTable {TABLE} at (0,505) size 670x370 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 668x368 - RenderTableRow {TR} at (0,0) size 668x25 - RenderTableCell {TD} at (0,0) size 668x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,511) size 670x376 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 668x374 + RenderTableRow {TR} at (0,0) size 668x26 + RenderTableCell {TD} at (0,0) size 668x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 668x343 - RenderTableCell {TD} at (0,184) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 668x348 + RenderTableCell {TD} at (0,187) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 656x343 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 656x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 648x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 157: "(These will only work if " @@ -66,22 +66,22 @@ layer at (0,0) size 785x891 text run at (157,3) width 96: "border-style" RenderText {#text} at (253,0) size 89x17 text run at (253,0) width 89: " is supported.)" - RenderBlock {P} at (4,38) size 648x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,38) size 648x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,71) size 648x117 [border: (50px solid #000000)] + RenderBlock {P} at (4,72) size 648x118 [border: (50px solid #000000)] RenderText {#text} at (50,50) size 394x17 text run at (50,50) width 394: "This element should have an overall border width of 50 pixels." - RenderBlock {P} at (4,204) size 648x27 [border: (5px solid #000000)] + RenderBlock {P} at (4,206) size 648x28 [border: (5px solid #000000)] RenderText {#text} at (5,5) size 343x17 text run at (5,5) width 343: "This element should have a thick overall border width." - RenderBlock {P} at (4,247) size 648x23 [border: (3px solid #000000)] + RenderBlock {P} at (4,250) size 648x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 363x17 text run at (3,3) width 363: "This element should have a medium overall border width." - RenderBlock {P} at (4,286) size 648x19 [border: (1px solid #000000)] + RenderBlock {P} at (4,290) size 648x20 [border: (1px solid #000000)] RenderText {#text} at (1,1) size 336x17 text run at (1,1) width 336: "This element should have a thin overall border width." - RenderBlock {P} at (4,321) size 648x18 + RenderBlock {P} at (4,326) size 648x18 RenderText {#text} at (0,0) size 498x17 text run at (0,0) width 498: "This element should have no border and no extra \"padding\" on any side, as no " RenderInline {CODE} at (0,0) size 96x15 diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.png index 74e83b204850..325327b25d11 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.txt index 304dfb7eb394..e0df7a6d8311 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/border_width_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 376x45 text run at (0,0) width 376: ".one {border-width: 25px; border-style: solid;}" text run at (0,15) width 376: ".two {border-width: thin; border-style: solid;}" text run at (0,30) width 224: ".three {border-width: 25px;}" - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x103 [border: (25px solid #000000)] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x104 [border: (25px solid #000000)] RenderText {#text} at (25,25) size 172x17 text run at (25,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 @@ -40,19 +40,19 @@ layer at (0,0) size 800x600 RenderText {#text} at (685,43) size 707x35 text run at (685,43) width 47: ", which" text run at (25,61) width 387: "should have no border width because no border style was set." - RenderTable {TABLE} at (0,228) size 784x138 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x136 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,230) size 784x140 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x138 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x111 - RenderTableCell {TD} at (0,68) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x112 + RenderTableCell {TD} at (0,69) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x111 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x103 [border: (25px solid #000000)] + RenderTableCell {TD} at (12,26) size 770x112 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x104 [border: (25px solid #000000)] RenderText {#text} at (25,25) size 172x17 text run at (25,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x15 diff --git a/LayoutTests/platform/gtk/css1/box_properties/clear-expected.png b/LayoutTests/platform/gtk/css1/box_properties/clear-expected.png index f4aa43ace2a6..af8085ca25a3 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/clear-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/clear-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/clear-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/clear-expected.txt index 8d7755b65a4f..437a30bdead5 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/clear-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/clear-expected.txt @@ -1,87 +1,87 @@ -layer at (0,0) size 785x941 +layer at (0,0) size 785x961 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x941 - RenderBlock {HTML} at (0,0) size 785x941 - RenderBody {BODY} at (8,8) size 769x925 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x961 + RenderBlock {HTML} at (0,0) size 785x961 + RenderBody {BODY} at (8,8) size 769x945 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 168x60 text run at (0,0) width 152: ".one {clear: left;}" text run at (0,15) width 160: ".two {clear: right;}" text run at (0,30) width 168: ".three {clear: both;}" text run at (0,45) width 160: ".four {clear: none;}" - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderImage {IMG} at (0,116) size 15x50 - RenderBlock {P} at (0,124) size 769x17 + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderImage {IMG} at (0,117) size 15x50 + RenderBlock {P} at (0,125) size 769x18 RenderText {#text} at (18,0) size 595x17 text run at (18,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - RenderBlock (anonymous) at (0,157) size 769x17 + RenderBlock (anonymous) at (0,159) size 769x18 RenderBR {BR} at (18,0) size 0x17 - RenderImage {IMG} at (0,17) size 15x50 - RenderBlock {P} at (0,224) size 769x17 + RenderImage {IMG} at (0,18) size 15x50 + RenderBlock {P} at (0,227) size 769x18 RenderText {#text} at (0,0) size 649x17 text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - RenderBlock (anonymous) at (0,257) size 769x17 + RenderBlock (anonymous) at (0,261) size 769x18 RenderBR {BR} at (0,0) size 0x17 - RenderImage {IMG} at (754,17) size 15x50 - RenderBlock {P} at (0,324) size 769x17 + RenderImage {IMG} at (754,18) size 15x50 + RenderBlock {P} at (0,329) size 769x18 RenderText {#text} at (0,0) size 658x17 text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - RenderBlock (anonymous) at (0,357) size 769x17 + RenderBlock (anonymous) at (0,363) size 769x18 RenderBR {BR} at (0,0) size 0x17 - RenderImage {IMG} at (0,17) size 15x50 - RenderImage {IMG} at (754,17) size 15x50 - RenderBlock {P} at (0,424) size 769x17 + RenderImage {IMG} at (0,18) size 15x50 + RenderImage {IMG} at (754,18) size 15x50 + RenderBlock {P} at (0,431) size 769x18 RenderText {#text} at (0,0) size 602x17 text run at (0,0) width 602: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - RenderImage {IMG} at (0,457) size 15x50 - RenderImage {IMG} at (754,457) size 15x50 - RenderBlock {P} at (0,457) size 769x17 + RenderImage {IMG} at (0,465) size 15x50 + RenderImage {IMG} at (754,465) size 15x50 + RenderBlock {P} at (0,465) size 769x18 RenderText {#text} at (18,0) size 390x17 text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles." - RenderBlock (anonymous) at (0,490) size 769x17 + RenderBlock (anonymous) at (0,499) size 769x18 RenderBR {BR} at (18,0) size 0x17 - RenderTable {TABLE} at (0,507) size 680x418 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 678x416 - RenderTableRow {TR} at (0,0) size 678x25 - RenderTableCell {TD} at (0,0) size 678x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,517) size 680x428 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 678x426 + RenderTableRow {TR} at (0,0) size 678x26 + RenderTableCell {TD} at (0,0) size 678x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 678x391 - RenderTableCell {TD} at (0,208) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 678x400 + RenderTableCell {TD} at (0,213) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 666x391 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 666x400 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderImage {IMG} at (4,4) size 15x50 - RenderBlock {P} at (4,4) size 658x17 + RenderBlock {P} at (4,4) size 658x18 RenderText {#text} at (18,0) size 595x17 text run at (18,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - RenderBlock (anonymous) at (4,37) size 658x17 + RenderBlock (anonymous) at (4,38) size 658x18 RenderBR {BR} at (18,0) size 0x17 - RenderImage {IMG} at (0,17) size 15x50 - RenderBlock {P} at (4,104) size 658x17 + RenderImage {IMG} at (0,18) size 15x50 + RenderBlock {P} at (4,106) size 658x18 RenderText {#text} at (0,0) size 649x17 text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - RenderBlock (anonymous) at (4,137) size 658x17 + RenderBlock (anonymous) at (4,140) size 658x18 RenderBR {BR} at (0,0) size 0x17 - RenderImage {IMG} at (643,17) size 15x50 - RenderBlock {P} at (4,204) size 658x17 + RenderImage {IMG} at (643,18) size 15x50 + RenderBlock {P} at (4,208) size 658x18 RenderText {#text} at (0,0) size 658x17 text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - RenderBlock (anonymous) at (4,237) size 658x17 + RenderBlock (anonymous) at (4,242) size 658x18 RenderBR {BR} at (0,0) size 0x17 - RenderImage {IMG} at (0,17) size 15x50 - RenderImage {IMG} at (643,17) size 15x50 - RenderBlock {P} at (4,304) size 658x17 + RenderImage {IMG} at (0,18) size 15x50 + RenderImage {IMG} at (643,18) size 15x50 + RenderBlock {P} at (4,310) size 658x18 RenderText {#text} at (0,0) size 602x17 text run at (0,0) width 602: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - RenderImage {IMG} at (4,337) size 15x50 - RenderImage {IMG} at (647,337) size 15x50 - RenderBlock {P} at (4,337) size 658x17 + RenderImage {IMG} at (4,344) size 15x50 + RenderImage {IMG} at (647,344) size 15x50 + RenderBlock {P} at (4,344) size 658x18 RenderText {#text} at (18,0) size 390x17 text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles." - RenderBlock (anonymous) at (4,370) size 658x17 + RenderBlock (anonymous) at (4,378) size 658x18 RenderBR {BR} at (18,0) size 0x17 diff --git a/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.png b/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.png index fdf7f384ed43..7efa782910d7 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.txt index 4a937e7c6c44..1d8c59ea4d80 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/clear_float-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x769 +layer at (0,0) size 785x793 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x769 - RenderBlock {HTML} at (0,0) size 785x769 - RenderBody {BODY} at (8,8) size 769x753 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x793 + RenderBlock {HTML} at (0,0) size 785x793 + RenderBody {BODY} at (8,8) size 769x777 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,30) size 769x135 + RenderBlock {PRE} at (0,31) size 769x135 RenderText {#text} at (0,0) size 616x135 text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" text run at (0,15) width 0: " " @@ -17,138 +17,138 @@ layer at (0,0) size 785x769 text run at (0,90) width 616: "DIV.article {padding: 0.5em; margin: 0; margin-left: 14em; margin-right: 2em;" text run at (0,105) width 480: " color: black; background: yellow; clear: none;}" text run at (0,120) width 0: " " - RenderBlock {HR} at (0,178) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {DIV} at (0,188) size 192x112 [color=#FFFFFF] [bgcolor=#008000] - RenderBlock {H1} at (8,8) size 176x21 + RenderBlock {HR} at (0,179) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {DIV} at (0,189) size 192x117 [color=#FFFFFF] [bgcolor=#008000] + RenderBlock {H1} at (8,8) size 176x22 RenderText {#text} at (0,0) size 85x21 text run at (0,0) width 85: "Top menu" - RenderBlock {UL} at (24,32) size 156x69 - RenderListItem {LI} at (0,0) size 156x17 + RenderBlock {UL} at (24,33) size 156x73 + RenderListItem {LI} at (0,0) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 35x17 text run at (0,0) width 35: "green" - RenderListItem {LI} at (0,17) size 156x17 + RenderListItem {LI} at (0,18) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "white text" - RenderListItem {LI} at (0,34) size 156x17 + RenderListItem {LI} at (0,36) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 94x17 text run at (0,0) width 94: "0.5em padding" - RenderListItem {LI} at (0,51) size 156x17 + RenderListItem {LI} at (0,54) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 87x17 text run at (0,0) width 87: "0.5em margin" - RenderBlock (floating) {DIV} at (0,309) size 192x112 [color=#FFFFFF] [bgcolor=#0000FF] - RenderBlock {H1} at (8,8) size 176x21 + RenderBlock (floating) {DIV} at (0,315) size 192x117 [color=#FFFFFF] [bgcolor=#0000FF] + RenderBlock {H1} at (8,8) size 176x22 RenderText {#text} at (0,0) size 112x21 text run at (0,0) width 112: "Bottom menu" - RenderBlock {UL} at (24,32) size 156x69 - RenderListItem {LI} at (0,0) size 156x17 + RenderBlock {UL} at (24,33) size 156x73 + RenderListItem {LI} at (0,0) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "blue background" - RenderListItem {LI} at (0,17) size 156x17 + RenderListItem {LI} at (0,18) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "white text" - RenderListItem {LI} at (0,34) size 156x17 + RenderListItem {LI} at (0,36) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 94x17 text run at (0,0) width 94: "0.5em padding" - RenderListItem {LI} at (0,51) size 156x17 + RenderListItem {LI} at (0,54) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 87x17 text run at (0,0) width 87: "0.5em margin" - RenderBlock {DIV} at (224,188) size 513x214 [bgcolor=#FFFF00] - RenderBlock {H1} at (8,29) size 497x37 + RenderBlock {DIV} at (224,189) size 513x222 [bgcolor=#FFFF00] + RenderBlock {H1} at (8,29) size 497x38 RenderText {#text} at (0,0) size 275x36 text run at (0,0) width 275: "The 'clear' property" - RenderBlock {P} at (8,86) size 497x86 - RenderText {#text} at (0,0) size 497x85 + RenderBlock {P} at (8,87) size 497x91 + RenderText {#text} at (0,0) size 497x89 text run at (0,0) width 497: "This page has two floating \"menus\" on the side; one has a green background," - text run at (0,17) width 232: "and the other a blue background. " - text run at (231,17) width 266: "Due to settings on the 'float' and 'clear'" - text run at (0,34) width 497: "properties, the two menus should appear on the left side of the page, the blue" - text run at (0,51) width 497: "below the green. There should be a 10px gap between the two menus. There" - text run at (0,68) width 459: "should also be a 10px gap between the top menu and the top of the page." - RenderBlock {P} at (8,171) size 497x35 - RenderText {#text} at (0,0) size 497x34 + text run at (0,18) width 232: "and the other a blue background. " + text run at (231,18) width 266: "Due to settings on the 'float' and 'clear'" + text run at (0,36) width 497: "properties, the two menus should appear on the left side of the page, the blue" + text run at (0,54) width 497: "below the green. There should be a 10px gap between the two menus. There" + text run at (0,72) width 459: "should also be a 10px gap between the top menu and the top of the page." + RenderBlock {P} at (8,177) size 497x37 + RenderText {#text} at (0,0) size 497x35 text run at (0,0) width 497: "The top of the yellow rectangle (to which this paragraph belongs) should be" - text run at (0,17) width 331: "vertically aligned with the top of the green rectangle." - RenderTable {TABLE} at (192,401) size 577x352 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 575x349 - RenderTableRow {TR} at (0,0) size 575x25 - RenderTableCell {TD} at (0,0) size 575x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 331: "vertically aligned with the top of the green rectangle." + RenderTable {TABLE} at (192,410) size 577x367 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 575x364 + RenderTableRow {TR} at (0,0) size 575x26 + RenderTableCell {TD} at (0,0) size 575x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 575x324 - RenderTableCell {TD} at (0,174) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 4x18 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 563x324 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (floating) {DIV} at (4,4) size 192x112 [color=#FFFFFF] [bgcolor=#008000] - RenderBlock {H1} at (8,8) size 176x21 + RenderTableRow {TR} at (0,26) size 575x338 + RenderTableCell {TD} at (0,181) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 563x338 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (floating) {DIV} at (4,4) size 192x117 [color=#FFFFFF] [bgcolor=#008000] + RenderBlock {H1} at (8,8) size 176x22 RenderText {#text} at (0,0) size 85x21 text run at (0,0) width 85: "Top menu" - RenderBlock {UL} at (24,32) size 156x69 - RenderListItem {LI} at (0,0) size 156x17 + RenderBlock {UL} at (24,33) size 156x73 + RenderListItem {LI} at (0,0) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 35x17 text run at (0,0) width 35: "green" - RenderListItem {LI} at (0,17) size 156x17 + RenderListItem {LI} at (0,18) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "white text" - RenderListItem {LI} at (0,34) size 156x17 + RenderListItem {LI} at (0,36) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 94x17 text run at (0,0) width 94: "0.5em padding" - RenderListItem {LI} at (0,51) size 156x17 + RenderListItem {LI} at (0,54) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 87x17 text run at (0,0) width 87: "0.5em margin" - RenderBlock (floating) {DIV} at (4,125) size 192x112 [color=#FFFFFF] [bgcolor=#0000FF] - RenderBlock {H1} at (8,8) size 176x21 + RenderBlock (floating) {DIV} at (4,130) size 192x117 [color=#FFFFFF] [bgcolor=#0000FF] + RenderBlock {H1} at (8,8) size 176x22 RenderText {#text} at (0,0) size 112x21 text run at (0,0) width 112: "Bottom menu" - RenderBlock {UL} at (24,32) size 156x69 - RenderListItem {LI} at (0,0) size 156x17 + RenderBlock {UL} at (24,33) size 156x73 + RenderListItem {LI} at (0,0) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "blue background" - RenderListItem {LI} at (0,17) size 156x17 + RenderListItem {LI} at (0,18) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "white text" - RenderListItem {LI} at (0,34) size 156x17 + RenderListItem {LI} at (0,36) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 94x17 text run at (0,0) width 94: "0.5em padding" - RenderListItem {LI} at (0,51) size 156x17 + RenderListItem {LI} at (0,54) size 156x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 87x17 text run at (0,0) width 87: "0.5em margin" - RenderBlock {DIV} at (228,4) size 299x316 [bgcolor=#FFFF00] - RenderBlock {H1} at (8,29) size 283x37 + RenderBlock {DIV} at (228,4) size 299x330 [bgcolor=#FFFF00] + RenderBlock {H1} at (8,29) size 283x38 RenderText {#text} at (0,0) size 275x36 text run at (0,0) width 275: "The 'clear' property" - RenderBlock {P} at (8,86) size 283x171 - RenderText {#text} at (0,0) size 283x170 + RenderBlock {P} at (8,87) size 283x181 + RenderText {#text} at (0,0) size 283x179 text run at (0,0) width 283: "This page has two floating \"menus\" on the" - text run at (0,17) width 283: "side; one has a green background, and the" - text run at (0,34) width 166: "other a blue background. " - text run at (165,34) width 118: "Due to settings on" - text run at (0,51) width 283: "the 'float' and 'clear' properties, the two" - text run at (0,68) width 283: "menus should appear on the left side of the" - text run at (0,85) width 283: "page, the blue below the green. There" - text run at (0,102) width 283: "should be a 10px gap between the two" - text run at (0,119) width 283: "menus. There should also be a 10px gap" - text run at (0,136) width 283: "between the top menu and the top of the" - text run at (0,153) width 34: "page." - RenderBlock {P} at (8,256) size 283x52 - RenderText {#text} at (0,0) size 283x51 + text run at (0,18) width 283: "side; one has a green background, and the" + text run at (0,36) width 166: "other a blue background. " + text run at (165,36) width 118: "Due to settings on" + text run at (0,54) width 283: "the 'float' and 'clear' properties, the two" + text run at (0,72) width 283: "menus should appear on the left side of the" + text run at (0,90) width 283: "page, the blue below the green. There" + text run at (0,108) width 283: "should be a 10px gap between the two" + text run at (0,126) width 283: "menus. There should also be a 10px gap" + text run at (0,144) width 283: "between the top menu and the top of the" + text run at (0,162) width 34: "page." + RenderBlock {P} at (8,267) size 283x55 + RenderText {#text} at (0,0) size 283x53 text run at (0,0) width 283: "The top of the yellow rectangle (to which" - text run at (0,17) width 283: "this paragraph belongs) should be vertically" - text run at (0,34) width 269: "aligned with the top of the green rectangle." + text run at (0,18) width 283: "this paragraph belongs) should be vertically" + text run at (0,36) width 269: "aligned with the top of the green rectangle." diff --git a/LayoutTests/platform/gtk/css1/box_properties/float-expected.png b/LayoutTests/platform/gtk/css1/box_properties/float-expected.png index a659042041cf..6e36bc8d62a4 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/float-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/float-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/float-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/float-expected.txt index 2e548ab6ad50..11d07918038b 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/float-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/float-expected.txt @@ -3,54 +3,54 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 160x45 text run at (0,0) width 152: ".one {float: left;}" text run at (0,15) width 160: ".two {float: right;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderImage {IMG} at (0,101) size 15x50 - RenderBlock {P} at (0,109) size 784x34 - RenderText {#text} at (15,0) size 764x34 + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderImage {IMG} at (0,102) size 15x50 + RenderBlock {P} at (0,110) size 784x36 + RenderText {#text} at (15,0) size 764x35 text run at (15,0) width 599: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " text run at (614,0) width 165: "In this case, it is the image" - text run at (15,17) width 212: "which has been floated to the left." - RenderBlock (anonymous) at (0,159) size 784x17 + text run at (15,18) width 212: "which has been floated to the left." + RenderBlock (anonymous) at (0,162) size 784x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (0,184) size 784x2 [border: (1px inset #000000)] - RenderImage {IMG} at (769,194) size 15x50 - RenderBlock {P} at (0,202) size 784x34 - RenderText {#text} at (0,0) size 731x34 + RenderBlock {HR} at (0,188) size 784x2 [border: (1px inset #000000)] + RenderImage {IMG} at (769,198) size 15x50 + RenderBlock {P} at (0,206) size 784x36 + RenderText {#text} at (0,0) size 731x35 text run at (0,0) width 608: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " text run at (608,0) width 123: "In this case, it is the" - text run at (0,17) width 263: "image which has been floated to the right." - RenderTable {TABLE} at (0,252) size 784x170 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x168 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 263: "image which has been floated to the right." + RenderTable {TABLE} at (0,258) size 784x174 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x172 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x143 - RenderTableCell {TD} at (0,84) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x146 + RenderTableCell {TD} at (0,86) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x143 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 770x146 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderImage {IMG} at (4,4) size 15x50 - RenderBlock {P} at (4,4) size 762x34 - RenderText {#text} at (15,0) size 722x34 + RenderBlock {P} at (4,4) size 762x36 + RenderText {#text} at (15,0) size 722x35 text run at (15,0) width 599: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " text run at (614,0) width 123: "In this case, it is the" - text run at (15,17) width 254: "image which has been floated to the left." - RenderBlock (anonymous) at (4,54) size 762x17 + text run at (15,18) width 254: "image which has been floated to the left." + RenderBlock (anonymous) at (4,56) size 762x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (4,79) size 762x2 [border: (1px inset #000000)] - RenderImage {IMG} at (751,89) size 15x50 - RenderBlock {P} at (4,97) size 762x34 - RenderText {#text} at (0,0) size 731x34 + RenderBlock {HR} at (4,82) size 762x2 [border: (1px inset #000000)] + RenderImage {IMG} at (751,92) size 15x50 + RenderBlock {P} at (4,100) size 762x36 + RenderText {#text} at (0,0) size 731x35 text run at (0,0) width 608: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " text run at (608,0) width 123: "In this case, it is the" - text run at (0,17) width 263: "image which has been floated to the right." + text run at (0,18) width 263: "image which has been floated to the right." diff --git a/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.png b/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.png index b1aacfcba15e..19dc6a2fc5ec 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.txt index d441edc72a27..f6ee7c2965fb 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/float_elements_in_series-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x689 +layer at (0,0) size 785x699 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x689 - RenderBlock {HTML} at (0,0) size 785x689 - RenderBody {BODY} at (8,8) size 769x661 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x699 + RenderBlock {HTML} at (0,0) size 785x699 + RenderBody {BODY} at (8,8) size 769x671 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,30) size 769x195 + RenderBlock {PRE} at (0,31) size 769x195 RenderText {#text} at (0,0) size 512x195 text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" text run at (0,15) width 0: " " @@ -21,128 +21,128 @@ layer at (0,0) size 785x689 text run at (0,150) width 192: "DIV.below {clear: both;}" text run at (0,165) width 200: "TABLE {margin: 20px 0px;}" text run at (0,180) width 0: " " - RenderBlock {HR} at (0,238) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,248) size 769x34 - RenderText {#text} at (0,0) size 769x34 + RenderBlock {HR} at (0,239) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,249) size 769x36 + RenderText {#text} at (0,0) size 769x35 text run at (0,0) width 769: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this page" - text run at (0,17) width 405: "indicates how the DIV elements should be laid out horizontally. " - text run at (405,17) width 219: "They should align with each other." - RenderBlock (floating) {DIV} at (0,292) size 140x97 [bgcolor=#FFFF00] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + text run at (0,18) width 405: "indicates how the DIV elements should be laid out horizontally. " + text run at (405,18) width 219: "They should align with each other." + RenderBlock (floating) {DIV} at (0,295) size 140x98 [bgcolor=#FFFF00] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 47x17 text run at (0,0) width 47: "Yellow" - RenderBlock (floating) {DIV} at (160,292) size 140x97 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + RenderBlock (floating) {DIV} at (160,295) size 140x98 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 30x17 text run at (0,0) width 30: "Blue" - RenderBlock (floating) {DIV} at (320,292) size 140x97 [bgcolor=#FF0000] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + RenderBlock (floating) {DIV} at (320,295) size 140x98 [bgcolor=#FF0000] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 26x17 text run at (0,0) width 26: "Red" - RenderBlock (floating) {DIV} at (480,292) size 140x97 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + RenderBlock (floating) {DIV} at (480,295) size 140x98 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "Green" - RenderBlock {DIV} at (0,399) size 769x18 - RenderTable {TABLE} at (0,0) size 620x18 - RenderTableSection {TBODY} at (0,0) size 620x18 - RenderTableRow {TR} at (0,0) size 620x18 - RenderTableCell {TD} at (0,8) size 20x2 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (0,403) size 769x19 + RenderTable {TABLE} at (0,0) size 620x19 + RenderTableSection {TBODY} at (0,0) size 620x19 + RenderTableRow {TR} at (0,0) size 620x19 + RenderTableCell {TD} at (0,9) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (20,8) size 100x2 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (20,9) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 RenderTableCell {TD} at (120,9) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - RenderTableCell {TD} at (140,8) size 20x2 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] + RenderTableCell {TD} at (140,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (160,8) size 20x2 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] + RenderTableCell {TD} at (160,9) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (180,8) size 100x2 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] + RenderTableCell {TD} at (180,9) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 - RenderTableCell {TD} at (280,8) size 20x2 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] + RenderTableCell {TD} at (280,9) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (300,8) size 20x2 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] + RenderTableCell {TD} at (300,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (320,8) size 20x2 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] + RenderTableCell {TD} at (320,9) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (340,8) size 100x2 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] + RenderTableCell {TD} at (340,9) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 - RenderTableCell {TD} at (440,0) size 20x18 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] + RenderTableCell {TD} at (440,0) size 20x19 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 RenderText {#text} at (0,1) size 4x17 text run at (0,1) width 4: ";" - RenderTableCell {TD} at (460,8) size 20x2 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] + RenderTableCell {TD} at (460,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (480,8) size 20x2 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] + RenderTableCell {TD} at (480,9) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (500,8) size 100x2 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] + RenderTableCell {TD} at (500,9) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 - RenderTableCell {TD} at (600,8) size 20x2 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] + RenderTableCell {TD} at (600,9) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTable {TABLE} at (0,437) size 769x224 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x222 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,442) size 769x229 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x227 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x197 - RenderTableCell {TD} at (0,111) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x197 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 747x34 + RenderTableRow {TR} at (0,26) size 767x201 + RenderTableCell {TD} at (0,113) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x201 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 747x35 text run at (0,0) width 747: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this" - text run at (0,17) width 439: "page indicates how the DIV elements should be laid out horizontally. " - text run at (439,17) width 219: "They should align with each other." - RenderBlock (floating) {DIV} at (4,48) size 140x97 [bgcolor=#FFFF00] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + text run at (0,18) width 439: "page indicates how the DIV elements should be laid out horizontally. " + text run at (439,18) width 219: "They should align with each other." + RenderBlock (floating) {DIV} at (4,50) size 140x98 [bgcolor=#FFFF00] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 47x17 text run at (0,0) width 47: "Yellow" - RenderBlock (floating) {DIV} at (164,48) size 140x97 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + RenderBlock (floating) {DIV} at (164,50) size 140x98 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 30x17 text run at (0,0) width 30: "Blue" - RenderBlock (floating) {DIV} at (324,48) size 140x97 [bgcolor=#FF0000] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + RenderBlock (floating) {DIV} at (324,50) size 140x98 [bgcolor=#FF0000] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 26x17 text run at (0,0) width 26: "Red" - RenderBlock (floating) {DIV} at (484,48) size 140x97 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - RenderBlock {P} at (40,40) size 60x17 + RenderBlock (floating) {DIV} at (484,50) size 140x98 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] + RenderBlock {P} at (40,40) size 60x18 RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "Green" - RenderBlock {DIV} at (4,155) size 747x18 - RenderTable {TABLE} at (0,0) size 620x18 - RenderTableSection {TBODY} at (0,0) size 620x18 - RenderTableRow {TR} at (0,0) size 620x18 - RenderTableCell {TD} at (0,8) size 20x2 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (4,158) size 747x19 + RenderTable {TABLE} at (0,0) size 620x19 + RenderTableSection {TBODY} at (0,0) size 620x19 + RenderTableRow {TR} at (0,0) size 620x19 + RenderTableCell {TD} at (0,9) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (20,8) size 100x2 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (20,9) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 RenderTableCell {TD} at (120,9) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - RenderTableCell {TD} at (140,8) size 20x2 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] + RenderTableCell {TD} at (140,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (160,8) size 20x2 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] + RenderTableCell {TD} at (160,9) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (180,8) size 100x2 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] + RenderTableCell {TD} at (180,9) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 - RenderTableCell {TD} at (280,8) size 20x2 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] + RenderTableCell {TD} at (280,9) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (300,8) size 20x2 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] + RenderTableCell {TD} at (300,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (320,8) size 20x2 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] + RenderTableCell {TD} at (320,9) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (340,8) size 100x2 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] + RenderTableCell {TD} at (340,9) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 - RenderTableCell {TD} at (440,0) size 20x18 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] + RenderTableCell {TD} at (440,0) size 20x19 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 RenderText {#text} at (0,1) size 4x17 text run at (0,1) width 4: ";" - RenderTableCell {TD} at (460,8) size 20x2 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] + RenderTableCell {TD} at (460,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (480,8) size 20x2 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] + RenderTableCell {TD} at (480,9) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 - RenderTableCell {TD} at (500,8) size 100x2 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] + RenderTableCell {TD} at (500,9) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] RenderImage {IMG} at (0,0) size 100x1 - RenderTableCell {TD} at (600,8) size 20x2 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] + RenderTableCell {TD} at (600,9) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] RenderImage {IMG} at (0,0) size 20x1 diff --git a/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.png b/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.png index 15352566a236..0f275541b8c6 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.txt index 5b61a0aa202f..5e49b9e57044 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/float_margin-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1860 +layer at (0,0) size 785x1902 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1860 - RenderBlock {HTML} at (0,0) size 785x1860 - RenderBody {BODY} at (8,8) size 769x1844 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1902 + RenderBlock {HTML} at (0,0) size 785x1902 + RenderBody {BODY} at (8,8) size 769x1886 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x135 + RenderBlock {PRE} at (0,34) size 769x135 RenderText {#text} at (0,0) size 560x135 text run at (0,0) width 344: "P.test {background: white; font-size: 20px;" text run at (0,15) width 560: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}" @@ -17,142 +17,141 @@ layer at (0,0) size 785x1860 text run at (0,90) width 384: "#img4 {margin-right: 30px; margin-bottom: 30px;}" text run at (0,105) width 400: "#img5 {margin-right: -30px; margin-bottom: -30px;}" text run at (0,120) width 0: " " - RenderBlock {HR} at (0,181) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (30,203) size 729x88 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 708x88 + RenderBlock {HR} at (0,182) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (30,204) size 729x92 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 708x91 text run at (0,0) width 663: "This paragraph should have a white background which extends to the edges of the" - text run at (0,22) width 122: "element's box. " - text run at (122,22) width 442: "There is no padding set on this paragraph whatsoever. " - text run at (564,22) width 144: "If the background" - text run at (0,44) width 702: "of the entire box is not white, this may cause problems with the following tests; at any" - text run at (0,66) width 281: "rate, it must be taken into account." - RenderBlock {P} at (30,311) size 729x110 [bgcolor=#FFFFFF] + text run at (0,23) width 122: "element's box. " + text run at (122,23) width 442: "There is no padding set on this paragraph whatsoever. " + text run at (564,23) width 144: "If the background" + text run at (0,46) width 702: "of the entire box is not white, this may cause problems with the following tests; at any" + text run at (0,69) width 281: "rate, it must be taken into account." + RenderBlock {P} at (30,316) size 729x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (60,0) size 719x110 + RenderText {#text} at (60,0) size 719x114 text run at (60,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,22) width 119: "nothing more. " - text run at (179,22) width 540: "The edges of the white background should line up with the top and" - text run at (60,44) width 196: "left edges of the image. " - text run at (256,44) width 454: "This paragraph should have a white background, first of" - text run at (0,66) width 428: "all, which extends to the edges of the element's box. " - text run at (428,66) width 249: "There is no padding set on this" - text run at (0,88) width 183: "paragraph whatsoever." - RenderBlock {P} at (30,441) size 729x110 [bgcolor=#FFFFFF] + text run at (60,23) width 119: "nothing more. " + text run at (179,23) width 540: "The edges of the white background should line up with the top and" + text run at (60,46) width 196: "left edges of the image. " + text run at (256,46) width 454: "This paragraph should have a white background, first of" + text run at (0,69) width 428: "all, which extends to the edges of the element's box. " + text run at (428,69) width 249: "There is no padding set on this" + text run at (0,92) width 183: "paragraph whatsoever." + RenderBlock {P} at (30,451) size 729x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (30,30) size 60x60 - RenderText {#text} at (90,0) size 628x110 + RenderText {#text} at (90,0) size 718x114 text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,22) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,44) width 404: "box, and displace the paragraph text accordingly. " - text run at (494,44) width 224: "This paragraph should have" - text run at (90,66) width 613: "a white background, first of all, which extends to the edges of the element's" - text run at (90,88) width 40: "box. " - text run at (130,88) width 437: "There is no padding set on this paragraph whatsoever." - RenderBlock {P} at (30,571) size 729x110 [bgcolor=#FFFFFF] + text run at (90,23) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" + text run at (90,46) width 404: "box, and displace the paragraph text accordingly. " + text run at (494,46) width 224: "This paragraph should have" + text run at (90,69) width 613: "a white background, first of all, which extends to the edges of the element's" + text run at (0,92) width 40: "box. " + text run at (40,92) width 437: "There is no padding set on this paragraph whatsoever." + RenderBlock {P} at (30,586) size 729x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (-30,-30) size 60x60 - RenderText {#text} at (30,0) size 721x110 + RenderText {#text} at (30,0) size 721x114 text run at (30,0) width 676: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,22) width 691: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing the" - text run at (0,44) width 633: "edges of the white background to align with the thick gray lines in the image. " - text run at (633,44) width 36: "This" - text run at (0,66) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" - text run at (0,88) width 122: "element's box. " - text run at (122,88) width 437: "There is no padding set on this paragraph whatsoever." - RenderBlock {P} at (30,701) size 729x132 [bgcolor=#FFFFFF] + text run at (30,23) width 691: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing the" + text run at (0,46) width 633: "edges of the white background to align with the thick gray lines in the image. " + text run at (633,46) width 36: "This" + text run at (0,69) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" + text run at (0,92) width 122: "element's box. " + text run at (122,92) width 437: "There is no padding set on this paragraph whatsoever." + RenderBlock {P} at (30,721) size 729x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (90,0) size 728x132 + RenderText {#text} at (90,0) size 728x137 text run at (90,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,22) width 618: "the edges of the white background should line up with the top and left edges" - text run at (90,44) width 112: "of the image. " - text run at (202,44) width 504: "However, there should be 30 pixels of space between the right" - text run at (90,66) width 524: "and bottom edges of the image and the paragraph text around it. " - text run at (614,66) width 36: "This" - text run at (90,88) width 616: "paragraph should have a white background, first of all, which extends to the" - text run at (0,110) width 225: "edges of the element's box. " - text run at (225,110) width 437: "There is no padding set on this paragraph whatsoever." - RenderBlock {P} at (30,853) size 729x132 [bgcolor=#FFFFFF] + text run at (90,23) width 618: "the edges of the white background should line up with the top and left edges" + text run at (90,46) width 112: "of the image. " + text run at (202,46) width 504: "However, there should be 30 pixels of space between the right" + text run at (90,69) width 524: "and bottom edges of the image and the paragraph text around it. " + text run at (614,69) width 36: "This" + text run at (0,92) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" + text run at (0,115) width 122: "element's box. " + text run at (122,115) width 437: "There is no padding set on this paragraph whatsoever." + RenderBlock {P} at (30,879) size 729x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (30,0) size 706x132 + RenderText {#text} at (30,0) size 706x137 text run at (30,0) width 668: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,22) width 640: "edges of the white background should line up with the top and left edges of the" - text run at (0,44) width 60: "image. " - text run at (60,44) width 636: "However, the text should overlap the image's right and bottom sides, lining up" - text run at (0,66) width 313: "with the thick gray lines in the image. " - text run at (313,66) width 393: "This paragraph should have a white background," - text run at (0,88) width 489: "first of all, which extends to the edges of the element's box. " - text run at (489,88) width 214: "There is no padding set on" - text run at (0,110) width 218: "this paragraph whatsoever." - RenderTable {TABLE} at (0,1005) size 769x839 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x837 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (30,23) width 640: "edges of the white background should line up with the top and left edges of the" + text run at (0,46) width 60: "image. " + text run at (60,46) width 636: "However, the text should overlap the image's right and bottom sides, lining up" + text run at (0,69) width 313: "with the thick gray lines in the image. " + text run at (313,69) width 393: "This paragraph should have a white background," + text run at (0,92) width 489: "first of all, which extends to the edges of the element's box. " + text run at (489,92) width 214: "There is no padding set on" + text run at (0,115) width 218: "this paragraph whatsoever." + RenderTable {TABLE} at (0,1037) size 769x849 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x847 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x812 - RenderTableCell {TD} at (0,418) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x821 + RenderTableCell {TD} at (0,423) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x812 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (34,4) size 707x88 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 700x88 + RenderTableCell {TD} at (12,26) size 755x821 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (34,4) size 707x92 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 700x91 text run at (0,0) width 663: "This paragraph should have a white background which extends to the edges of the" - text run at (0,22) width 122: "element's box. " - text run at (122,22) width 442: "There is no padding set on this paragraph whatsoever. " - text run at (564,22) width 44: "If the" - text run at (0,44) width 700: "background of the entire box is not white, this may cause problems with the following" - text run at (0,66) width 383: "tests; at any rate, it must be taken into account." - RenderBlock {P} at (34,112) size 707x110 [bgcolor=#FFFFFF] + text run at (0,23) width 122: "element's box. " + text run at (122,23) width 442: "There is no padding set on this paragraph whatsoever. " + text run at (564,23) width 44: "If the" + text run at (0,46) width 700: "background of the entire box is not white, this may cause problems with the following" + text run at (0,69) width 383: "tests; at any rate, it must be taken into account." + RenderBlock {P} at (34,116) size 707x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (60,0) size 703x110 + RenderText {#text} at (60,0) size 703x114 text run at (60,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,22) width 119: "nothing more. " - text run at (179,22) width 506: "The edges of the white background should line up with the top" - text run at (60,44) width 230: "and left edges of the image. " - text run at (290,44) width 393: "This paragraph should have a white background," - text run at (0,66) width 489: "first of all, which extends to the edges of the element's box. " - text run at (489,66) width 214: "There is no padding set on" - text run at (0,88) width 218: "this paragraph whatsoever." - RenderBlock {P} at (34,242) size 707x110 [bgcolor=#FFFFFF] + text run at (60,23) width 119: "nothing more. " + text run at (179,23) width 506: "The edges of the white background should line up with the top" + text run at (60,46) width 230: "and left edges of the image. " + text run at (290,46) width 393: "This paragraph should have a white background," + text run at (0,69) width 489: "first of all, which extends to the edges of the element's box. " + text run at (489,69) width 214: "There is no padding set on" + text run at (0,92) width 218: "this paragraph whatsoever." + RenderBlock {P} at (34,251) size 707x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (30,30) size 60x60 - RenderText {#text} at (90,0) size 615x110 + RenderText {#text} at (90,0) size 705x114 text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,22) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,44) width 404: "box, and displace the paragraph text accordingly. " - text run at (494,44) width 181: "This paragraph should" - text run at (90,66) width 574: "have a white background, first of all, which extends to the edges of the" - text run at (90,88) width 122: "element's box. " - text run at (212,88) width 437: "There is no padding set on this paragraph whatsoever." - RenderBlock {P} at (34,372) size 707x110 [bgcolor=#FFFFFF] + text run at (90,23) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" + text run at (90,46) width 404: "box, and displace the paragraph text accordingly. " + text run at (494,46) width 181: "This paragraph should" + text run at (90,69) width 574: "have a white background, first of all, which extends to the edges of the" + text run at (0,92) width 122: "element's box. " + text run at (122,92) width 437: "There is no padding set on this paragraph whatsoever." + RenderBlock {P} at (34,386) size 707x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (-30,-30) size 60x60 - RenderText {#text} at (30,0) size 706x110 + RenderText {#text} at (30,0) size 706x114 text run at (30,0) width 676: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,22) width 661: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing" - text run at (0,44) width 663: "the edges of the white background to align with the thick gray lines in the image. " - text run at (663,44) width 36: "This" - text run at (0,66) width 689: "paragraph should have a white background, first of all, which extends to the edges of" - text run at (0,88) width 152: "the element's box. " - text run at (152,88) width 437: "There is no padding set on this paragraph whatsoever." - RenderBlock {P} at (34,502) size 707x154 [bgcolor=#FFFFFF] + text run at (30,23) width 661: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing" + text run at (0,46) width 663: "the edges of the white background to align with the thick gray lines in the image. " + text run at (663,46) width 36: "This" + text run at (0,69) width 689: "paragraph should have a white background, first of all, which extends to the edges of" + text run at (0,92) width 152: "the element's box. " + text run at (152,92) width 437: "There is no padding set on this paragraph whatsoever." + RenderBlock {P} at (34,521) size 707x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (90,0) size 696x154 + RenderText {#text} at (90,0) size 694x137 text run at (90,0) width 604: "The image in the upper left corner of this paragraph should be floated left," - text run at (90,22) width 601: "and the edges of the white background should line up with the top and left" - text run at (90,44) width 163: "edges of the image. " - text run at (253,44) width 430: "However, there should be 30 pixels of space between" - text run at (90,66) width 593: "the right and bottom edges of the image and the paragraph text around it." - text run at (90,88) width 606: "This paragraph should have a white background, first of all, which extends" - text run at (0,110) width 276: "to the edges of the element's box. " - text run at (276,110) width 335: "There is no padding set on this paragraph" - text run at (0,132) width 97: "whatsoever." - RenderBlock {P} at (34,676) size 707x132 [bgcolor=#FFFFFF] + text run at (90,23) width 601: "and the edges of the white background should line up with the top and left" + text run at (90,46) width 163: "edges of the image. " + text run at (253,46) width 430: "However, there should be 30 pixels of space between" + text run at (90,69) width 593: "the right and bottom edges of the image and the paragraph text around it." + text run at (0,92) width 657: "This paragraph should have a white background, first of all, which extends to the" + text run at (0,115) width 225: "edges of the element's box. " + text run at (225,115) width 437: "There is no padding set on this paragraph whatsoever." + RenderBlock {P} at (34,679) size 707x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (30,0) size 706x132 + RenderText {#text} at (30,0) size 706x137 text run at (30,0) width 668: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,22) width 640: "edges of the white background should line up with the top and left edges of the" - text run at (0,44) width 60: "image. " - text run at (60,44) width 636: "However, the text should overlap the image's right and bottom sides, lining up" - text run at (0,66) width 313: "with the thick gray lines in the image. " - text run at (313,66) width 393: "This paragraph should have a white background," - text run at (0,88) width 489: "first of all, which extends to the edges of the element's box. " - text run at (489,88) width 214: "There is no padding set on" - text run at (0,110) width 218: "this paragraph whatsoever." + text run at (30,23) width 640: "edges of the white background should line up with the top and left edges of the" + text run at (0,46) width 60: "image. " + text run at (60,46) width 636: "However, the text should overlap the image's right and bottom sides, lining up" + text run at (0,69) width 313: "with the thick gray lines in the image. " + text run at (313,69) width 393: "This paragraph should have a white background," + text run at (0,92) width 489: "first of all, which extends to the edges of the element's box. " + text run at (489,92) width 214: "There is no padding set on" + text run at (0,115) width 218: "this paragraph whatsoever." diff --git a/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.png b/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.png index fdef22cb7230..180b99ef5089 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.txt index 4bf0658566b0..58ac84a1b47f 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/float_on_text_elements-expected.txt @@ -1,353 +1,353 @@ -layer at (0,0) size 785x2589 +layer at (0,0) size 785x2714 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2589 - RenderBlock {HTML} at (0,0) size 785x2589 - RenderBody {BODY} at (8,8) size 769x2573 [bgcolor=#CCCCCC] - RenderBlock (floating) {P} at (0,0) size 385x34 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 385x34 +layer at (0,0) size 785x2714 + RenderBlock {HTML} at (0,0) size 785x2714 + RenderBody {BODY} at (8,8) size 769x2698 [bgcolor=#CCCCCC] + RenderBlock (floating) {P} at (0,0) size 385x36 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 385x35 text run at (0,0) width 385: "This paragraph is of class \"one\". It has a width of 50% and" - text run at (0,17) width 124: "is floated to the left." - RenderBlock {P} at (0,0) size 769x85 - RenderText {#text} at (384,0) size 769x85 + text run at (0,18) width 124: "is floated to the left." + RenderBlock {P} at (0,0) size 769x90 + RenderText {#text} at (384,0) size 769x89 text run at (384,0) width 385: "This paragraph should start on the right side of a yellow box" - text run at (384,17) width 385: "which contains the previous paragraph. Since the text of this" - text run at (0,34) width 769: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no" - text run at (0,51) width 769: "padding, border or margins on this and the previous element, so the text of the two elements should be very close to each" - text run at (0,68) width 36: "other." - RenderBlock (anonymous) at (0,85) size 769x17 + text run at (384,18) width 385: "which contains the previous paragraph. Since the text of this" + text run at (0,36) width 769: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no" + text run at (0,54) width 769: "padding, border or margins on this and the previous element, so the text of the two elements should be very close to each" + text run at (0,72) width 36: "other." + RenderBlock (anonymous) at (0,90) size 769x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (0,110) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (0,120) size 769x68 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 769x68 + RenderBlock {HR} at (0,116) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (0,126) size 769x72 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 769x71 text run at (0,0) width 769: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,17) width 769: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a" - text run at (0,34) width 769: "orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this" - text run at (0,51) width 217: "paragraph for diagnostic purposes." - RenderBlock (anonymous) at (0,120) size 769x86 - RenderImage {IMG} at (0,68) size 15x15 - RenderText {#text} at (15,69) size 4x17 - text run at (15,69) width 4: " " - RenderBR {BR} at (19,83) size 0x0 - RenderBlock {HR} at (0,214) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (0,224) size 385x102 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 385x102 + text run at (0,18) width 769: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a" + text run at (0,36) width 769: "orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this" + text run at (0,54) width 217: "paragraph for diagnostic purposes." + RenderBlock (anonymous) at (0,126) size 769x91 + RenderImage {IMG} at (0,72) size 15x15 + RenderText {#text} at (15,73) size 4x17 + text run at (15,73) width 4: " " + RenderBR {BR} at (19,87) size 0x0 + RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (0,235) size 385x108 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 385x107 text run at (0,0) width 385: "This paragraph is floated to the left and the orange square" - text run at (0,17) width 385: "image should appear to the right of the paragraph. This" - text run at (0,34) width 385: "paragraph has a yellow background and no padding, margin" - text run at (0,51) width 385: "or border. The right edge of this yellow box should be" - text run at (0,68) width 385: "horizontally aligned with the left edge of the yellow box" - text run at (0,85) width 79: "undernearth." - RenderBlock (anonymous) at (0,224) size 769x102 + text run at (0,18) width 385: "image should appear to the right of the paragraph. This" + text run at (0,36) width 385: "paragraph has a yellow background and no padding, margin" + text run at (0,54) width 385: "or border. The right edge of this yellow box should be" + text run at (0,72) width 385: "horizontally aligned with the left edge of the yellow box" + text run at (0,90) width 79: "undernearth." + RenderBlock (anonymous) at (0,235) size 769x108 RenderImage {IMG} at (384,0) size 16x15 RenderText {#text} at (399,1) size 5x17 text run at (399,1) width 5: " " RenderBR {BR} at (403,15) size 1x0 - RenderBlock {HR} at (0,334) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (384,344) size 385x102 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 385x102 + RenderBlock {HR} at (0,351) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (384,361) size 385x108 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 385x107 text run at (0,0) width 385: "This paragraph is floated to the right (using a STYLE" - text run at (0,17) width 385: "attribute) and the orange square image should appear to the" - text run at (0,34) width 385: "left of the paragraph. This paragraph has a yellow" - text run at (0,51) width 385: "background and no padding, margin or border. The left edge" - text run at (0,68) width 385: "of this yellow box should be horizonally aligned with the" - text run at (0,85) width 224: "right edge of the yellow box above." - RenderBlock (anonymous) at (0,344) size 769x102 + text run at (0,18) width 385: "attribute) and the orange square image should appear to the" + text run at (0,36) width 385: "left of the paragraph. This paragraph has a yellow" + text run at (0,54) width 385: "background and no padding, margin or border. The left edge" + text run at (0,72) width 385: "of this yellow box should be horizonally aligned with the" + text run at (0,90) width 224: "right edge of the yellow box above." + RenderBlock (anonymous) at (0,361) size 769x108 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (15,1) size 4x17 text run at (15,1) width 4: " " RenderBR {BR} at (19,15) size 0x0 - RenderBlock {HR} at (0,454) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,464) size 769x51 - RenderBlock (floating) {SPAN} at (0,0) size 48x36 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,477) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,487) size 769x54 + RenderBlock (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 21x36 text run at (0,0) width 21: "T" - RenderText {#text} at (48,0) size 721x51 + RenderText {#text} at (48,0) size 721x53 text run at (48,0) width 721: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" - text run at (48,17) width 496: "well as bold, with a content width of 1.5em and a background-color of silver. " - text run at (544,17) width 225: "The top of the big letter \"T\" should" - text run at (48,34) width 675: "be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - RenderBlock (anonymous) at (0,515) size 769x17 + text run at (48,18) width 496: "well as bold, with a content width of 1.5em and a background-color of silver. " + text run at (544,18) width 225: "The top of the big letter \"T\" should" + text run at (48,36) width 675: "be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." + RenderBlock (anonymous) at (0,541) size 769x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (0,540) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (423,560) size 336x186 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - RenderText {#text} at (8,8) size 320x170 + RenderBlock {HR} at (0,567) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (423,587) size 336x196 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] + RenderText {#text} at (8,8) size 320x179 text run at (8,8) width 320: "This paragraph should be floated to the right, sort" - text run at (8,25) width 320: "of like a 'sidebar' in a magazine article. Its width is" - text run at (8,42) width 320: "20em so the box should not be reformatted when" - text run at (8,59) width 320: "the size of the viewport is changed (e.g. when the" - text run at (8,76) width 320: "window is resized). The background color of the" - text run at (8,93) width 320: "element is yellow, and there should be a 3px solid" - text run at (8,110) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,127) width 320: "element has a 10px wide margin around it where" - text run at (8,144) width 320: "the blue background of the paragraph in the" - text run at (8,161) width 217: "normal flow should shine through." - RenderBlock {P} at (0,550) size 769x187 [bgcolor=#66CCFF] - RenderText {#text} at (0,0) size 413x187 + text run at (8,26) width 320: "of like a 'sidebar' in a magazine article. Its width is" + text run at (8,44) width 320: "20em so the box should not be reformatted when" + text run at (8,62) width 320: "the size of the viewport is changed (e.g. when the" + text run at (8,80) width 320: "window is resized). The background color of the" + text run at (8,98) width 320: "element is yellow, and there should be a 3px solid" + text run at (8,116) width 320: "red border outside a 5px wide padding. Also, the" + text run at (8,134) width 320: "element has a 10px wide margin around it where" + text run at (8,152) width 320: "the blue background of the paragraph in the" + text run at (8,170) width 217: "normal flow should shine through." + RenderBlock {P} at (0,577) size 769x198 [bgcolor=#66CCFF] + RenderText {#text} at (0,0) size 413x197 text run at (0,0) width 413: "This paragraph is not floating. If there is enough room, the textual" - text run at (0,17) width 413: "content of the paragraph should appear on the left side of the" - text run at (0,34) width 193: "yellow \"sidebar\" on the right. " - text run at (193,34) width 220: "The content of this element should" - text run at (0,51) width 220: "flow around the floated element. " - text run at (219,51) width 194: "However, the floated element" - text run at (0,68) width 413: "may or may not be obscured by the blue background of this" - text run at (0,85) width 413: "element, as the specification does not say which is drawn \"on" - text run at (0,102) width 38: "top.\" " - text run at (37,102) width 376: "Even if the floated element is obscured, it still forces the" - text run at (0,119) width 264: "content of this element to flow around it. " - text run at (263,119) width 150: "If the floated element is" - text run at (0,136) width 413: "not obscured, then the blue rectangle of this paragraph should" - text run at (0,153) width 413: "extend 10px above and to the right of the sidebar's red border," - text run at (0,170) width 319: "due to the margin styles set for the floated element." - RenderBlock (anonymous) at (0,737) size 769x19 + text run at (0,18) width 413: "content of the paragraph should appear on the left side of the" + text run at (0,36) width 193: "yellow \"sidebar\" on the right. " + text run at (193,36) width 220: "The content of this element should" + text run at (0,54) width 220: "flow around the floated element. " + text run at (219,54) width 194: "However, the floated element" + text run at (0,72) width 413: "may or may not be obscured by the blue background of this" + text run at (0,90) width 413: "element, as the specification does not say which is drawn \"on" + text run at (0,108) width 38: "top.\" " + text run at (37,108) width 376: "Even if the floated element is obscured, it still forces the" + text run at (0,126) width 264: "content of this element to flow around it. " + text run at (263,126) width 150: "If the floated element is" + text run at (0,144) width 413: "not obscured, then the blue rectangle of this paragraph should" + text run at (0,162) width 413: "extend 10px above and to the right of the sidebar's red border," + text run at (0,180) width 319: "due to the margin styles set for the floated element." + RenderBlock (anonymous) at (0,775) size 769x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (0,764) size 769x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (0,774) size 769x25 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - RenderBlock (floating) {DIV} at (425,14) size 330x214 [bgcolor=#FFFF00] - RenderBlock {P} at (5,5) size 320x204 - RenderText {#text} at (0,0) size 320x204 + RenderBlock {HR} at (0,801) size 769x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,811) size 769x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] + RenderBlock (floating) {DIV} at (425,14) size 330x226 [bgcolor=#FFFF00] + RenderBlock {P} at (5,5) size 320x216 + RenderText {#text} at (0,0) size 320x215 text run at (0,0) width 320: "This paragraph is placed inside a DIV element" - text run at (0,17) width 320: "which is floated to the right. The width of the DIV" - text run at (0,34) width 320: "element is 20em. The background is yellow and" - text run at (0,51) width 320: "there is a 5px padding, a 10px margin and no" - text run at (0,68) width 320: "border. Since it is floated, the yellow box should" - text run at (0,85) width 320: "be rendered on top of the background and borders" - text run at (0,102) width 320: "of adjacent non-floated elements. To the left of this" - text run at (0,119) width 320: "yellow box there should be a short paragraph with" - text run at (0,136) width 320: "a blue background and a red border. The yellow" - text run at (0,153) width 320: "box should be rendered on top of the bottom red" - text run at (0,170) width 320: "border. I.e., the bottom red border will appear" - text run at (0,187) width 318: "broken where it's overlaid by the yellow rectangle." - RenderBlock {P} at (4,4) size 761x17 + text run at (0,18) width 320: "which is floated to the right. The width of the DIV" + text run at (0,36) width 320: "element is 20em. The background is yellow and" + text run at (0,54) width 320: "there is a 5px padding, a 10px margin and no" + text run at (0,72) width 320: "border. Since it is floated, the yellow box should" + text run at (0,90) width 320: "be rendered on top of the background and borders" + text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this" + text run at (0,126) width 320: "yellow box there should be a short paragraph with" + text run at (0,144) width 320: "a blue background and a red border. The yellow" + text run at (0,162) width 320: "box should be rendered on top of the bottom red" + text run at (0,180) width 320: "border. I.e., the bottom red border will appear" + text run at (0,198) width 318: "broken where it's overlaid by the yellow rectangle." + RenderBlock {P} at (4,4) size 761x18 RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "See description in the box on the right side" - RenderBlock (anonymous) at (0,799) size 769x213 + RenderBlock (anonymous) at (0,837) size 769x224 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (0,1020) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {DIV} at (0,1030) size 193x68 [bgcolor=#66CCFF] - RenderBlock {P} at (0,0) size 193x68 - RenderText {#text} at (0,0) size 193x68 + RenderBlock {HR} at (0,1069) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {DIV} at (0,1079) size 193x72 [bgcolor=#66CCFF] + RenderBlock {P} at (0,0) size 193x72 + RenderText {#text} at (0,0) size 193x71 text run at (0,0) width 193: "This paragraph is inside a" - text run at (0,17) width 193: "DIV which is floated left. Its" - text run at (0,34) width 193: "background is blue and the" - text run at (0,51) width 87: "width is 25%." - RenderBlock (floating) {DIV} at (576,1030) size 193x68 [bgcolor=#FFFF00] - RenderBlock {P} at (0,0) size 193x68 - RenderText {#text} at (0,0) size 193x68 + text run at (0,18) width 193: "DIV which is floated left. Its" + text run at (0,36) width 193: "background is blue and the" + text run at (0,54) width 87: "width is 25%." + RenderBlock (floating) {DIV} at (576,1079) size 193x72 [bgcolor=#FFFF00] + RenderBlock {P} at (0,0) size 193x72 + RenderText {#text} at (0,0) size 193x71 text run at (0,0) width 193: "This paragraph is inside a" - text run at (0,17) width 193: "DIV which is floated right. Its" - text run at (0,34) width 193: "background is yellow and the" - text run at (0,51) width 87: "width is 25%." - RenderBlock {P} at (0,1030) size 769x34 - RenderText {#text} at (192,0) size 385x34 + text run at (0,18) width 193: "DIV which is floated right. Its" + text run at (0,36) width 193: "background is yellow and the" + text run at (0,54) width 87: "width is 25%." + RenderBlock {P} at (0,1079) size 769x36 + RenderText {#text} at (192,0) size 385x35 text run at (192,0) width 385: "This paragraph should appear between a blue box (on the" - text run at (192,17) width 30: "left) " - text run at (221,17) width 200: "and a yellow box (on the right)." - RenderBlock (anonymous) at (0,1064) size 769x34 + text run at (192,18) width 30: "left) " + text run at (221,18) width 200: "and a yellow box (on the right)." + RenderBlock (anonymous) at (0,1115) size 769x36 RenderBR {BR} at (192,0) size 1x17 - RenderBlock {HR} at (0,1106) size 769x2 [border: (1px inset #000000)] - RenderBlock (floating) {DIV} at (0,1116) size 577x119 [bgcolor=#66CCFF] - RenderBlock (floating) {DIV} at (422,0) size 145x34 [bgcolor=#FFFF00] - RenderBlock {P} at (0,0) size 145x34 - RenderText {#text} at (0,0) size 145x34 + RenderBlock {HR} at (0,1159) size 769x2 [border: (1px inset #000000)] + RenderBlock (floating) {DIV} at (0,1169) size 577x126 [bgcolor=#66CCFF] + RenderBlock (floating) {DIV} at (422,0) size 145x36 [bgcolor=#FFFF00] + RenderBlock {P} at (0,0) size 145x36 + RenderText {#text} at (0,0) size 145x35 text run at (0,0) width 145: "See description in the" - text run at (0,17) width 124: "box on the left side." - RenderBlock {P} at (0,0) size 577x119 - RenderText {#text} at (0,0) size 577x119 + text run at (0,18) width 124: "box on the left side." + RenderBlock {P} at (0,0) size 577x126 + RenderText {#text} at (0,0) size 577x125 text run at (0,0) width 423: "This paragraph is inside a DIV which is floated left. The" - text run at (0,17) width 423: "background of the DIV element is blue and its width is 75%. This" - text run at (0,34) width 366: "text should all be inside the blue rectangle. The blue DIV " - text run at (365,34) width 212: "element has another DIV element" - text run at (0,51) width 167: "as a child. It has a yellow " - text run at (166,51) width 363: "background color and is floated to the right. Since it is a " - text run at (528,51) width 49: "child of" - text run at (0,68) width 375: "the blue DIV, the yellow DIV should appear inside the " - text run at (374,68) width 203: "blue rectangle. Due to it being" - text run at (0,85) width 194: "floated to the right and having " - text run at (193,85) width 384: "a 10px right margin, the yellow rectange should have a 10px" - text run at (0,102) width 31: "blue " - text run at (31,102) width 138: "stripe on its right side." - RenderBlock (anonymous) at (0,1116) size 769x119 + text run at (0,18) width 423: "background of the DIV element is blue and its width is 75%. This" + text run at (0,36) width 366: "text should all be inside the blue rectangle. The blue DIV " + text run at (365,36) width 212: "element has another DIV element" + text run at (0,54) width 167: "as a child. It has a yellow " + text run at (166,54) width 363: "background color and is floated to the right. Since it is a " + text run at (528,54) width 49: "child of" + text run at (0,72) width 375: "the blue DIV, the yellow DIV should appear inside the " + text run at (374,72) width 203: "blue rectangle. Due to it being" + text run at (0,90) width 194: "floated to the right and having " + text run at (193,90) width 384: "a 10px right margin, the yellow rectange should have a 10px" + text run at (0,108) width 31: "blue " + text run at (31,108) width 138: "stripe on its right side." + RenderBlock (anonymous) at (0,1169) size 769x126 RenderBR {BR} at (576,0) size 1x17 - RenderBlock {HR} at (0,1243) size 769x2 [border: (1px inset #000000)] - RenderTable {TABLE} at (0,1253) size 769x1320 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1318 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderBlock {HR} at (0,1303) size 769x2 [border: (1px inset #000000)] + RenderTable {TABLE} at (0,1313) size 769x1385 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1383 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1293 - RenderTableCell {TD} at (0,659) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1293 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (floating) {P} at (4,4) size 374x34 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 374x34 + RenderTableRow {TR} at (0,26) size 767x1357 + RenderTableCell {TD} at (0,691) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x1357 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (floating) {P} at (4,4) size 374x36 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 374x35 text run at (0,0) width 374: "This paragraph is of class \"one\". It has a width of 50% and" - text run at (0,17) width 124: "is floated to the left." - RenderBlock {P} at (4,4) size 747x85 - RenderText {#text} at (373,0) size 747x85 + text run at (0,18) width 124: "is floated to the left." + RenderBlock {P} at (4,4) size 747x90 + RenderText {#text} at (373,0) size 747x89 text run at (373,0) width 374: "This paragraph should start on the right side of a yellow" - text run at (373,17) width 374: "box which contains the previous paragraph. Since the text" - text run at (0,34) width 747: "of this element is much longer than the text in the previous element, the text will wrap around the yellow box. There is" - text run at (0,51) width 747: "no padding, border or margins on this and the previous element, so the text of the two elements should be very close to" - text run at (0,68) width 69: "each other." - RenderBlock (anonymous) at (4,89) size 747x17 + text run at (373,18) width 374: "box which contains the previous paragraph. Since the text" + text run at (0,36) width 747: "of this element is much longer than the text in the previous element, the text will wrap around the yellow box. There is" + text run at (0,54) width 747: "no padding, border or margins on this and the previous element, so the text of the two elements should be very close to" + text run at (0,72) width 69: "each other." + RenderBlock (anonymous) at (4,94) size 747x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (4,114) size 747x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (4,124) size 747x68 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 747x68 + RenderBlock {HR} at (4,120) size 747x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (4,130) size 747x72 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 747x71 text run at (0,0) width 747: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,17) width 747: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides" - text run at (0,34) width 747: "and a orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added" - text run at (0,51) width 259: "to this paragraph for diagnostic purposes." - RenderBlock (anonymous) at (4,124) size 747x86 - RenderImage {IMG} at (0,68) size 15x15 - RenderText {#text} at (15,69) size 4x17 - text run at (15,69) width 4: " " - RenderBR {BR} at (19,83) size 0x0 - RenderBlock {HR} at (4,218) size 747x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (4,228) size 374x102 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 374x102 + text run at (0,18) width 747: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides" + text run at (0,36) width 747: "and a orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added" + text run at (0,54) width 259: "to this paragraph for diagnostic purposes." + RenderBlock (anonymous) at (4,130) size 747x91 + RenderImage {IMG} at (0,72) size 15x15 + RenderText {#text} at (15,73) size 4x17 + text run at (15,73) width 4: " " + RenderBR {BR} at (19,87) size 0x0 + RenderBlock {HR} at (4,229) size 747x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (4,239) size 374x108 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 374x107 text run at (0,0) width 374: "This paragraph is floated to the left and the orange square" - text run at (0,17) width 374: "image should appear to the right of the paragraph. This" - text run at (0,34) width 374: "paragraph has a yellow background and no padding," - text run at (0,51) width 374: "margin or border. The right edge of this yellow box should" - text run at (0,68) width 374: "be horizontally aligned with the left edge of the yellow box" - text run at (0,85) width 79: "undernearth." - RenderBlock (anonymous) at (4,228) size 747x102 + text run at (0,18) width 374: "image should appear to the right of the paragraph. This" + text run at (0,36) width 374: "paragraph has a yellow background and no padding," + text run at (0,54) width 374: "margin or border. The right edge of this yellow box should" + text run at (0,72) width 374: "be horizontally aligned with the left edge of the yellow box" + text run at (0,90) width 79: "undernearth." + RenderBlock (anonymous) at (4,239) size 747x108 RenderImage {IMG} at (373,0) size 16x15 RenderText {#text} at (388,1) size 5x17 text run at (388,1) width 5: " " RenderBR {BR} at (392,15) size 1x0 - RenderBlock {HR} at (4,338) size 747x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (377,348) size 374x102 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 374x102 + RenderBlock {HR} at (4,355) size 747x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (377,365) size 374x108 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 374x107 text run at (0,0) width 374: "This paragraph is floated to the right (using a STYLE" - text run at (0,17) width 374: "attribute) and the orange square image should appear to the" - text run at (0,34) width 374: "left of the paragraph. This paragraph has a yellow" - text run at (0,51) width 374: "background and no padding, margin or border. The left" - text run at (0,68) width 374: "edge of this yellow box should be horizonally aligned with" - text run at (0,85) width 247: "the right edge of the yellow box above." - RenderBlock (anonymous) at (4,348) size 747x102 + text run at (0,18) width 374: "attribute) and the orange square image should appear to the" + text run at (0,36) width 374: "left of the paragraph. This paragraph has a yellow" + text run at (0,54) width 374: "background and no padding, margin or border. The left" + text run at (0,72) width 374: "edge of this yellow box should be horizonally aligned with" + text run at (0,90) width 247: "the right edge of the yellow box above." + RenderBlock (anonymous) at (4,365) size 747x108 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (15,1) size 4x17 text run at (15,1) width 4: " " RenderBR {BR} at (19,15) size 0x0 - RenderBlock {HR} at (4,458) size 747x2 [border: (1px inset #000000)] - RenderBlock {P} at (4,468) size 747x68 - RenderBlock (floating) {SPAN} at (0,0) size 48x36 [bgcolor=#C0C0C0] + RenderBlock {HR} at (4,481) size 747x2 [border: (1px inset #000000)] + RenderBlock {P} at (4,491) size 747x72 + RenderBlock (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 21x36 text run at (0,0) width 21: "T" - RenderText {#text} at (48,0) size 747x68 + RenderText {#text} at (48,0) size 747x71 text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" - text run at (48,17) width 514: "well as bold, with a content width of 1.5em and a background-color of silver. " - text run at (561,17) width 186: "The top of the big letter \"T\"" - text run at (48,34) width 699: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-" - text run at (0,51) width 33: "cap\"." - RenderBlock (anonymous) at (4,536) size 747x17 + text run at (48,18) width 514: "well as bold, with a content width of 1.5em and a background-color of silver. " + text run at (561,18) width 186: "The top of the big letter \"T\"" + text run at (48,36) width 699: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-" + text run at (0,54) width 33: "cap\"." + RenderBlock (anonymous) at (4,563) size 747x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (4,561) size 747x2 [border: (1px inset #000000)] - RenderBlock (floating) {P} at (405,581) size 336x186 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - RenderText {#text} at (8,8) size 320x170 + RenderBlock {HR} at (4,589) size 747x2 [border: (1px inset #000000)] + RenderBlock (floating) {P} at (405,609) size 336x196 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] + RenderText {#text} at (8,8) size 320x179 text run at (8,8) width 320: "This paragraph should be floated to the right, sort" - text run at (8,25) width 320: "of like a 'sidebar' in a magazine article. Its width is" - text run at (8,42) width 320: "20em so the box should not be reformatted when" - text run at (8,59) width 320: "the size of the viewport is changed (e.g. when the" - text run at (8,76) width 320: "window is resized). The background color of the" - text run at (8,93) width 320: "element is yellow, and there should be a 3px solid" - text run at (8,110) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,127) width 320: "element has a 10px wide margin around it where" - text run at (8,144) width 320: "the blue background of the paragraph in the" - text run at (8,161) width 217: "normal flow should shine through." - RenderBlock {P} at (4,571) size 747x204 [bgcolor=#66CCFF] - RenderText {#text} at (0,0) size 391x204 + text run at (8,26) width 320: "of like a 'sidebar' in a magazine article. Its width is" + text run at (8,44) width 320: "20em so the box should not be reformatted when" + text run at (8,62) width 320: "the size of the viewport is changed (e.g. when the" + text run at (8,80) width 320: "window is resized). The background color of the" + text run at (8,98) width 320: "element is yellow, and there should be a 3px solid" + text run at (8,116) width 320: "red border outside a 5px wide padding. Also, the" + text run at (8,134) width 320: "element has a 10px wide margin around it where" + text run at (8,152) width 320: "the blue background of the paragraph in the" + text run at (8,170) width 217: "normal flow should shine through." + RenderBlock {P} at (4,599) size 747x216 [bgcolor=#66CCFF] + RenderText {#text} at (0,0) size 391x215 text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the" - text run at (0,17) width 391: "textual content of the paragraph should appear on the left side" - text run at (0,34) width 261: "of the yellow \"sidebar\" on the right. " - text run at (260,34) width 131: "The content of this" - text run at (0,51) width 328: "element should flow around the floated element. " - text run at (328,51) width 63: "However," - text run at (0,68) width 391: "the floated element may or may not be obscured by the blue" - text run at (0,85) width 391: "background of this element, as the specification does not say" - text run at (0,102) width 186: "which is drawn \"on top.\" " - text run at (185,102) width 206: "Even if the floated element is" - text run at (0,119) width 391: "obscured, it still forces the content of this element to flow" - text run at (0,136) width 66: "around it. " - text run at (65,136) width 326: "If the floated element is not obscured, then the blue" - text run at (0,153) width 391: "rectangle of this paragraph should extend 10px above and to" - text run at (0,170) width 391: "the right of the sidebar's red border, due to the margin styles" - text run at (0,187) width 166: "set for the floated element." - RenderBlock (anonymous) at (4,775) size 747x17 + text run at (0,18) width 391: "textual content of the paragraph should appear on the left side" + text run at (0,36) width 261: "of the yellow \"sidebar\" on the right. " + text run at (260,36) width 131: "The content of this" + text run at (0,54) width 328: "element should flow around the floated element. " + text run at (328,54) width 63: "However," + text run at (0,72) width 391: "the floated element may or may not be obscured by the blue" + text run at (0,90) width 391: "background of this element, as the specification does not say" + text run at (0,108) width 186: "which is drawn \"on top.\" " + text run at (185,108) width 206: "Even if the floated element is" + text run at (0,126) width 391: "obscured, it still forces the content of this element to flow" + text run at (0,144) width 66: "around it. " + text run at (65,144) width 326: "If the floated element is not obscured, then the blue" + text run at (0,162) width 391: "rectangle of this paragraph should extend 10px above and to" + text run at (0,180) width 391: "the right of the sidebar's red border, due to the margin styles" + text run at (0,198) width 166: "set for the floated element." + RenderBlock (anonymous) at (4,815) size 747x18 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (4,800) size 747x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (4,810) size 747x25 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - RenderBlock (floating) {DIV} at (403,14) size 330x214 [bgcolor=#FFFF00] - RenderBlock {P} at (5,5) size 320x204 - RenderText {#text} at (0,0) size 320x204 + RenderBlock {HR} at (4,841) size 747x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (4,851) size 747x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] + RenderBlock (floating) {DIV} at (403,14) size 330x226 [bgcolor=#FFFF00] + RenderBlock {P} at (5,5) size 320x216 + RenderText {#text} at (0,0) size 320x215 text run at (0,0) width 320: "This paragraph is placed inside a DIV element" - text run at (0,17) width 320: "which is floated to the right. The width of the DIV" - text run at (0,34) width 320: "element is 20em. The background is yellow and" - text run at (0,51) width 320: "there is a 5px padding, a 10px margin and no" - text run at (0,68) width 320: "border. Since it is floated, the yellow box should" - text run at (0,85) width 320: "be rendered on top of the background and borders" - text run at (0,102) width 320: "of adjacent non-floated elements. To the left of this" - text run at (0,119) width 320: "yellow box there should be a short paragraph with" - text run at (0,136) width 320: "a blue background and a red border. The yellow" - text run at (0,153) width 320: "box should be rendered on top of the bottom red" - text run at (0,170) width 320: "border. I.e., the bottom red border will appear" - text run at (0,187) width 318: "broken where it's overlaid by the yellow rectangle." - RenderBlock {P} at (4,4) size 739x17 + text run at (0,18) width 320: "which is floated to the right. The width of the DIV" + text run at (0,36) width 320: "element is 20em. The background is yellow and" + text run at (0,54) width 320: "there is a 5px padding, a 10px margin and no" + text run at (0,72) width 320: "border. Since it is floated, the yellow box should" + text run at (0,90) width 320: "be rendered on top of the background and borders" + text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this" + text run at (0,126) width 320: "yellow box there should be a short paragraph with" + text run at (0,144) width 320: "a blue background and a red border. The yellow" + text run at (0,162) width 320: "box should be rendered on top of the bottom red" + text run at (0,180) width 320: "border. I.e., the bottom red border will appear" + text run at (0,198) width 318: "broken where it's overlaid by the yellow rectangle." + RenderBlock {P} at (4,4) size 739x18 RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "See description in the box on the right side" - RenderBlock (anonymous) at (4,835) size 747x213 + RenderBlock (anonymous) at (4,877) size 747x224 RenderBR {BR} at (0,0) size 0x17 - RenderBlock {HR} at (4,1056) size 747x2 [border: (1px inset #000000)] - RenderBlock (floating) {DIV} at (4,1066) size 187x68 [bgcolor=#66CCFF] - RenderBlock {P} at (0,0) size 187x68 - RenderText {#text} at (0,0) size 187x68 + RenderBlock {HR} at (4,1109) size 747x2 [border: (1px inset #000000)] + RenderBlock (floating) {DIV} at (4,1119) size 187x72 [bgcolor=#66CCFF] + RenderBlock {P} at (0,0) size 187x72 + RenderText {#text} at (0,0) size 187x71 text run at (0,0) width 187: "This paragraph is inside a" - text run at (0,17) width 187: "DIV which is floated left. Its" - text run at (0,34) width 187: "background is blue and the" - text run at (0,51) width 87: "width is 25%." - RenderBlock (floating) {DIV} at (564,1066) size 187x68 [bgcolor=#FFFF00] - RenderBlock {P} at (0,0) size 187x68 - RenderText {#text} at (0,0) size 187x68 + text run at (0,18) width 187: "DIV which is floated left. Its" + text run at (0,36) width 187: "background is blue and the" + text run at (0,54) width 87: "width is 25%." + RenderBlock (floating) {DIV} at (564,1119) size 187x72 [bgcolor=#FFFF00] + RenderBlock {P} at (0,0) size 187x72 + RenderText {#text} at (0,0) size 187x71 text run at (0,0) width 187: "This paragraph is inside a" - text run at (0,17) width 187: "DIV which is floated right." - text run at (0,34) width 21: "Its " - text run at (20,34) width 167: "background is yellow and" - text run at (0,51) width 110: "the width is 25%." - RenderBlock {P} at (4,1066) size 747x34 - RenderText {#text} at (186,0) size 375x34 + text run at (0,18) width 187: "DIV which is floated right." + text run at (0,36) width 21: "Its " + text run at (20,36) width 167: "background is yellow and" + text run at (0,54) width 110: "the width is 25%." + RenderBlock {P} at (4,1119) size 747x36 + RenderText {#text} at (186,0) size 375x35 text run at (186,0) width 375: "This paragraph should appear between a blue box (on the" - text run at (186,17) width 30: "left) " - text run at (215,17) width 200: "and a yellow box (on the right)." - RenderBlock (anonymous) at (4,1100) size 747x34 + text run at (186,18) width 30: "left) " + text run at (215,18) width 200: "and a yellow box (on the right)." + RenderBlock (anonymous) at (4,1155) size 747x36 RenderBR {BR} at (186,0) size 1x17 - RenderBlock {HR} at (4,1142) size 747x2 [border: (1px inset #000000)] - RenderBlock (floating) {DIV} at (4,1152) size 561x119 [bgcolor=#66CCFF] - RenderBlock (floating) {DIV} at (410,0) size 141x34 [bgcolor=#FFFF00] - RenderBlock {P} at (0,0) size 141x34 - RenderText {#text} at (0,0) size 141x34 + RenderBlock {HR} at (4,1199) size 747x2 [border: (1px inset #000000)] + RenderBlock (floating) {DIV} at (4,1209) size 561x126 [bgcolor=#66CCFF] + RenderBlock (floating) {DIV} at (410,0) size 141x36 [bgcolor=#FFFF00] + RenderBlock {P} at (0,0) size 141x36 + RenderText {#text} at (0,0) size 141x35 text run at (0,0) width 141: "See description in the" - text run at (0,17) width 124: "box on the left side." - RenderBlock {P} at (0,0) size 561x119 - RenderText {#text} at (0,0) size 561x119 + text run at (0,18) width 124: "box on the left side." + RenderBlock {P} at (0,0) size 561x126 + RenderText {#text} at (0,0) size 561x125 text run at (0,0) width 411: "This paragraph is inside a DIV which is floated left. The" - text run at (0,17) width 411: "background of the DIV element is blue and its width is 75%." - text run at (0,34) width 33: "This " - text run at (32,34) width 369: "text should all be inside the blue rectangle. The blue DIV " - text run at (401,34) width 160: "element has another DIV" - text run at (0,51) width 218: "element as a child. It has a yellow " - text run at (217,51) width 344: "background color and is floated to the right. Since it is" - text run at (0,68) width 12: "a " - text run at (11,68) width 409: "child of the blue DIV, the yellow DIV should appear inside the " - text run at (419,68) width 142: "blue rectangle. Due to" - text run at (0,85) width 253: "it being floated to the right and having " - text run at (252,85) width 309: "a 10px right margin, the yellow rectange should" - text run at (0,102) width 112: "have a 10px blue " - text run at (112,102) width 138: "stripe on its right side." - RenderBlock (anonymous) at (4,1152) size 747x119 + text run at (0,18) width 411: "background of the DIV element is blue and its width is 75%." + text run at (0,36) width 33: "This " + text run at (32,36) width 369: "text should all be inside the blue rectangle. The blue DIV " + text run at (401,36) width 160: "element has another DIV" + text run at (0,54) width 218: "element as a child. It has a yellow " + text run at (217,54) width 344: "background color and is floated to the right. Since it is" + text run at (0,72) width 12: "a " + text run at (11,72) width 409: "child of the blue DIV, the yellow DIV should appear inside the " + text run at (419,72) width 142: "blue rectangle. Due to" + text run at (0,90) width 253: "it being floated to the right and having " + text run at (252,90) width 309: "a 10px right margin, the yellow rectange should" + text run at (0,108) width 112: "have a 10px blue " + text run at (112,108) width 138: "stripe on its right side." + RenderBlock (anonymous) at (4,1209) size 747x126 RenderBR {BR} at (560,0) size 1x17 - RenderBlock {HR} at (4,1279) size 747x2 [border: (1px inset #000000)] + RenderBlock {HR} at (4,1343) size 747x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/gtk/css1/box_properties/height-expected.png b/LayoutTests/platform/gtk/css1/box_properties/height-expected.png index cf2f053c67ac..601a25f83bfc 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/height-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/height-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/height-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/height-expected.txt index f7356c297c1f..be782d2f38ed 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/height-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/height-expected.txt @@ -1,74 +1,74 @@ -layer at (0,0) size 785x966 +layer at (0,0) size 785x974 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x966 - RenderBlock {HTML} at (0,0) size 785x966 - RenderBody {BODY} at (8,8) size 769x950 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x974 + RenderBlock {HTML} at (0,0) size 785x974 + RenderBody {BODY} at (8,8) size 769x958 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x45 + RenderBlock {PRE} at (0,34) size 769x45 RenderText {#text} at (0,0) size 168x45 text run at (0,0) width 160: ".one {height: 50px;}" text run at (0,15) width 168: ".two {height: 100px;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 769x2 [border: (1px inset #000000)] - RenderBlock (anonymous) at (0,101) size 769x50 + RenderBlock {HR} at (0,92) size 769x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,102) size 769x50 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,167) size 769x17 + RenderBlock {P} at (0,168) size 769x18 RenderText {#text} at (0,0) size 275x17 text run at (0,0) width 275: "The square above should be fifty pixels tall." - RenderBlock (anonymous) at (0,200) size 769x100 + RenderBlock (anonymous) at (0,202) size 769x100 RenderImage {IMG} at (0,0) size 100x100 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,316) size 769x17 + RenderBlock {P} at (0,318) size 769x18 RenderText {#text} at (0,0) size 335x17 text run at (0,0) width 335: "The square above should be 100 pixels tall and wide." - RenderBlock (anonymous) at (0,349) size 769x100 + RenderBlock (anonymous) at (0,352) size 769x100 RenderImage {IMG} at (0,0) size 30x100 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,465) size 769x35 - RenderText {#text} at (0,0) size 750x34 + RenderBlock {P} at (0,468) size 769x36 + RenderText {#text} at (0,0) size 750x35 text run at (0,0) width 750: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has" - text run at (0,17) width 150: "been doubled using the " + text run at (0,18) width 150: "been doubled using the " RenderInline {CODE} at (0,0) size 48x15 - RenderText {#text} at (150,20) size 48x15 - text run at (150,20) width 48: "height" - RenderText {#text} at (198,17) size 66x17 - text run at (198,17) width 66: " property)." - RenderTable {TABLE} at (0,516) size 769x434 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x432 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (150,21) size 48x15 + text run at (150,21) width 48: "height" + RenderText {#text} at (198,18) size 66x17 + text run at (198,18) width 66: " property)." + RenderTable {TABLE} at (0,520) size 769x438 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x436 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x407 - RenderTableCell {TD} at (0,216) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x410 + RenderTableCell {TD} at (0,218) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x407 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 755x410 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock (anonymous) at (4,4) size 747x50 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,70) size 747x17 + RenderBlock {P} at (4,70) size 747x18 RenderText {#text} at (0,0) size 275x17 text run at (0,0) width 275: "The square above should be fifty pixels tall." - RenderBlock (anonymous) at (4,103) size 747x100 + RenderBlock (anonymous) at (4,104) size 747x100 RenderImage {IMG} at (0,0) size 100x100 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,219) size 747x17 + RenderBlock {P} at (4,220) size 747x18 RenderText {#text} at (0,0) size 335x17 text run at (0,0) width 335: "The square above should be 100 pixels tall and wide." - RenderBlock (anonymous) at (4,252) size 747x100 + RenderBlock (anonymous) at (4,254) size 747x100 RenderImage {IMG} at (0,0) size 30x100 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,368) size 747x35 - RenderText {#text} at (0,0) size 725x34 + RenderBlock {P} at (4,370) size 747x36 + RenderText {#text} at (0,0) size 725x35 text run at (0,0) width 725: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size" - text run at (0,17) width 175: "has been doubled using the " + text run at (0,18) width 175: "has been doubled using the " RenderInline {CODE} at (0,0) size 48x15 - RenderText {#text} at (175,20) size 48x15 - text run at (175,20) width 48: "height" - RenderText {#text} at (223,17) size 66x17 - text run at (223,17) width 66: " property)." + RenderText {#text} at (175,21) size 48x15 + text run at (175,21) width 48: "height" + RenderText {#text} at (223,18) size 66x17 + text run at (223,18) width 66: " property)." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin-expected.png index e7b94d67eabc..4177d5931a3c 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin-expected.txt index a53612bc1917..20532832b338 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 787x2581 +layer at (0,0) size 787x2630 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x2581 - RenderBlock {HTML} at (0,0) size 785x2581 - RenderBody {BODY} at (8,8) size 769x2565 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2630 + RenderBlock {HTML} at (0,0) size 785x2630 + RenderBody {BODY} at (8,8) size 769x2614 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x105 + RenderBlock {PRE} at (0,34) size 769x105 RenderText {#text} at (0,0) size 360x105 text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" text run at (0,15) width 360: ".one {margin: 0.5in; background-color: aqua;}" @@ -15,145 +15,145 @@ layer at (0,0) size 785x2581 text run at (0,60) width 352: ".four {margin: 25%; background-color: aqua;}" text run at (0,75) width 168: ".five {margin: 25px;}" text run at (0,90) width 360: ".six {margin: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,151) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,169) size 769x34 - RenderText {#text} at (0,0) size 738x34 + RenderBlock {HR} at (0,152) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,170) size 769x36 + RenderText {#text} at (0,0) size 738x35 text run at (0,0) width 738: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,17) width 248: "section 4.1.1 of the CSS1 specification." - RenderBlock {P} at (0,219) size 769x17 [bgcolor=#C0C0C0] + text run at (0,18) width 248: "section 4.1.1 of the CSS1 specification." + RenderBlock {P} at (0,222) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (48,284) size 673x17 [bgcolor=#00FFFF] + RenderBlock {P} at (48,288) size 673x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 658x17 text run at (0,0) width 658: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - RenderBlock {P} at (0,349) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,354) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (25,391) size 719x17 [bgcolor=#00FFFF] + RenderBlock {P} at (25,397) size 719x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 641x17 text run at (0,0) width 641: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - RenderBlock {P} at (0,433) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,440) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (80,530) size 609x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 586x34 + RenderBlock {P} at (80,538) size 609x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 586x35 text run at (0,0) width 586: "This sentence should have an overall margin of 5 em, which will require extra text in order to" - text run at (0,17) width 25: "test." - RenderBlock {P} at (0,644) size 769x17 [bgcolor=#C0C0C0] + text run at (0,18) width 25: "test." + RenderBlock {P} at (0,654) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (192,853) size 385x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 377x51 + RenderBlock {P} at (192,864) size 385x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 377x53 text run at (0,0) width 377: "This sentence should have an overall margin of 25%, which" - text run at (0,17) width 376: "is calculated with respect to the width of the parent element." - text run at (0,34) width 264: "This will require extra text in order to test." - RenderBlock {P} at (0,1096) size 769x18 [bgcolor=#C0C0C0] + text run at (0,18) width 376: "is calculated with respect to the width of the parent element." + text run at (0,36) width 264: "This will require extra text in order to test." + RenderBlock {P} at (0,1110) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {UL} at (25,1138) size 719x119 [bgcolor=#00FFFF] - RenderListItem {LI} at (40,0) size 679x17 + RenderBlock {UL} at (25,1153) size 719x123 [bgcolor=#00FFFF] + RenderListItem {LI} at (40,0) size 679x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 375x17 text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background." - RenderListItem {LI} at (40,17) size 679x17 + RenderListItem {LI} at (40,18) size 679x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "Therefore, it ought to have such a margin." - RenderListItem {LI} at (65,59) size 629x17 + RenderListItem {LI} at (65,61) size 629x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 543: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - RenderListItem {LI} at (40,101) size 679x17 + RenderListItem {LI} at (40,104) size 679x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: "This list item has no special styles applied to it." - RenderBlock {P} at (0,1281) size 769x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,1300) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (-10,1288) size 789x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 775x51 + RenderBlock {P} at (-10,1308) size 789x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 775x53 text run at (0,0) width 758: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,17) width 369: "subsequent text up toward it, and a light blue background. " - text run at (369,17) width 386: "In all other respects, however, the element should be normal. " - text run at (755,17) width 20: "No" - text run at (0,34) width 528: "styles have been applied to it besides the negative margin and the background color." - RenderBlock {P} at (0,1329) size 769x18 [bgcolor=#C0C0C0] + text run at (0,18) width 369: "subsequent text up toward it, and a light blue background. " + text run at (369,18) width 386: "In all other respects, however, the element should be normal. " + text run at (755,18) width 20: "No" + text run at (0,36) width 528: "styles have been applied to it besides the negative margin and the background color." + RenderBlock {P} at (0,1352) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderTable {TABLE} at (0,1346) size 769x1219 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1217 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,1370) size 769x1244 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1242 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1192 - RenderTableCell {TD} at (0,608) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 4x18 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1192 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 738x34 + RenderTableRow {TR} at (0,26) size 767x1216 + RenderTableCell {TD} at (0,620) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x1216 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 738x35 text run at (0,0) width 738: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,17) width 248: "section 4.1.1 of the CSS1 specification." - RenderBlock {P} at (4,54) size 747x17 [bgcolor=#C0C0C0] + text run at (0,18) width 248: "section 4.1.1 of the CSS1 specification." + RenderBlock {P} at (4,56) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (52,119) size 651x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 629x34 + RenderBlock {P} at (52,122) size 651x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 629x35 text run at (0,0) width 629: "This sentence should have an overall margin of half an inch, which will require extra text in order to" - text run at (0,17) width 25: "test." - RenderBlock {P} at (4,201) size 747x17 [bgcolor=#C0C0C0] + text run at (0,18) width 25: "test." + RenderBlock {P} at (4,206) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (29,243) size 697x17 [bgcolor=#00FFFF] + RenderBlock {P} at (29,249) size 697x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 641x17 text run at (0,0) width 641: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - RenderBlock {P} at (4,285) size 747x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,292) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (84,382) size 587x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 586x34 + RenderBlock {P} at (84,390) size 587x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 586x35 text run at (0,0) width 586: "This sentence should have an overall margin of 5 em, which will require extra text in order to" - text run at (0,17) width 25: "test." - RenderBlock {P} at (4,496) size 747x17 [bgcolor=#C0C0C0] + text run at (0,18) width 25: "test." + RenderBlock {P} at (4,506) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (190,699) size 375x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 362x51 + RenderBlock {P} at (190,710) size 375x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 362x53 text run at (0,0) width 334: "This sentence should have an overall margin of 25%," - text run at (0,17) width 362: "which is calculated with respect to the width of the parent" - text run at (0,34) width 57: "element. " - text run at (57,34) width 264: "This will require extra text in order to test." - RenderBlock {P} at (4,937) size 747x18 [bgcolor=#C0C0C0] + text run at (0,18) width 362: "which is calculated with respect to the width of the parent" + text run at (0,36) width 57: "element. " + text run at (57,36) width 264: "This will require extra text in order to test." + RenderBlock {P} at (4,951) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {UL} at (29,979) size 697x119 [bgcolor=#00FFFF] - RenderListItem {LI} at (40,0) size 657x17 + RenderBlock {UL} at (29,994) size 697x123 [bgcolor=#00FFFF] + RenderListItem {LI} at (40,0) size 657x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 375x17 text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background." - RenderListItem {LI} at (40,17) size 657x17 + RenderListItem {LI} at (40,18) size 657x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "Therefore, it ought to have such a margin." - RenderListItem {LI} at (65,59) size 607x17 + RenderListItem {LI} at (65,61) size 607x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 543: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - RenderListItem {LI} at (40,101) size 657x17 + RenderListItem {LI} at (40,104) size 657x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: "This list item has no special styles applied to it." - RenderBlock {P} at (4,1122) size 747x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,1141) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (-6,1129) size 767x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 758x51 + RenderBlock {P} at (-6,1149) size 767x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 758x53 text run at (0,0) width 758: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,17) width 369: "subsequent text up toward it, and a light blue background. " - text run at (369,17) width 382: "In all other respects, however, the element should be normal." - text run at (0,34) width 552: "No styles have been applied to it besides the negative margin and the background color." - RenderBlock {P} at (4,1170) size 747x18 [bgcolor=#C0C0C0] + text run at (0,18) width 369: "subsequent text up toward it, and a light blue background. " + text run at (369,18) width 382: "In all other respects, however, the element should be normal." + text run at (0,36) width 552: "No styles have been applied to it besides the negative margin and the background color." + RenderBlock {P} at (4,1193) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.png index 7b37fbae177c..940eee9356b2 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.txt index d20c58e875e7..85782f6c3135 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1687 +layer at (0,0) size 785x1729 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1687 - RenderBlock {HTML} at (0,0) size 785x1687 - RenderBody {BODY} at (8,8) size 769x1671 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1729 + RenderBlock {HTML} at (0,0) size 785x1729 + RenderBody {BODY} at (8,8) size 769x1713 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x135 + RenderBlock {PRE} at (0,34) size 769x135 RenderText {#text} at (0,0) size 416x135 text run at (0,0) width 408: ".zero {background-color: silver; margin-bottom: 0;}" text run at (0,15) width 416: ".one {margin-bottom: 0.5in; background-color: aqua;}" @@ -17,126 +17,126 @@ layer at (0,0) size 785x1687 text run at (0,90) width 416: ".six {margin-bottom: -10px; background-color: aqua;}" text run at (0,105) width 176: "P, UL {margin-top: 0;}" text run at (0,120) width 0: " " - RenderBlock {HR} at (0,181) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,191) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,182) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,192) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,208) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 740x34 + RenderBlock {P} at (0,210) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 740x35 text run at (0,0) width 740: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,17) width 203: "margin isn't applied to each line." - RenderBlock {P} at (0,290) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 723x34 + text run at (0,18) width 203: "margin isn't applied to each line." + RenderBlock {P} at (0,294) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 723x35 text run at (0,0) width 723: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,17) width 203: "margin isn't applied to each line." - RenderBlock {P} at (0,349) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 745x34 + text run at (0,18) width 203: "margin isn't applied to each line." + RenderBlock {P} at (0,355) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" - text run at (0,17) width 155: "isn't applied to each line." - RenderBlock {P} at (0,463) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 767x34 + text run at (0,18) width 155: "isn't applied to each line." + RenderBlock {P} at (0,471) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 767x35 text run at (0,0) width 767: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" - text run at (0,17) width 126: "applied to each line." - RenderBlock {P} at (0,689) size 769x18 [bgcolor=#C0C0C0] + text run at (0,18) width 126: "applied to each line." + RenderBlock {P} at (0,699) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,706) size 769x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,717) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This element also has a class of zero." - RenderBlock {UL} at (0,723) size 769x94 [bgcolor=#00FFFF] - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {UL} at (0,735) size 769x98 [bgcolor=#00FFFF] + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 424x17 text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "Therefore, it ought to have such a margin." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 591x17 text run at (0,0) width 591: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - RenderListItem {LI} at (40,76) size 729x17 + RenderListItem {LI} at (40,79) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: "This list item has no special styles applied to it." - RenderBlock {P} at (0,841) size 769x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 760x51 + RenderBlock {P} at (0,857) size 769x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 760x53 text run at (0,0) width 748: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page," - text run at (0,17) width 123: "and no top margin. " - text run at (123,17) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (611,17) width 149: "In all other respects, the" - text run at (0,34) width 166: "element should be normal." - RenderBlock {P} at (0,882) size 769x18 [bgcolor=#C0C0C0] + text run at (0,18) width 123: "and no top margin. " + text run at (123,18) width 488: "No other styles have been applied to it besides a light blue background color. " + text run at (611,18) width 149: "In all other respects, the" + text run at (0,36) width 166: "element should be normal." + RenderBlock {P} at (0,901) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,899) size 769x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,919) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This element also has a class of zero." - RenderTable {TABLE} at (0,916) size 769x755 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x753 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,937) size 769x776 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x774 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x728 - RenderTableCell {TD} at (0,376) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 4x18 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x728 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 767x748 + RenderTableCell {TD} at (0,386) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x748 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,21) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 740x34 + RenderBlock {P} at (4,22) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 740x35 text run at (0,0) width 740: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,17) width 203: "margin isn't applied to each line." - RenderBlock {P} at (4,103) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 723x34 + text run at (0,18) width 203: "margin isn't applied to each line." + RenderBlock {P} at (4,106) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 723x35 text run at (0,0) width 723: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,17) width 203: "margin isn't applied to each line." - RenderBlock {P} at (4,162) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 745x34 + text run at (0,18) width 203: "margin isn't applied to each line." + RenderBlock {P} at (4,167) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" - text run at (0,17) width 155: "isn't applied to each line." - RenderBlock {P} at (4,276) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 738x34 + text run at (0,18) width 155: "isn't applied to each line." + RenderBlock {P} at (4,283) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 738x35 text run at (0,0) width 738: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin" - text run at (0,17) width 155: "isn't applied to each line." - RenderBlock {P} at (4,496) size 747x18 [bgcolor=#C0C0C0] + text run at (0,18) width 155: "isn't applied to each line." + RenderBlock {P} at (4,505) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,513) size 747x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,523) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This element also has a class of zero." - RenderBlock {UL} at (4,530) size 747x94 [bgcolor=#00FFFF] - RenderListItem {LI} at (40,0) size 707x17 + RenderBlock {UL} at (4,541) size 747x98 [bgcolor=#00FFFF] + RenderListItem {LI} at (40,0) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 424x17 text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background." - RenderListItem {LI} at (40,17) size 707x17 + RenderListItem {LI} at (40,18) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "Therefore, it ought to have such a margin." - RenderListItem {LI} at (40,34) size 707x17 + RenderListItem {LI} at (40,36) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 591x17 text run at (0,0) width 591: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - RenderListItem {LI} at (40,76) size 707x17 + RenderListItem {LI} at (40,79) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: "This list item has no special styles applied to it." - RenderBlock {P} at (4,648) size 747x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 717x51 + RenderBlock {P} at (4,663) size 747x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 717x53 text run at (0,0) width 710: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the" - text run at (0,17) width 161: "page, and no top margin. " - text run at (161,17) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (649,17) width 68: "In all other" - text run at (0,34) width 247: "respects, the element should be normal." - RenderBlock {P} at (4,689) size 747x18 [bgcolor=#C0C0C0] + text run at (0,18) width 161: "page, and no top margin. " + text run at (161,18) width 488: "No other styles have been applied to it besides a light blue background color. " + text run at (649,18) width 68: "In all other" + text run at (0,36) width 247: "respects, the element should be normal." + RenderBlock {P} at (4,707) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,706) size 747x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,725) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This element also has a class of zero." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.png index a969ff234d23..3132515f2577 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.txt index 20d3239c8a22..e8c6c49e8e0d 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_bottom_inline-expected.txt @@ -3,15 +3,15 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x30 + RenderBlock {PRE} at (0,34) size 784x30 RenderText {#text} at (0,0) size 416x30 text run at (0,0) width 408: ".one {margin-bottom: 25px; background-color: aqua;}" text run at (0,15) width 416: ".two {margin-bottom: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,76) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 784x52 [bgcolor=#808080] + RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -24,11 +24,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (648,0) size 761x35 text run at (648,0) width 113: ", giving it an aqua" text run at (0,18) width 245: "background and a 25px bottom margin" - RenderText {#text} at (245,18) size 784x34 + RenderText {#text} at (245,18) size 784x35 text run at (245,18) width 8: ". " text run at (253,18) width 531: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,35) width 263: "element should have the same line-height." - RenderBlock {P} at (0,162) size 784x52 [bgcolor=#808080] + text run at (0,36) width 263: "element should have the same line-height." + RenderBlock {P} at (0,165) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -41,23 +41,23 @@ layer at (0,0) size 800x600 RenderText {#text} at (648,0) size 761x35 text run at (648,0) width 113: ", giving it an aqua" text run at (0,18) width 250: "background and a -10px bottom margin" - RenderText {#text} at (250,18) size 763x34 + RenderText {#text} at (250,18) size 763x35 text run at (250,18) width 8: ". " text run at (258,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,35) width 289: "this element should have the same line-height." - RenderTable {TABLE} at (0,230) size 784x155 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x153 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,36) width 289: "this element should have the same line-height." + RenderTable {TABLE} at (0,235) size 784x160 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x158 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x128 - RenderTableCell {TD} at (0,76) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x128 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x52 [bgcolor=#808080] + RenderTableRow {TR} at (0,26) size 782x132 + RenderTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -70,11 +70,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (648,0) size 761x35 text run at (648,0) width 113: ", giving it an aqua" text run at (0,18) width 245: "background and a 25px bottom margin" - RenderText {#text} at (245,18) size 758x34 + RenderText {#text} at (245,18) size 758x35 text run at (245,18) width 8: ". " text run at (253,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,35) width 289: "this element should have the same line-height." - RenderBlock {P} at (4,72) size 762x52 [bgcolor=#808080] + text run at (0,36) width 289: "this element should have the same line-height." + RenderBlock {P} at (4,74) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -87,7 +87,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (648,0) size 761x35 text run at (648,0) width 113: ", giving it an aqua" text run at (0,18) width 250: "background and a -10px bottom margin" - RenderText {#text} at (250,18) size 747x34 + RenderText {#text} at (250,18) size 747x35 text run at (250,18) width 8: ". " text run at (258,18) width 489: "Margins on inline elements does not affect line-height calculations, so all lines" - text run at (0,35) width 305: "in this element should have the same line-height." + text run at (0,36) width 305: "in this element should have the same line-height." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.png index 4582b4561f60..a9082f294fb5 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.txt index 9ad0efe666b4..ba483611fea4 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_inline-expected.txt @@ -1,21 +1,21 @@ -layer at (0,0) size 785x692 +layer at (0,0) size 785x714 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x692 - RenderBlock {HTML} at (0,0) size 785x692 - RenderBody {BODY} at (8,8) size 769x676 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x714 + RenderBlock {HTML} at (0,0) size 785x714 + RenderBody {BODY} at (8,8) size 769x698 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x45 + RenderBlock {PRE} at (0,34) size 769x45 RenderText {#text} at (0,0) size 360x45 text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" text run at (0,15) width 352: ".one {margin: 25px; background-color: aqua;}" text run at (0,30) width 360: ".two {margin: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,91) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,101) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,92) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,102) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,134) size 769x69 [bgcolor=#808080] + RenderBlock {P} at (0,136) size 769x72 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -28,16 +28,16 @@ layer at (0,0) size 785x692 RenderText {#text} at (673,0) size 752x35 text run at (673,0) width 79: ", giving it an" text run at (0,18) width 231: "aqua background and a 25px margin" - RenderText {#text} at (256,18) size 769x51 + RenderText {#text} at (256,18) size 769x53 text run at (256,18) width 8: ". " text run at (264,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,35) width 293: "this element should have the same line-height. " - text run at (293,35) width 473: "However, there should be a 25px margin to the left side of the inline box in" - text run at (0,52) width 727: "the first line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." - RenderBlock {P} at (0,219) size 769x17 [bgcolor=#C0C0C0] + text run at (0,36) width 293: "this element should have the same line-height. " + text run at (293,36) width 473: "However, there should be a 25px margin to the left side of the inline box in" + text run at (0,54) width 727: "the first line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." + RenderBlock {P} at (0,224) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,252) size 769x69 [bgcolor=#808080] + RenderBlock {P} at (0,258) size 769x72 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -50,31 +50,31 @@ layer at (0,0) size 785x692 RenderText {#text} at (638,0) size 751x35 text run at (638,0) width 113: ", giving it an aqua" text run at (0,18) width 202: "background and a -10px margin" - RenderText {#text} at (192,18) size 768x51 + RenderText {#text} at (192,18) size 768x53 text run at (192,18) width 8: ". " text run at (200,18) width 531: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,35) width 267: "element should have the same line-height. " - text run at (267,35) width 501: "However, there should be a -10px margin to the left side of the inline box in the" - text run at (0,52) width 709: "first line it appears, and a -10px margin to the right side of the inline element box in the last line where it appears." - RenderBlock {P} at (0,337) size 769x17 [bgcolor=#C0C0C0] + text run at (0,36) width 267: "element should have the same line-height. " + text run at (267,36) width 501: "However, there should be a -10px margin to the left side of the inline box in the" + text run at (0,54) width 709: "first line it appears, and a -10px margin to the right side of the inline element box in the last line where it appears." + RenderBlock {P} at (0,346) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderTable {TABLE} at (0,354) size 769x322 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x320 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,364) size 769x334 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x332 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x295 - RenderTableCell {TD} at (0,160) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x306 + RenderTableCell {TD} at (0,166) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x295 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 755x306 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x86 [bgcolor=#808080] + RenderBlock {P} at (4,38) size 747x90 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -87,17 +87,17 @@ layer at (0,0) size 785x692 RenderText {#text} at (673,0) size 733x35 text run at (673,0) width 60: ", giving it" text run at (0,18) width 250: "an aqua background and a 25px margin" - RenderText {#text} at (275,18) size 742x68 + RenderText {#text} at (275,18) size 742x71 text run at (275,18) width 8: ". " text run at (283,18) width 456: "Margins on inline elements does not affect line-height calculations, so all" - text run at (0,35) width 342: "lines in this element should have the same line-height. " - text run at (342,35) width 390: "However, there should be a 25px margin to the left side of the" - text run at (0,52) width 742: "inline box in the first line it appears, and a 25px margin to the right side of the inline element box in the last line where" - text run at (0,69) width 64: "it appears." - RenderBlock {P} at (4,139) size 747x17 [bgcolor=#C0C0C0] + text run at (0,36) width 342: "lines in this element should have the same line-height. " + text run at (342,36) width 390: "However, there should be a 25px margin to the left side of the" + text run at (0,54) width 742: "inline box in the first line it appears, and a 25px margin to the right side of the inline element box in the last line where" + text run at (0,72) width 64: "it appears." + RenderBlock {P} at (4,144) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,172) size 747x86 [bgcolor=#808080] + RenderBlock {P} at (4,178) size 747x90 [bgcolor=#808080] RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 393: "This element is unstyled save for a background color of gray.. " text run at (393,0) width 88: "It contains an " @@ -110,13 +110,13 @@ layer at (0,0) size 785x692 RenderText {#text} at (638,0) size 717x35 text run at (638,0) width 79: ", giving it an" text run at (0,18) width 236: "aqua background and a -10px margin" - RenderText {#text} at (226,18) size 739x68 + RenderText {#text} at (226,18) size 739x71 text run at (226,18) width 8: ". " text run at (234,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,35) width 293: "this element should have the same line-height. " - text run at (293,35) width 434: "However, there should be a -10px margin to the left side of the inline" - text run at (0,52) width 720: "box in the first line it appears, and a -10px margin to the right side of the inline element box in the last line where it" - text run at (0,69) width 52: "appears." - RenderBlock {P} at (4,274) size 747x17 [bgcolor=#C0C0C0] + text run at (0,36) width 293: "this element should have the same line-height. " + text run at (293,36) width 434: "However, there should be a -10px margin to the left side of the inline" + text run at (0,54) width 720: "box in the first line it appears, and a -10px margin to the right side of the inline element box in the last line where it" + text run at (0,72) width 52: "appears." + RenderBlock {P} at (4,284) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.png index 86796c2ce760..15cd74d4bde2 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.txt index d51924cfad4a..c6e394afd0ca 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_left-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x972 +layer at (0,0) size 785x1005 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x972 - RenderBlock {HTML} at (0,0) size 785x972 - RenderBody {BODY} at (8,8) size 769x956 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1005 + RenderBlock {HTML} at (0,0) size 785x1005 + RenderBody {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 408x90 text run at (0,0) width 392: ".zero {background-color: silver; margin-left: 0;}" text run at (0,15) width 400: ".one {margin-left: 0.5in; background-color: aqua;}" @@ -14,101 +14,101 @@ layer at (0,0) size 785x972 text run at (0,45) width 400: ".three {margin-left: 5em; background-color: aqua;}" text run at (0,60) width 392: ".four {margin-left: 25%; background-color: aqua;}" text run at (0,75) width 408: ".five {margin-left: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (48,187) size 721x17 [bgcolor=#00FFFF] + RenderBlock {P} at (48,189) size 721x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 348x17 text run at (0,0) width 348: "This sentence should have a left margin of half an inch." - RenderBlock {P} at (25,220) size 744x17 [bgcolor=#00FFFF] + RenderBlock {P} at (25,223) size 744x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 331x17 text run at (0,0) width 331: "This sentence should have a left margin of 25 pixels." - RenderBlock {P} at (80,253) size 689x17 [bgcolor=#00FFFF] + RenderBlock {P} at (80,257) size 689x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 305x17 text run at (0,0) width 305: "This sentence should have a left margin of 5 em." - RenderBlock {P} at (192,286) size 577x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 546x34 + RenderBlock {P} at (192,291) size 577x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 546x35 text run at (0,0) width 546: "This sentence should have a left margin of 25%, which is calculated with respect to the" - text run at (0,17) width 176: "width of the parent element." - RenderBlock {UL} at (25,336) size 744x85 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 704x17 + text run at (0,18) width 176: "width of the parent element." + RenderBlock {UL} at (25,343) size 744x90 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 704x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 686x17 text run at (0,0) width 686: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." - RenderListItem {LI} at (65,17) size 679x51 [bgcolor=#FFFFFF] + RenderListItem {LI} at (65,18) size 679x54 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 668x51 + RenderText {#text} at (0,0) size 668x53 text run at (0,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 (0,17) width 60: "checked. " - text run at (60,17) width 608: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin" - text run at (0,34) width 479: "to make 50 pixels of margin, and its background color has been set to white." - RenderListItem {LI} at (40,68) size 704x17 + text run at (0,18) width 60: "checked. " + text run at (60,18) width 608: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin" + text run at (0,36) width 479: "to make 50 pixels of margin, and its background color has been set to white." + RenderListItem {LI} at (40,72) size 704x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "This is an unclassed list item" - RenderBlock {P} at (0,437) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,449) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (-10,470) size 779x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 778x51 + RenderBlock {P} at (-10,483) size 779x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 778x53 text run at (0,0) width 758: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,17) width 114: "blue background. " - text run at (114,17) width 386: "In all other respects, however, the element should be normal. " - text run at (500,17) width 278: "No styles have been applied to it besides the" - text run at (0,34) width 294: "negative left margin and the background color." - RenderTable {TABLE} at (0,537) size 769x419 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x417 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 114: "blue background. " + text run at (114,18) width 386: "In all other respects, however, the element should be normal. " + text run at (500,18) width 278: "No styles have been applied to it besides the" + text run at (0,36) width 294: "negative left margin and the background color." + RenderTable {TABLE} at (0,553) size 769x436 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x434 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x392 - RenderTableCell {TD} at (0,208) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x392 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 767x408 + RenderTableCell {TD} at (0,217) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (52,37) size 699x17 [bgcolor=#00FFFF] + RenderBlock {P} at (52,38) size 699x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 348x17 text run at (0,0) width 348: "This sentence should have a left margin of half an inch." - RenderBlock {P} at (29,70) size 722x17 [bgcolor=#00FFFF] + RenderBlock {P} at (29,72) size 722x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 331x17 text run at (0,0) width 331: "This sentence should have a left margin of 25 pixels." - RenderBlock {P} at (84,103) size 667x17 [bgcolor=#00FFFF] + RenderBlock {P} at (84,106) size 667x18 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 305x17 text run at (0,0) width 305: "This sentence should have a left margin of 5 em." - RenderBlock {P} at (190,136) size 561x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 546x34 + RenderBlock {P} at (190,140) size 561x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 546x35 text run at (0,0) width 546: "This sentence should have a left margin of 25%, which is calculated with respect to the" - text run at (0,17) width 176: "width of the parent element." - RenderBlock {UL} at (29,186) size 722x102 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 682x34 + text run at (0,18) width 176: "width of the parent element." + RenderBlock {UL} at (29,192) size 722x108 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 682x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 650x34 + RenderText {#text} at (0,0) size 650x35 text run at (0,0) width 650: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to" - text run at (0,17) width 32: "gray." - RenderListItem {LI} at (65,34) size 657x51 [bgcolor=#FFFFFF] + text run at (0,18) width 32: "gray." + RenderListItem {LI} at (65,36) size 657x54 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 656x51 + RenderText {#text} at (0,0) size 656x53 text run at (0,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 (0,17) width 60: "checked. " - text run at (60,17) width 560: "This list item has its left margin also set to 25 pixels, which should combine with the list's" - text run at (0,34) width 527: "margin to make 50 pixels of margin, and its background color has been set to white." - RenderListItem {LI} at (40,85) size 682x17 + text run at (0,18) width 60: "checked. " + text run at (60,18) width 560: "This list item has its left margin also set to 25 pixels, which should combine with the list's" + text run at (0,36) width 527: "margin to make 50 pixels of margin, and its background color has been set to white." + RenderListItem {LI} at (40,90) size 682x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "This is an unclassed list item" - RenderBlock {P} at (4,304) size 747x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,316) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (-6,337) size 757x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 737x51 + RenderBlock {P} at (-6,350) size 757x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 737x53 text run at (0,0) width 726: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" - text run at (0,17) width 146: "light blue background. " - text run at (146,17) width 386: "In all other respects, however, the element should be normal. " - text run at (532,17) width 205: "No styles have been applied to it" - text run at (0,34) width 367: "besides the negative left margin and the background color." + text run at (0,18) width 146: "light blue background. " + text run at (146,18) width 386: "In all other respects, however, the element should be normal. " + text run at (532,18) width 205: "No styles have been applied to it" + text run at (0,36) width 367: "besides the negative left margin and the background color." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.png index 32d87ef0ff5e..6e2e6b0253ff 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.txt index 86a711980679..9375ead07416 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_left_inline-expected.txt @@ -3,15 +3,15 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x30 + RenderBlock {PRE} at (0,34) size 784x30 RenderText {#text} at (0,0) size 400x30 text run at (0,0) width 392: ".one {margin-left: 25px; background-color: aqua;}" text run at (0,15) width 400: ".two {margin-left: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,76) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 784x35 [bgcolor=#808080] + RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 784x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -29,7 +29,7 @@ layer at (0,0) size 800x600 text run at (299,18) width 27: "first" RenderText {#text} at (326,18) size 232x17 text run at (326,18) width 232: " line in which the inline box appears." - RenderBlock {P} at (0,145) size 784x35 [bgcolor=#808080] + RenderBlock {P} at (0,147) size 784x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -47,19 +47,19 @@ layer at (0,0) size 800x600 text run at (284,18) width 27: "first" RenderText {#text} at (311,18) size 232x17 text run at (311,18) width 232: " line in which the inline box appears." - RenderTable {TABLE} at (0,196) size 784x121 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x119 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,199) size 784x124 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x122 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x94 - RenderTableCell {TD} at (0,59) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x35 [bgcolor=#808080] + RenderTableRow {TR} at (0,26) size 782x96 + RenderTableCell {TD} at (0,61) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -77,7 +77,7 @@ layer at (0,0) size 800x600 text run at (342,18) width 27: "first" RenderText {#text} at (369,18) size 232x17 text run at (369,18) width 232: " line in which the inline box appears." - RenderBlock {P} at (4,55) size 762x35 [bgcolor=#808080] + RenderBlock {P} at (4,56) size 762x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.png index c8c842e5bea8..77eb066dcf65 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.png differ 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 7fce7f1fb72c..cb97dd929646 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_right-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 787x972 +layer at (0,0) size 787x1005 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x972 - RenderBlock {HTML} at (0,0) size 785x972 - RenderBody {BODY} at (8,8) size 769x956 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1005 + RenderBlock {HTML} at (0,0) size 785x1005 + RenderBody {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 560x90 text run at (0,0) width 552: ".zero {background-color: silver; margin-right: 0; text-align: right;}" text run at (0,15) width 560: ".one {margin-right: 0.5in; text-align: right; background-color: aqua;}" @@ -14,101 +14,101 @@ layer at (0,0) size 785x972 text run at (0,45) width 560: ".three {margin-right: 5em; text-align: right; background-color: aqua;}" text run at (0,60) width 552: ".four {margin-right: 25%; text-align: right; background-color: aqua;}" text run at (0,75) width 416: ".five {margin-right: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (566,0) size 203x17 text run at (566,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,187) size 721x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,189) size 721x18 [bgcolor=#00FFFF] RenderText {#text} at (364,0) size 357x17 text run at (364,0) width 357: "This sentence should have a right margin of half an inch." - RenderBlock {P} at (0,220) size 744x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,223) size 744x18 [bgcolor=#00FFFF] RenderText {#text} at (404,0) size 340x17 text run at (404,0) width 340: "This sentence should have a right margin of 25 pixels." - RenderBlock {P} at (0,253) size 689x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,257) size 689x18 [bgcolor=#00FFFF] RenderText {#text} at (375,0) size 314x17 text run at (375,0) width 314: "This sentence should have a right margin of 5 em." - RenderBlock {P} at (0,286) size 577x34 [bgcolor=#00FFFF] - RenderText {#text} at (21,0) size 556x34 + RenderBlock {P} at (0,291) size 577x36 [bgcolor=#00FFFF] + RenderText {#text} at (21,0) size 556x35 text run at (21,0) width 556: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (400,17) width 177: "width of the parent element." - RenderBlock {UL} at (0,336) size 744x85 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 704x17 + text run at (400,18) width 177: "width of the parent element." + RenderBlock {UL} at (0,343) size 744x90 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 704x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (4,0) size 700x17 text run at (4,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,17) size 679x51 [bgcolor=#FFFFFF] + RenderListItem {LI} at (40,18) size 679x54 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (23,0) size 677x51 + RenderText {#text} at (23,0) size 677x53 text run at (23,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 (2,17) width 60: "checked. " - text run at (62,17) width 617: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin" - text run at (199,34) width 480: "to make 50 pixels of margin, and its background-color has been set to white." - RenderListItem {LI} at (40,68) size 704x17 + text run at (2,18) width 60: "checked. " + text run at (62,18) width 617: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin" + text run at (199,36) width 480: "to make 50 pixels of margin, and its background-color has been set to white." + RenderListItem {LI} at (40,72) size 704x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (525,0) size 179x17 text run at (525,0) width 179: "This is an unclassed list item" - RenderBlock {P} at (0,437) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,449) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (566,0) size 203x17 text run at (566,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,470) size 779x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 778x51 + RenderBlock {P} at (0,483) size 779x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 778x53 text run at (0,0) width 767: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,17) width 114: "blue background. " - text run at (114,17) width 386: "In all other respects, however, the element should be normal. " - text run at (500,17) width 278: "No styles have been applied to it besides the" - text run at (0,34) width 303: "negative right margin and the background color." - RenderTable {TABLE} at (0,537) size 769x419 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x417 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 114: "blue background. " + text run at (114,18) width 386: "In all other respects, however, the element should be normal. " + text run at (500,18) width 278: "No styles have been applied to it besides the" + text run at (0,36) width 303: "negative right margin and the background color." + RenderTable {TABLE} at (0,553) size 769x436 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x434 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x392 - RenderTableCell {TD} at (0,208) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x392 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 767x408 + RenderTableCell {TD} at (0,217) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (544,0) size 203x17 text run at (544,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 699x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,38) size 699x18 [bgcolor=#00FFFF] RenderText {#text} at (342,0) size 357x17 text run at (342,0) width 357: "This sentence should have a right margin of half an inch." - RenderBlock {P} at (4,70) size 722x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,72) size 722x18 [bgcolor=#00FFFF] RenderText {#text} at (382,0) size 340x17 text run at (382,0) width 340: "This sentence should have a right margin of 25 pixels." - RenderBlock {P} at (4,103) size 667x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,106) size 667x18 [bgcolor=#00FFFF] RenderText {#text} at (353,0) size 314x17 text run at (353,0) width 314: "This sentence should have a right margin of 5 em." - RenderBlock {P} at (4,136) size 561x34 [bgcolor=#00FFFF] - RenderText {#text} at (5,0) size 556x34 + RenderBlock {P} at (4,140) size 561x36 [bgcolor=#00FFFF] + RenderText {#text} at (5,0) size 556x35 text run at (5,0) width 556: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (384,17) width 177: "width of the parent element." - RenderBlock {UL} at (4,186) size 722x102 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 682x34 + text run at (384,18) width 177: "width of the parent element." + RenderBlock {UL} at (4,192) size 722x108 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 682x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (18,0) size 664x34 + RenderText {#text} at (18,0) size 664x35 text run at (18,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 (650,17) width 32: "gray." - RenderListItem {LI} at (40,34) size 657x51 [bgcolor=#FFFFFF] + text run at (650,18) width 32: "gray." + RenderListItem {LI} at (40,36) size 657x54 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (1,0) size 656x51 + RenderText {#text} at (1,0) size 656x53 text run at (1,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 (28,17) width 60: "checked. " - text run at (88,17) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's" - text run at (129,34) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white." - RenderListItem {LI} at (40,85) size 682x17 + text run at (28,18) width 60: "checked. " + text run at (88,18) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's" + text run at (129,36) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white." + RenderListItem {LI} at (40,90) size 682x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (503,0) size 179x17 text run at (503,0) width 179: "This is an unclassed list item" - RenderBlock {P} at (4,304) size 747x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,316) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (544,0) size 203x17 text run at (544,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,337) size 757x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 737x51 + RenderBlock {P} at (4,350) size 757x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 737x53 text run at (0,0) width 735: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" - text run at (0,17) width 146: "light blue background. " - text run at (146,17) width 386: "In all other respects, however, the element should be normal. " - text run at (532,17) width 205: "No styles have been applied to it" - text run at (0,34) width 376: "besides the negative right margin and the background color." + text run at (0,18) width 146: "light blue background. " + text run at (146,18) width 386: "In all other respects, however, the element should be normal. " + text run at (532,18) width 205: "No styles have been applied to it" + text run at (0,36) width 376: "besides the negative right margin and the background color." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.png index fbfdce412bff..87e937d46323 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.txt index b0d82a98c2d6..de6b61f6f88e 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_right_inline-expected.txt @@ -3,15 +3,15 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x30 + RenderBlock {PRE} at (0,34) size 784x30 RenderText {#text} at (0,0) size 552x30 text run at (0,0) width 552: ".one {margin-right: 25px; text-align: right; background-color: aqua;}" text run at (0,15) width 408: ".two {margin-right: -10px; background-color: aqua;}" - RenderBlock {HR} at (0,76) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 784x35 [bgcolor=#808080] + RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 784x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -29,7 +29,7 @@ layer at (0,0) size 800x600 text run at (308,18) width 23: "last" RenderText {#text} at (331,18) size 232x17 text run at (331,18) width 232: " line in which the inline box appears." - RenderBlock {P} at (0,145) size 784x35 [bgcolor=#808080] + RenderBlock {P} at (0,147) size 784x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -47,19 +47,19 @@ layer at (0,0) size 800x600 text run at (293,18) width 23: "last" RenderText {#text} at (316,18) size 232x17 text run at (316,18) width 232: " line in which the inline box appears." - RenderTable {TABLE} at (0,196) size 784x121 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x119 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,199) size 784x124 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x122 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x94 - RenderTableCell {TD} at (0,59) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x35 [bgcolor=#808080] + RenderTableRow {TR} at (0,26) size 782x96 + RenderTableCell {TD} at (0,61) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -77,7 +77,7 @@ layer at (0,0) size 800x600 text run at (351,18) width 23: "last" RenderText {#text} at (374,18) size 232x17 text run at (374,18) width 232: " line in which the inline box appears." - RenderBlock {P} at (4,55) size 762x35 [bgcolor=#808080] + RenderBlock {P} at (4,56) size 762x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.png index 7514e11d07e5..37564d0196d1 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.txt index 3491d1b9c741..cf5bfe266d09 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_top-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1601 +layer at (0,0) size 785x1639 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1601 - RenderBlock {HTML} at (0,0) size 785x1601 - RenderBody {BODY} at (8,8) size 769x1585 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1639 + RenderBlock {HTML} at (0,0) size 785x1639 + RenderBody {BODY} at (8,8) size 769x1623 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,30) size 769x120 + RenderBlock {PRE} at (0,31) size 769x120 RenderText {#text} at (0,0) size 392x120 text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" text run at (0,15) width 392: ".one {margin-top: 0.5in; background-color: aqua;}" @@ -16,114 +16,114 @@ layer at (0,0) size 785x1601 text run at (0,75) width 200: ".five {margin-top: 25px;}" text run at (0,90) width 392: ".six {margin-top: -10px; background-color: aqua;}" text run at (0,105) width 200: "P, UL {margin-bottom: 0;}" - RenderBlock {HR} at (0,163) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,173) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,164) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,174) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,190) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,192) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This element also has a class of zero." - RenderBlock {P} at (0,255) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 759x34 + RenderBlock {P} at (0,258) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 759x35 text run at (0,0) width 759: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin" - text run at (0,17) width 155: "isn't applied to each line." - RenderBlock {P} at (0,314) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 742x34 + text run at (0,18) width 155: "isn't applied to each line." + RenderBlock {P} at (0,319) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 742x35 text run at (0,0) width 742: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,17) width 155: "isn't applied to each line." - RenderBlock {P} at (0,428) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 745x34 + text run at (0,18) width 155: "isn't applied to each line." + RenderBlock {P} at (0,435) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,17) width 126: "applied to each line." - RenderBlock {P} at (0,654) size 769x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 753x34 + text run at (0,18) width 126: "applied to each line." + RenderBlock {P} at (0,663) size 769x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 753x35 text run at (0,0) width 725: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " text run at (725,0) width 28: "This" - text run at (0,17) width 232: "will require extra text in order to test." - RenderBlock {UL} at (0,713) size 769x94 [bgcolor=#00FFFF] - RenderListItem {LI} at (40,0) size 729x17 + text run at (0,18) width 232: "will require extra text in order to test." + RenderBlock {UL} at (0,724) size 769x98 [bgcolor=#00FFFF] + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 400x17 text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "Therefore, it ought to have such a margin." - RenderListItem {LI} at (40,59) size 729x17 + RenderListItem {LI} at (40,61) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 567x17 text run at (0,0) width 567: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - RenderListItem {LI} at (40,76) size 729x17 + RenderListItem {LI} at (40,79) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: "This list item has no special styles applied to it." - RenderBlock {P} at (0,806) size 769x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (0,821) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,813) size 769x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 766x51 + RenderBlock {P} at (0,829) size 769x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 766x53 text run at (0,0) width 766: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin." - text run at (0,17) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (488,17) width 267: "In all other respects, the element should be" - text run at (0,34) width 48: "normal." - RenderTable {TABLE} at (0,864) size 769x721 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x719 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 488: "No other styles have been applied to it besides a light blue background color. " + text run at (488,18) width 267: "In all other respects, the element should be" + text run at (0,36) width 48: "normal." + RenderTable {TABLE} at (0,883) size 769x740 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x738 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x694 - RenderTableCell {TD} at (0,359) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 4x18 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x694 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 767x712 + RenderTableCell {TD} at (0,368) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x712 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,21) size 747x17 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,22) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This element also has a class of zero." - RenderBlock {P} at (4,86) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 711x34 + RenderBlock {P} at (4,88) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 711x35 text run at (0,0) width 711: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,17) width 203: "margin isn't applied to each line." - RenderBlock {P} at (4,145) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 742x34 + text run at (0,18) width 203: "margin isn't applied to each line." + RenderBlock {P} at (4,149) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 742x35 text run at (0,0) width 742: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,17) width 155: "isn't applied to each line." - RenderBlock {P} at (4,259) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 745x34 + text run at (0,18) width 155: "isn't applied to each line." + RenderBlock {P} at (4,265) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,17) width 126: "applied to each line." - RenderBlock {P} at (4,479) size 747x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 721x34 + text run at (0,18) width 126: "applied to each line." + RenderBlock {P} at (4,487) size 747x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 721x35 text run at (0,0) width 721: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element." - text run at (0,17) width 264: "This will require extra text in order to test." - RenderBlock {UL} at (4,538) size 747x94 [bgcolor=#00FFFF] - RenderListItem {LI} at (40,0) size 707x17 + text run at (0,18) width 264: "This will require extra text in order to test." + RenderBlock {UL} at (4,548) size 747x98 [bgcolor=#00FFFF] + RenderListItem {LI} at (40,0) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 400x17 text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background." - RenderListItem {LI} at (40,17) size 707x17 + RenderListItem {LI} at (40,18) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "Therefore, it ought to have such a margin." - RenderListItem {LI} at (40,59) size 707x17 + RenderListItem {LI} at (40,61) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 567x17 text run at (0,0) width 567: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - RenderListItem {LI} at (40,76) size 707x17 + RenderListItem {LI} at (40,79) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: "This list item has no special styles applied to it." - RenderBlock {P} at (4,631) size 747x18 [bgcolor=#C0C0C0] + RenderBlock {P} at (4,645) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,638) size 747x52 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 742x51 + RenderBlock {P} at (4,653) size 747x55 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 742x53 text run at (0,0) width 714: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom" - text run at (0,17) width 52: "margin. " - text run at (52,17) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (540,17) width 202: "In all other respects, the element" - text run at (0,34) width 113: "should be normal." + text run at (0,18) width 52: "margin. " + text run at (52,18) width 488: "No other styles have been applied to it besides a light blue background color. " + text run at (540,18) width 202: "In all other respects, the element" + text run at (0,36) width 113: "should be normal." diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.png index e7dad92d21b8..2707b88925cb 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.txt index 077c82752dc7..ae1c325d7373 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/margin_top_inline-expected.txt @@ -3,17 +3,17 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 392x60 text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" text run at (0,15) width 384: ".one {margin-top: 25px; background-color: aqua;}" text run at (0,30) width 392: ".two {margin-top: -10px; background-color: aqua;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x52 [bgcolor=#808080] + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -26,11 +26,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 221: "background and a 25px top margin" - RenderText {#text} at (221,18) size 747x34 + RenderText {#text} at (221,18) size 747x35 text run at (221,18) width 8: ". " text run at (229,18) width 518: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,35) width 263: "element should have the same line-height." - RenderBlock {P} at (0,192) size 784x52 [bgcolor=#808080] + text run at (0,36) width 263: "element should have the same line-height." + RenderBlock {P} at (0,195) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -43,23 +43,23 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 754x35 text run at (644,0) width 110: ", giving the inline" text run at (0,18) width 332: "element an aqua background and a -10px top margin" - RenderText {#text} at (332,18) size 783x34 + RenderText {#text} at (332,18) size 783x35 text run at (332,18) width 8: ". " text run at (340,18) width 443: "Margins on inline elements do not affect line-height calculations, so all" - text run at (0,35) width 338: "lines in this element should have the same line-height." - RenderTable {TABLE} at (0,260) size 784x155 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x153 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,36) width 338: "lines in this element should have the same line-height." + RenderTable {TABLE} at (0,265) size 784x160 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x158 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x128 - RenderTableCell {TD} at (0,76) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x128 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x52 [bgcolor=#808080] + RenderTableRow {TR} at (0,26) size 782x132 + RenderTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -72,11 +72,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 221: "background and a 25px top margin" - RenderText {#text} at (221,18) size 747x34 + RenderText {#text} at (221,18) size 747x35 text run at (221,18) width 8: ". " text run at (229,18) width 518: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,35) width 263: "element should have the same line-height." - RenderBlock {P} at (4,72) size 762x52 [bgcolor=#808080] + text run at (0,36) width 263: "element should have the same line-height." + RenderBlock {P} at (4,74) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -89,7 +89,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 754x35 text run at (644,0) width 110: ", giving the inline" text run at (0,18) width 332: "element an aqua background and a -10px top margin" - RenderText {#text} at (332,18) size 746x34 + RenderText {#text} at (332,18) size 746x35 text run at (332,18) width 8: ". " text run at (340,18) width 406: "Margins on inline elements do not affect line-height calculations," - text run at (0,35) width 375: "so all lines in this element should have the same line-height." + text run at (0,36) width 375: "so all lines in this element should have the same line-height." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding-expected.png index 3d97f5f679b0..2396712a5954 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding-expected.txt index ce312722d32b..0f31c4c842f4 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x2193 +layer at (0,0) size 785x2221 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2193 - RenderBlock {HTML} at (0,0) size 785x2193 - RenderBody {BODY} at (8,8) size 769x2177 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2221 + RenderBlock {HTML} at (0,0) size 785x2221 + RenderBody {BODY} at (8,8) size 769x2205 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 376x90 text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" text run at (0,15) width 368: ".one {padding: 0.5in; background-color: aqua;}" @@ -14,74 +14,74 @@ layer at (0,0) size 785x2193 text run at (0,45) width 368: ".three {padding: 5em; background-color: aqua;}" text run at (0,60) width 360: ".four {padding: 25%; background-color: aqua;}" text run at (0,75) width 376: ".five {padding: -20px; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,187) size 769x130 [bgcolor=#00FFFF] - RenderText {#text} at (48,48) size 660x34 + RenderBlock {P} at (0,189) size 769x132 [bgcolor=#00FFFF] + RenderText {#text} at (48,48) size 660x35 text run at (48,48) width 660: "This element should have an overall padding of half an inch, which will require extra text in order to test." - text run at (48,65) width 464: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,333) size 769x84 [bgcolor=#00FFFF] - RenderText {#text} at (25,25) size 701x34 + text run at (48,66) width 464: "Both the content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,337) size 769x86 [bgcolor=#00FFFF] + RenderText {#text} at (25,25) size 701x35 text run at (25,25) width 647: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " text run at (672,25) width 54: "Both the" - text run at (25,42) width 406: "content background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,433) size 769x194 [bgcolor=#00FFFF] - RenderText {#text} at (80,80) size 588x34 + text run at (25,43) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,439) size 769x196 [bgcolor=#00FFFF] + RenderText {#text} at (80,80) size 588x35 text run at (80,80) width 588: "This element should have an overall padding of 5 em, which will require extra text in order to" - text run at (80,97) width 29: "test. " - text run at (109,97) width 464: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,643) size 769x453 [bgcolor=#00FFFF] - RenderText {#text} at (192,192) size 380x68 + text run at (80,98) width 29: "test. " + text run at (109,98) width 464: "Both the content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,651) size 769x457 [bgcolor=#00FFFF] + RenderText {#text} at (192,192) size 380x71 text run at (192,192) width 380: "This element should have an overall padding of 25%, which" - text run at (192,209) width 377: "is calculated with respect to the width of the parent element." - text run at (192,226) width 354: "Both the content background and the padding should be" - text run at (192,243) width 108: "aqua (light blue)." - RenderBlock {P} at (0,1111) size 769x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 751x34 + text run at (192,210) width 377: "is calculated with respect to the width of the parent element." + text run at (192,228) width 354: "Both the content background and the padding should be" + text run at (192,246) width 108: "aqua (light blue)." + RenderBlock {P} at (0,1123) size 769x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 751x35 text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. " text run at (541,0) width 210: "Both the content background and" - text run at (0,17) width 298: "the normal padding should be aqua (light blue)." - RenderTable {TABLE} at (0,1161) size 769x1016 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1014 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 298: "the normal padding should be aqua (light blue)." + RenderTable {TABLE} at (0,1175) size 769x1030 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1028 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x989 - RenderTableCell {TD} at (0,506) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x1002 + RenderTableCell {TD} at (0,513) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x989 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 755x1002 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x130 [bgcolor=#00FFFF] - RenderText {#text} at (48,48) size 631x34 + RenderBlock {P} at (4,38) size 747x132 [bgcolor=#00FFFF] + RenderText {#text} at (48,48) size 631x35 text run at (48,48) width 631: "This element should have an overall padding of half an inch, which will require extra text in order to" - text run at (48,65) width 29: "test. " - text run at (77,65) width 464: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,183) size 747x84 [bgcolor=#00FFFF] - RenderText {#text} at (25,25) size 678x34 + text run at (48,66) width 29: "test. " + text run at (77,66) width 464: "Both the content background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,186) size 747x86 [bgcolor=#00FFFF] + RenderText {#text} at (25,25) size 678x35 text run at (25,25) width 647: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " text run at (672,25) width 31: "Both" - text run at (25,42) width 429: "the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,283) size 747x194 [bgcolor=#00FFFF] - RenderText {#text} at (80,80) size 572x34 + text run at (25,43) width 429: "the content background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,288) size 747x196 [bgcolor=#00FFFF] + RenderText {#text} at (80,80) size 572x35 text run at (80,80) width 572: "This element should have an overall padding of 5 em, which will require extra text in order" - text run at (80,97) width 45: "to test. " - text run at (125,97) width 464: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,493) size 747x442 [bgcolor=#00FFFF] - RenderText {#text} at (186,187) size 363x68 + text run at (80,98) width 45: "to test. " + text run at (125,98) width 464: "Both the content background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,500) size 747x446 [bgcolor=#00FFFF] + RenderText {#text} at (186,187) size 363x71 text run at (186,187) width 337: "This element should have an overall padding of 25%," - text run at (186,204) width 363: "which is calculated with respect to the width of the parent" - text run at (186,221) width 58: "element. " - text run at (243,221) width 289: "Both the content background and the padding" - text run at (186,238) width 173: "should be aqua (light blue)." - RenderBlock {P} at (4,950) size 747x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 724x34 + text run at (186,205) width 363: "which is calculated with respect to the width of the parent" + text run at (186,223) width 58: "element. " + text run at (243,223) width 289: "Both the content background and the padding" + text run at (186,241) width 173: "should be aqua (light blue)." + RenderBlock {P} at (4,961) size 747x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 724x35 text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. " text run at (541,0) width 183: "Both the content background" - text run at (0,17) width 325: "and the normal padding should be aqua (light blue)." + text run at (0,18) width 325: "and the normal padding should be aqua (light blue)." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.png index 5fdfe008a4be..e9fe6bc655ce 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.txt index 2b8a8089111c..efd34d5e73e3 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1523 +layer at (0,0) size 785x1550 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1523 - RenderBlock {HTML} at (0,0) size 785x1523 - RenderBody {BODY} at (8,8) size 769x1507 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1550 + RenderBlock {HTML} at (0,0) size 785x1550 + RenderBody {BODY} at (8,8) size 769x1534 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 432x90 text run at (0,0) width 416: ".zero {background-color: silver; padding-bottom: 0;}" text run at (0,15) width 424: ".one {padding-bottom: 0.5in; background-color: aqua;}" @@ -14,80 +14,80 @@ layer at (0,0) size 785x1523 text run at (0,45) width 424: ".three {padding-bottom: 5em; background-color: aqua;}" text run at (0,60) width 416: ".four {padding-bottom: 25%; background-color: aqua;}" text run at (0,75) width 432: ".five {padding-bottom: -20px; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,187) size 769x82 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 761x34 + RenderBlock {P} at (0,189) size 769x84 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 761x35 text run at (0,0) width 657: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " text run at (657,0) width 104: "Both the content" - text run at (0,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,285) size 769x59 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 744x34 + text run at (0,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,289) size 769x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 744x35 text run at (0,0) width 640: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " text run at (640,0) width 104: "Both the content" - text run at (0,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,360) size 769x114 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 718x34 + text run at (0,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,366) size 769x116 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 718x35 text run at (0,0) width 614: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " text run at (614,0) width 104: "Both the content" - text run at (0,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,490) size 769x227 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 752x34 + text run at (0,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,498) size 769x229 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 752x35 text run at (0,0) width 752: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,17) width 268: "This will require extra text in order to test. " - text run at (268,17) width 464: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,732) size 769x18 [bgcolor=#C0C0C0] + text run at (0,18) width 268: "This will require extra text in order to test. " + text run at (268,18) width 464: "Both the content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,742) size 769x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,765) size 769x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 693x34 + RenderBlock {P} at (0,776) size 769x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 693x35 text run at (0,0) width 589: "This element should have no bottom padding, since negative padding values are not allowed. " text run at (589,0) width 104: "Both the content" - text run at (0,17) width 404: "background and the normal padding should be aqua (light blue)." - RenderTable {TABLE} at (0,815) size 769x692 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x690 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 404: "background and the normal padding should be aqua (light blue)." + RenderTable {TABLE} at (0,828) size 769x706 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x704 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x665 - RenderTableCell {TD} at (0,344) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x678 + RenderTableCell {TD} at (0,351) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x665 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 755x678 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x82 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 711x34 + RenderBlock {P} at (4,38) size 747x84 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 711x35 text run at (0,0) width 657: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " text run at (657,0) width 54: "Both the" - text run at (0,17) width 406: "content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,135) size 747x59 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 744x34 + text run at (0,18) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,138) size 747x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 744x35 text run at (0,0) width 640: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " text run at (640,0) width 104: "Both the content" - text run at (0,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,210) size 747x114 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 718x34 + text run at (0,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,215) size 747x116 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 718x35 text run at (0,0) width 614: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " text run at (614,0) width 104: "Both the content" - text run at (0,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,340) size 747x238 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 712x51 + text run at (0,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,347) size 747x241 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 712x53 text run at (0,0) width 695: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent" - text run at (0,17) width 57: "element. " - text run at (57,17) width 268: "This will require extra text in order to test. " - text run at (325,17) width 387: "Both the content background and the padding should be aqua" - text run at (0,34) width 73: "(light blue)." - RenderBlock {P} at (4,593) size 747x18 [bgcolor=#C0C0C0] + text run at (0,18) width 57: "element. " + text run at (57,18) width 268: "This will require extra text in order to test. " + text run at (325,18) width 387: "Both the content background and the padding should be aqua" + text run at (0,36) width 73: "(light blue)." + RenderBlock {P} at (4,603) size 747x19 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,626) size 747x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 693x34 + RenderBlock {P} at (4,637) size 747x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 693x35 text run at (0,0) width 589: "This element should have no bottom padding, since negative padding values are not allowed. " text run at (589,0) width 104: "Both the content" - text run at (0,17) width 404: "background and the normal padding should be aqua (light blue)." + text run at (0,18) width 404: "background and the normal padding should be aqua (light blue)." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.png index f771d79bc710..6adde07b8d56 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.txt index 350d7b7c2c35..a9c36267fbd8 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_bottom_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 424x45 text run at (0,0) width 416: ".one {padding-bottom: 25px; background-color: aqua;}" text run at (0,15) width 424: ".two {padding-bottom: -10px; background-color: aqua;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x69 [bgcolor=#808080] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x72 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -25,13 +25,13 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 252: "background and a 25px bottom padding" - RenderText {#text} at (252,18) size 781x51 + RenderText {#text} at (252,18) size 781x53 text run at (252,18) width 8: ". " text run at (260,18) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in" - text run at (0,35) width 293: "this element should have the same line-height. " - text run at (293,35) width 488: "There may be implementation-specific limits on how much of the padding the" - text run at (0,52) width 177: "user agent is able to display." - RenderBlock {P} at (0,194) size 784x52 [bgcolor=#808080] + text run at (0,36) width 293: "this element should have the same line-height. " + text run at (293,36) width 488: "There may be implementation-specific limits on how much of the padding the" + text run at (0,54) width 177: "user agent is able to display." + RenderBlock {P} at (0,198) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -44,23 +44,23 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 522: "background and no bottom padding, since negative padding values are not allowed" - RenderText {#text} at (522,18) size 757x34 + RenderText {#text} at (522,18) size 757x35 text run at (522,18) width 8: ". " text run at (530,18) width 227: "Padding on inline elements does not" - text run at (0,35) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." - RenderTable {TABLE} at (0,262) size 784x172 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x170 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,36) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." + RenderTable {TABLE} at (0,268) size 784x178 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x176 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x145 - RenderTableCell {TD} at (0,85) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x150 + RenderTableCell {TD} at (0,88) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x145 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x69 [bgcolor=#808080] + RenderTableCell {TD} at (12,26) size 770x150 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x72 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -73,13 +73,13 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 252: "background and a 25px bottom padding" - RenderText {#text} at (252,18) size 749x51 + RenderText {#text} at (252,18) size 749x53 text run at (252,18) width 8: ". " text run at (260,18) width 489: "Padding on inline elements does not affect line-height calculations, so all lines" - text run at (0,35) width 309: "in this element should have the same line-height. " - text run at (309,35) width 410: "There may be implementation-specific limits on how much of the" - text run at (0,52) width 255: "padding the user agent is able to display." - RenderBlock {P} at (4,89) size 762x52 [bgcolor=#808080] + text run at (0,36) width 309: "in this element should have the same line-height. " + text run at (309,36) width 410: "There may be implementation-specific limits on how much of the" + text run at (0,54) width 255: "padding the user agent is able to display." + RenderBlock {P} at (4,92) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -92,7 +92,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 522: "background and no bottom padding, since negative padding values are not allowed" - RenderText {#text} at (522,18) size 757x34 + RenderText {#text} at (522,18) size 757x35 text run at (522,18) width 8: ". " text run at (530,18) width 227: "Padding on inline elements does not" - text run at (0,35) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." + text run at (0,36) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.png index 410c81aa8d9a..6f2b114d9e01 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.txt index 95ecafeba0e9..96d7e2fb4154 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_inline-expected.txt @@ -1,22 +1,22 @@ -layer at (0,0) size 785x731 +layer at (0,0) size 785x753 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x731 - RenderBlock {HTML} at (0,0) size 785x731 - RenderBody {BODY} at (8,8) size 769x715 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x753 + RenderBlock {HTML} at (0,0) size 785x753 + RenderBody {BODY} at (8,8) size 769x737 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 368x60 text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" text run at (0,15) width 360: ".one {padding: 25px; background-color: aqua;}" text run at (0,30) width 368: ".two {padding: -10px; background-color: aqua;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,157) size 769x103 [bgcolor=#808080] + RenderBlock {P} at (0,159) size 769x108 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -29,19 +29,19 @@ layer at (0,0) size 785x731 RenderText {#text} at (669,0) size 748x35 text run at (669,0) width 79: ", giving it an" text run at (0,18) width 238: "aqua background and a 25px padding" - RenderText {#text} at (263,18) size 765x85 + RenderText {#text} at (263,18) size 765x89 text run at (263,18) width 8: ". " text run at (271,18) width 489: "Padding on inline elements does not affect line-height calculations, so all lines" - text run at (0,35) width 309: "in this element should have the same line-height. " - text run at (309,35) width 410: "There may be implementation-specific limits on how much of the" - text run at (0,52) width 431: "padding the user agent is able to display above and below each line. " - text run at (431,52) width 334: "However, there should be at least 25px of padding to" - text run at (0,69) width 753: "the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline element box in" - text run at (0,86) width 182: "the last line where it appears." - RenderBlock {P} at (0,276) size 769x17 [bgcolor=#C0C0C0] + text run at (0,36) width 309: "in this element should have the same line-height. " + text run at (309,36) width 410: "There may be implementation-specific limits on how much of the" + text run at (0,54) width 431: "padding the user agent is able to display above and below each line. " + text run at (431,54) width 334: "However, there should be at least 25px of padding to" + text run at (0,72) width 753: "the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline element box in" + text run at (0,90) width 182: "the last line where it appears." + RenderBlock {P} at (0,283) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,309) size 769x52 [bgcolor=#808080] + RenderBlock {P} at (0,317) size 769x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -54,29 +54,29 @@ layer at (0,0) size 785x731 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 474: "background and no padding, since negative padding values are not allowed" - RenderText {#text} at (474,18) size 748x34 + RenderText {#text} at (474,18) size 748x35 text run at (474,18) width 8: ". " text run at (482,18) width 266: "Padding on inline elements does not affect" - text run at (0,35) width 528: "line-height calculations, so all lines in this element should have the same line-height." - RenderBlock {P} at (0,377) size 769x17 [bgcolor=#C0C0C0] + text run at (0,36) width 528: "line-height calculations, so all lines in this element should have the same line-height." + RenderBlock {P} at (0,387) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderTable {TABLE} at (0,410) size 769x305 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x303 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,421) size 769x316 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x314 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x278 - RenderTableCell {TD} at (0,151) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x278 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 767x288 + RenderTableCell {TD} at (0,157) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x288 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x103 [bgcolor=#808080] + RenderBlock {P} at (4,38) size 747x108 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -89,19 +89,19 @@ layer at (0,0) size 785x731 RenderText {#text} at (669,0) size 729x35 text run at (669,0) width 60: ", giving it" text run at (0,18) width 257: "an aqua background and a 25px padding" - RenderText {#text} at (282,18) size 746x85 + RenderText {#text} at (282,18) size 746x89 text run at (282,18) width 8: ". " text run at (290,18) width 456: "Padding on inline elements does not affect line-height calculations, so all" - text run at (0,35) width 342: "lines in this element should have the same line-height. " - text run at (342,35) width 387: "There may be implementation-specific limits on how much of" - text run at (0,52) width 454: "the padding the user agent is able to display above and below each line. " - text run at (454,52) width 263: "However, there should be at least 25px of" - text run at (0,69) width 727: "padding to the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline" - text run at (0,86) width 279: "element box in the last line where it appears." - RenderBlock {P} at (4,156) size 747x17 [bgcolor=#C0C0C0] + text run at (0,36) width 342: "lines in this element should have the same line-height. " + text run at (342,36) width 387: "There may be implementation-specific limits on how much of" + text run at (0,54) width 454: "the padding the user agent is able to display above and below each line. " + text run at (454,54) width 263: "However, there should be at least 25px of" + text run at (0,72) width 727: "padding to the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline" + text run at (0,90) width 279: "element box in the last line where it appears." + RenderBlock {P} at (4,162) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,189) size 747x52 [bgcolor=#808080] + RenderBlock {P} at (4,196) size 747x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -114,10 +114,10 @@ layer at (0,0) size 785x731 RenderText {#text} at (644,0) size 723x35 text run at (644,0) width 79: ", giving it an" text run at (0,18) width 508: "aqua background and no padding, since negative padding values are not allowed" - RenderText {#text} at (508,18) size 743x34 + RenderText {#text} at (508,18) size 743x35 text run at (508,18) width 8: ". " text run at (516,18) width 227: "Padding on inline elements does not" - text run at (0,35) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." - RenderBlock {P} at (4,257) size 747x17 [bgcolor=#C0C0C0] + text run at (0,36) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." + RenderBlock {P} at (4,266) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.png index 028d57a46675..8c7756cf4f4f 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.txt index 43841907df63..82f641d9e273 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_left-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x957 +layer at (0,0) size 785x991 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x957 - RenderBlock {HTML} at (0,0) size 785x957 - RenderBody {BODY} at (8,8) size 769x941 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x991 + RenderBlock {HTML} at (0,0) size 785x991 + RenderBody {BODY} at (8,8) size 769x975 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 416x90 text run at (0,0) width 400: ".zero {background-color: silver; padding-left: 0;}" text run at (0,15) width 408: ".one {padding-left: 0.5in; background-color: aqua;}" @@ -14,97 +14,97 @@ layer at (0,0) size 785x957 text run at (0,45) width 408: ".three {padding-left: 5em; background-color: aqua;}" text run at (0,60) width 400: ".four {padding-left: 25%; background-color: aqua;}" text run at (0,75) width 416: ".five {padding-left: -20px; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,187) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 687x34 + RenderBlock {P} at (0,189) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (48,0) size 687x35 text run at (48,0) width 633: "This element should have a left padding of half an inch, which will require extra text in order to test. " text run at (681,0) width 54: "Both the" - text run at (48,17) width 406: "content background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,237) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 720x34 + text run at (48,18) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,241) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (25,0) size 720x35 text run at (25,0) width 616: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " text run at (641,0) width 104: "Both the content" - text run at (25,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,287) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (80,0) size 640x34 + text run at (25,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,293) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (80,0) size 640x35 text run at (80,0) width 586: "This element should have a left padding of 5em, which will require extra text in order to test. " text run at (666,0) width 54: "Both the" - text run at (80,17) width 406: "content background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,337) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (192,0) size 568x51 + text run at (80,18) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,345) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (192,0) size 568x53 text run at (192,0) width 549: "This element should have a left padding of 25%, which is calculated with respect to the" - text run at (192,17) width 181: "width of the parent element. " - text run at (372,17) width 388: "Both the content background and the padding should be aqua" - text run at (192,34) width 74: "(light blue)." - RenderBlock {UL} at (0,404) size 769x68 [bgcolor=#808080] - RenderListItem {LI} at (25,0) size 744x17 + text run at (192,18) width 181: "width of the parent element. " + text run at (372,18) width 388: "Both the content background and the padding should be aqua" + text run at (192,36) width 74: "(light blue)." + RenderBlock {UL} at (0,415) size 769x72 [bgcolor=#808080] + RenderListItem {LI} at (25,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 715x17 text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - RenderListItem {LI} at (25,17) size 744x51 [bgcolor=#FFFFFF] + RenderListItem {LI} at (25,18) size 744x54 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (25,0) size 712x51 + RenderText {#text} at (25,0) size 712x53 text run at (25,0) width 712: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked." - text run at (25,17) width 696: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50" - text run at (25,34) width 106: "pixels of margin." - RenderBlock {P} at (0,488) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 748x34 + text run at (25,18) width 696: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50" + text run at (25,36) width 106: "pixels of margin." + RenderBlock {P} at (0,503) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 748x35 text run at (0,0) width 565: "This element should have no left padding, since negative padding values are not allowed. " text run at (565,0) width 183: "Both the content background" - text run at (0,17) width 325: "and the normal padding should be aqua (light blue)." - RenderTable {TABLE} at (0,538) size 769x403 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x401 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 325: "and the normal padding should be aqua (light blue)." + RenderTable {TABLE} at (0,555) size 769x420 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x418 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x376 - RenderTableCell {TD} at (0,200) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x376 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableRow {TR} at (0,26) size 767x392 + RenderTableCell {TD} at (0,209) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x392 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 687x34 + RenderBlock {P} at (4,38) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (48,0) size 687x35 text run at (48,0) width 633: "This element should have a left padding of half an inch, which will require extra text in order to test. " text run at (681,0) width 54: "Both the" - text run at (48,17) width 406: "content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,87) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 720x34 + text run at (48,18) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,90) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (25,0) size 720x35 text run at (25,0) width 616: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " text run at (641,0) width 104: "Both the content" - text run at (25,17) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,137) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (80,0) size 640x34 + text run at (25,18) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,142) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (80,0) size 640x35 text run at (80,0) width 586: "This element should have a left padding of 5em, which will require extra text in order to test. " text run at (666,0) width 54: "Both the" - text run at (80,17) width 406: "content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,187) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (186,0) size 549x51 + text run at (80,18) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,194) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (186,0) size 549x53 text run at (186,0) width 549: "This element should have a left padding of 25%, which is calculated with respect to the" - text run at (186,17) width 181: "width of the parent element. " - text run at (366,17) width 354: "Both the content background and the padding should be" - text run at (186,34) width 108: "aqua (light blue)." - RenderBlock {UL} at (4,254) size 747x68 [bgcolor=#808080] - RenderListItem {LI} at (25,0) size 722x17 + text run at (186,18) width 181: "width of the parent element. " + text run at (366,18) width 354: "Both the content background and the padding should be" + text run at (186,36) width 108: "aqua (light blue)." + RenderBlock {UL} at (4,264) size 747x72 [bgcolor=#808080] + RenderListItem {LI} at (25,0) size 722x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 715x17 text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - RenderListItem {LI} at (25,17) size 722x51 [bgcolor=#FFFFFF] + RenderListItem {LI} at (25,18) size 722x54 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (25,0) size 682x51 + RenderText {#text} at (25,0) size 682x53 text run at (25,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 (25,17) width 60: "checked. " - text run at (85,17) width 622: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding" - text run at (25,34) width 180: "to make 50 pixels of margin." - RenderBlock {P} at (4,338) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 669x34 + text run at (25,18) width 60: "checked. " + text run at (85,18) width 622: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding" + text run at (25,36) width 180: "to make 50 pixels of margin." + RenderBlock {P} at (4,352) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 669x35 text run at (0,0) width 565: "This element should have no left padding, since negative padding values are not allowed. " text run at (565,0) width 104: "Both the content" - text run at (0,17) width 404: "background and the normal padding should be aqua (light blue)." + text run at (0,18) width 404: "background and the normal padding should be aqua (light blue)." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.png index f471aa3def7d..bd89797a2a57 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.txt index be621afdd4b8..758023cf29ce 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_left_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 408x45 text run at (0,0) width 400: ".one {padding-left: 25px; background-color: aqua;}" text run at (0,15) width 408: ".two {padding-left: -10px; background-color: aqua;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x52 [bgcolor=#808080] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -28,10 +28,10 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 27x17 RenderText {#text} at (527,18) size 27x17 text run at (527,18) width 27: "first" - RenderText {#text} at (554,18) size 730x34 + RenderText {#text} at (554,18) size 730x35 text run at (554,18) width 176: " line in which the inline box" - text run at (0,35) width 52: "appears." - RenderBlock {P} at (0,177) size 784x35 [bgcolor=#808080] + text run at (0,36) width 52: "appears." + RenderBlock {P} at (0,180) size 784x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -49,19 +49,19 @@ layer at (0,0) size 800x600 text run at (512,18) width 27: "first" RenderText {#text} at (539,18) size 232x17 text run at (539,18) width 232: " line in which the inline box appears." - RenderTable {TABLE} at (0,228) size 784x155 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x153 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,232) size 784x160 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x158 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x128 - RenderTableCell {TD} at (0,76) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x128 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x52 [bgcolor=#808080] + RenderTableRow {TR} at (0,26) size 782x132 + RenderTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -76,10 +76,10 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 27x17 RenderText {#text} at (570,18) size 27x17 text run at (570,18) width 27: "first" - RenderText {#text} at (597,18) size 745x34 + RenderText {#text} at (597,18) size 745x35 text run at (597,18) width 148: " line in which the inline" - text run at (0,35) width 80: "box appears." - RenderBlock {P} at (4,72) size 762x52 [bgcolor=#808080] + text run at (0,36) width 80: "box appears." + RenderBlock {P} at (4,74) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -95,6 +95,6 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 27x17 RenderText {#text} at (512,18) size 27x17 text run at (512,18) width 27: "first" - RenderText {#text} at (539,18) size 715x34 + RenderText {#text} at (539,18) size 715x35 text run at (539,18) width 176: " line in which the inline box" - text run at (0,35) width 52: "appears." + text run at (0,36) width 52: "appears." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.png index 53c6e8bc24d3..67a1f1819dd0 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.png differ 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 c75aa9ef1d91..ff132a96a40d 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_right-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1110 +layer at (0,0) size 785x1153 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1110 - RenderBlock {HTML} at (0,0) size 785x1110 - RenderBody {BODY} at (8,8) size 769x1094 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1153 + RenderBlock {HTML} at (0,0) size 785x1153 + RenderBody {BODY} at (8,8) size 769x1137 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 576x90 text run at (0,0) width 408: ".zero {background-color: silver; padding-right: 0;}" text run at (0,15) width 568: ".one {padding-right: 0.5in; text-align: right; background-color: aqua;}" @@ -14,115 +14,115 @@ layer at (0,0) size 785x1110 text run at (0,45) width 568: ".three {padding-right: 5em; text-align: right; background-color: aqua;}" text run at (0,60) width 560: ".four {padding-right: 25%; text-align: right; background-color: aqua;}" text run at (0,75) width 576: ".five {padding-right: -20px; text-align: right; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,187) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 712x51 + RenderBlock {P} at (0,189) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (25,0) size 712x53 text run at (25,0) width 642: "This element should have a right padding of half an inch, which will require extra text in order to test. " text run at (667,0) width 54: "Both the" - text run at (9,17) width 410: "content background and the padding should be aqua (light blue). " - text run at (419,17) width 302: "The text has been right-aligned in order to make" - text run at (530,34) width 191: "the right padding easier to see." - RenderBlock {P} at (0,254) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (15,0) size 729x51 + text run at (9,18) width 410: "content background and the padding should be aqua (light blue). " + text run at (419,18) width 302: "The text has been right-aligned in order to make" + text run at (530,36) width 191: "the right padding easier to see." + RenderBlock {P} at (0,259) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (15,0) size 729x53 text run at (15,0) width 625: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " text run at (640,0) width 104: "Both the content" - text run at (26,17) width 360: "background and the padding should be aqua (light blue). " - text run at (386,17) width 358: "The text has been right-aligned in order to make the right" - text run at (609,34) width 135: "padding easier to see." - RenderBlock {P} at (0,321) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (36,0) size 674x51 + text run at (26,18) width 360: "background and the padding should be aqua (light blue). " + text run at (386,18) width 358: "The text has been right-aligned in order to make the right" + text run at (609,36) width 135: "padding easier to see." + RenderBlock {P} at (0,329) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (36,0) size 674x53 text run at (36,0) width 599: "This element should have a right padding of 5 em, which will require extra text in order to test. " text run at (635,0) width 54: "Both the" - text run at (15,17) width 410: "content background and the padding should be aqua (light blue). " - text run at (425,17) width 264: "The text has been right-aligned in order to" - text run at (460,34) width 229: "make the right padding easier to see." - RenderBlock {P} at (0,388) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (19,0) size 575x51 + text run at (15,18) width 410: "content background and the padding should be aqua (light blue). " + text run at (425,18) width 264: "The text has been right-aligned in order to" + text run at (460,36) width 229: "make the right padding easier to see." + RenderBlock {P} at (0,399) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (19,0) size 575x53 text run at (19,0) width 558: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (9,17) width 181: "width of the parent element. " - text run at (189,17) width 388: "Both the content background and the padding should be aqua" - text run at (2,34) width 78: "(light blue). " - text run at (79,34) width 498: "The text has been right-aligned in order to make the right padding easier to see." - RenderBlock {UL} at (0,455) size 769x68 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 704x34 + text run at (9,18) width 181: "width of the parent element. " + text run at (189,18) width 388: "Both the content background and the padding should be aqua" + text run at (2,36) width 78: "(light blue). " + text run at (79,36) width 498: "The text has been right-aligned in order to make the right padding easier to see." + RenderBlock {UL} at (0,469) size 769x72 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 704x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (7,0) size 697x34 + RenderText {#text} at (7,0) size 697x35 text run at (7,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 (679,17) width 25: "test." - RenderListItem {LI} at (40,34) size 704x34 [bgcolor=#FFFFFF] + text run at (679,18) width 25: "test." + RenderListItem {LI} at (40,36) size 704x36 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (19,0) size 660x34 + RenderText {#text} at (19,0) size 660x35 text run at (19,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 (626,17) width 53: "element." - RenderBlock {P} at (0,539) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (12,0) size 757x51 + text run at (626,18) width 53: "element." + RenderBlock {P} at (0,557) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (12,0) size 757x53 text run at (12,0) width 574: "This element should have no right padding, since negative padding values are not allowed. " text run at (586,0) width 183: "Both the content background" - text run at (35,17) width 329: "and the normal padding should be aqua (light blue). " - text run at (364,17) width 405: "The text has been right-aligned in order to make the lack of right" - text run at (634,34) width 135: "padding easier to see." - RenderTable {TABLE} at (0,606) size 769x488 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x486 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (35,18) width 329: "and the normal padding should be aqua (light blue). " + text run at (364,18) width 405: "The text has been right-aligned in order to make the lack of right" + text run at (634,36) width 135: "padding easier to see." + RenderTable {TABLE} at (0,627) size 769x510 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x508 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x461 - RenderTableCell {TD} at (0,243) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x482 + RenderTableCell {TD} at (0,254) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x461 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 755x482 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (3,0) size 696x51 + RenderBlock {P} at (4,38) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (3,0) size 696x53 text run at (3,0) width 642: "This element should have a right padding of half an inch, which will require extra text in order to test. " text run at (645,0) width 54: "Both the" - text run at (25,17) width 410: "content background and the padding should be aqua (light blue). " - text run at (435,17) width 264: "The text has been right-aligned in order to" - text run at (470,34) width 229: "make the right padding easier to see." - RenderBlock {P} at (4,104) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (43,0) size 712x51 + text run at (25,18) width 410: "content background and the padding should be aqua (light blue). " + text run at (435,18) width 264: "The text has been right-aligned in order to" + text run at (470,36) width 229: "make the right padding easier to see." + RenderBlock {P} at (4,108) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (43,0) size 712x53 text run at (43,0) width 625: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " text run at (668,0) width 54: "Both the" - text run at (10,17) width 410: "content background and the padding should be aqua (light blue). " - text run at (420,17) width 302: "The text has been right-aligned in order to make" - text run at (531,34) width 191: "the right padding easier to see." - RenderBlock {P} at (4,171) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (14,0) size 658x51 + text run at (10,18) width 410: "content background and the padding should be aqua (light blue). " + text run at (420,18) width 302: "The text has been right-aligned in order to make" + text run at (531,36) width 191: "the right padding easier to see." + RenderBlock {P} at (4,178) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (14,0) size 658x53 text run at (14,0) width 599: "This element should have a right padding of 5 em, which will require extra text in order to test. " text run at (613,0) width 54: "Both the" - text run at (9,17) width 410: "content background and the padding should be aqua (light blue). " - text run at (419,17) width 248: "The text has been right-aligned in order" - text run at (422,34) width 245: "to make the right padding easier to see." - RenderBlock {P} at (4,238) size 747x68 [bgcolor=#00FFFF] - RenderText {#text} at (3,0) size 558x68 + text run at (9,18) width 410: "content background and the padding should be aqua (light blue). " + text run at (419,18) width 248: "The text has been right-aligned in order" + text run at (422,36) width 245: "to make the right padding easier to see." + RenderBlock {P} at (4,248) size 747x72 [bgcolor=#00FFFF] + RenderText {#text} at (3,0) size 558x71 text run at (3,0) width 558: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (27,17) width 181: "width of the parent element. " - text run at (207,17) width 354: "Both the content background and the padding should be" - text run at (36,34) width 112: "aqua (light blue). " - text run at (147,34) width 414: "The text has been right-aligned in order to make the right padding" - text run at (480,51) width 81: "easier to see." - RenderBlock {UL} at (4,322) size 747x68 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 682x34 + text run at (27,18) width 181: "width of the parent element. " + text run at (207,18) width 354: "Both the content background and the padding should be" + text run at (36,36) width 112: "aqua (light blue). " + text run at (147,36) width 414: "The text has been right-aligned in order to make the right padding" + text run at (480,54) width 81: "easier to see." + RenderBlock {UL} at (4,336) size 747x72 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 682x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (1,0) size 681x34 + RenderText {#text} at (1,0) size 681x35 text run at (1,0) width 681: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order" - text run at (641,17) width 41: "to test." - RenderListItem {LI} at (40,34) size 682x34 [bgcolor=#FFFFFF] + text run at (641,18) width 41: "to test." + RenderListItem {LI} at (40,36) size 682x36 [bgcolor=#FFFFFF] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (23,0) size 634x34 + RenderText {#text} at (23,0) size 634x35 text run at (23,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 (578,17) width 79: "UL element." - RenderBlock {P} at (4,406) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (69,0) size 733x51 + text run at (578,18) width 79: "UL element." + RenderBlock {P} at (4,424) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (69,0) size 733x53 text run at (69,0) width 574: "This element should have no right padding, since negative padding values are not allowed. " text run at (643,0) width 104: "Both the content" - text run at (14,17) width 408: "background and the normal padding should be aqua (light blue). " - text run at (422,17) width 325: "The text has been right-aligned in order to make the" - text run at (532,34) width 215: "lack of right padding easier to see." + text run at (14,18) width 408: "background and the normal padding should be aqua (light blue). " + text run at (422,18) width 325: "The text has been right-aligned in order to make the" + text run at (532,36) width 215: "lack of right padding easier to see." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.png index 805437c5353b..92bb73ae2378 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.txt index 2fe4c4620840..57270a0aeb01 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_right_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 568x45 text run at (0,0) width 560: ".one {padding-right: 25px; text-align: right; background-color: aqua;}" text run at (0,15) width 568: ".two {padding-right: -10px; text-align: right; background-color: aqua;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x35 [bgcolor=#808080] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x36 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -30,7 +30,7 @@ layer at (0,0) size 800x600 text run at (525,18) width 23: "last" RenderText {#text} at (548,18) size 232x17 text run at (548,18) width 232: " line in which the inline box appears." - RenderBlock {P} at (0,160) size 784x52 [bgcolor=#808080] + RenderBlock {P} at (0,162) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -46,22 +46,22 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 23x17 RenderText {#text} at (548,18) size 23x17 text run at (548,18) width 23: "last" - RenderText {#text} at (571,18) size 747x34 + RenderText {#text} at (571,18) size 747x35 text run at (571,18) width 176: " line in which the inline box" - text run at (0,35) width 52: "appears." - RenderTable {TABLE} at (0,228) size 784x155 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x153 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,36) width 52: "appears." + RenderTable {TABLE} at (0,232) size 784x160 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x158 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x128 - RenderTableCell {TD} at (0,76) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x128 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x52 [bgcolor=#808080] + RenderTableRow {TR} at (0,26) size 782x132 + RenderTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -77,10 +77,10 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 23x17 RenderText {#text} at (568,18) size 23x17 text run at (568,18) width 23: "last" - RenderText {#text} at (591,18) size 739x34 + RenderText {#text} at (591,18) size 739x35 text run at (591,18) width 148: " line in which the inline" - text run at (0,35) width 80: "box appears." - RenderBlock {P} at (4,72) size 762x52 [bgcolor=#808080] + text run at (0,36) width 80: "box appears." + RenderBlock {P} at (4,74) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 543x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 154: "However, it contains an " @@ -96,6 +96,6 @@ layer at (0,0) size 800x600 RenderInline {STRONG} at (0,0) size 23x17 RenderText {#text} at (548,18) size 23x17 text run at (548,18) width 23: "last" - RenderText {#text} at (571,18) size 747x34 + RenderText {#text} at (571,18) size 747x35 text run at (571,18) width 176: " line in which the inline box" - text run at (0,35) width 52: "appears." + text run at (0,36) width 52: "appears." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.png index 5257e0ad922a..e5a1486f8e88 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.txt index 08d134fd34ca..160d23671601 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_top-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1440 +layer at (0,0) size 785x1464 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1440 - RenderBlock {HTML} at (0,0) size 785x1440 - RenderBody {BODY} at (8,8) size 769x1424 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1464 + RenderBlock {HTML} at (0,0) size 785x1464 + RenderBody {BODY} at (8,8) size 769x1448 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 408x90 text run at (0,0) width 392: ".zero {background-color: silver; padding-top: 0;}" text run at (0,15) width 400: ".one {padding-top: 0.5in; background-color: aqua;}" @@ -14,73 +14,73 @@ layer at (0,0) size 785x1440 text run at (0,45) width 400: ".three {padding-top: 5em; background-color: aqua;}" text run at (0,60) width 392: ".four {padding-top: 25%; background-color: aqua;}" text run at (0,75) width 408: ".five {padding-top: -20px; background-color: aqua;}" - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 [bgcolor=#C0C0C0] + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (0,187) size 769x82 [bgcolor=#00FFFF] - RenderText {#text} at (0,48) size 737x34 + RenderBlock {P} at (0,189) size 769x84 [bgcolor=#00FFFF] + RenderText {#text} at (0,48) size 737x35 text run at (0,48) width 633: "This element should have a top padding of half an inch, which will require extra text in order to test. " text run at (633,48) width 104: "Both the content" - text run at (0,65) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,285) size 769x59 [bgcolor=#00FFFF] - RenderText {#text} at (0,25) size 720x34 + text run at (0,66) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,289) size 769x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,25) size 720x35 text run at (0,25) width 616: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " text run at (616,25) width 104: "Both the content" - text run at (0,42) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,360) size 769x114 [bgcolor=#00FFFF] - RenderText {#text} at (0,80) size 694x34 + text run at (0,43) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,366) size 769x116 [bgcolor=#00FFFF] + RenderText {#text} at (0,80) size 694x35 text run at (0,80) width 590: "This element should have a top padding of 5 em, which will require extra text in order to test. " text run at (590,80) width 104: "Both the content" - text run at (0,97) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,490) size 769x227 [bgcolor=#00FFFF] - RenderText {#text} at (0,192) size 763x34 + text run at (0,98) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,498) size 769x229 [bgcolor=#00FFFF] + RenderText {#text} at (0,192) size 763x35 text run at (0,192) width 732: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " text run at (732,192) width 31: "Both" - text run at (0,209) width 433: "the content background and the padding should be aqua (light blue). " - text run at (433,209) width 264: "This will require extra text in order to test." - RenderBlock {P} at (0,732) size 769x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 748x34 + text run at (0,210) width 433: "the content background and the padding should be aqua (light blue). " + text run at (433,210) width 264: "This will require extra text in order to test." + RenderBlock {P} at (0,742) size 769x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 748x35 text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. " text run at (565,0) width 183: "Both the content background" - text run at (0,17) width 325: "and the normal padding should be aqua (light blue)." - RenderTable {TABLE} at (0,782) size 769x642 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x640 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 325: "and the normal padding should be aqua (light blue)." + RenderTable {TABLE} at (0,794) size 769x654 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x652 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x615 - RenderTableCell {TD} at (0,319) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x626 + RenderTableCell {TD} at (0,325) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x615 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#C0C0C0] + RenderTableCell {TD} at (12,26) size 755x626 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This element has a class of zero." - RenderBlock {P} at (4,37) size 747x82 [bgcolor=#00FFFF] - RenderText {#text} at (0,48) size 737x34 + RenderBlock {P} at (4,38) size 747x84 [bgcolor=#00FFFF] + RenderText {#text} at (0,48) size 737x35 text run at (0,48) width 633: "This element should have a top padding of half an inch, which will require extra text in order to test. " text run at (633,48) width 104: "Both the content" - text run at (0,65) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,135) size 747x59 [bgcolor=#00FFFF] - RenderText {#text} at (0,25) size 720x34 + text run at (0,66) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,138) size 747x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,25) size 720x35 text run at (0,25) width 616: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " text run at (616,25) width 104: "Both the content" - text run at (0,42) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,210) size 747x114 [bgcolor=#00FFFF] - RenderText {#text} at (0,80) size 694x34 + text run at (0,43) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,215) size 747x116 [bgcolor=#00FFFF] + RenderText {#text} at (0,80) size 694x35 text run at (0,80) width 590: "This element should have a top padding of 5 em, which will require extra text in order to test. " text run at (590,80) width 104: "Both the content" - text run at (0,97) width 356: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,340) size 747x221 [bgcolor=#00FFFF] - RenderText {#text} at (0,187) size 732x34 + text run at (0,98) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,347) size 747x223 [bgcolor=#00FFFF] + RenderText {#text} at (0,187) size 732x35 text run at (0,187) width 728: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,204) width 468: "Both the content background and the padding should be aqua (light blue). " - text run at (468,204) width 264: "This will require extra text in order to test." - RenderBlock {P} at (4,576) size 747x35 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 669x34 + text run at (0,205) width 468: "Both the content background and the padding should be aqua (light blue). " + text run at (468,205) width 264: "This will require extra text in order to test." + RenderBlock {P} at (4,585) size 747x37 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 669x35 text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. " text run at (565,0) width 104: "Both the content" - text run at (0,17) width 404: "background and the normal padding should be aqua (light blue)." + text run at (0,18) width 404: "background and the normal padding should be aqua (light blue)." diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.png b/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.png index d30c9ab59ad6..32a628bc93cc 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.txt index e71a96e215ff..0d584d318f39 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/padding_top_inline-expected.txt @@ -3,16 +3,16 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 400x45 text run at (0,0) width 392: ".one {padding-top: 25px; background-color: aqua;}" text run at (0,15) width 400: ".two {padding-top: -10px; background-color: aqua;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x69 [bgcolor=#808080] + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x72 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -25,13 +25,13 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 228: "background and a 25px top padding" - RenderText {#text} at (228,18) size 767x51 + RenderText {#text} at (228,18) size 767x53 text run at (228,18) width 8: ". " text run at (236,18) width 531: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,35) width 267: "element should have the same line-height. " - text run at (267,35) width 488: "There may be implementation-specific limits on how much of the padding the" - text run at (0,52) width 177: "user agent is able to display." - RenderBlock {P} at (0,194) size 784x52 [bgcolor=#808080] + text run at (0,36) width 267: "element should have the same line-height. " + text run at (267,36) width 488: "There may be implementation-specific limits on how much of the padding the" + text run at (0,54) width 177: "user agent is able to display." + RenderBlock {P} at (0,198) size 784x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -44,23 +44,23 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 498: "background and no top padding, since negative padding values are not allowed" - RenderText {#text} at (498,18) size 772x34 + RenderText {#text} at (498,18) size 772x35 text run at (498,18) width 8: ". " text run at (506,18) width 266: "Padding on inline elements does not affect" - text run at (0,35) width 528: "line-height calculations, so all lines in this element should have the same line-height." - RenderTable {TABLE} at (0,262) size 784x172 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x170 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,36) width 528: "line-height calculations, so all lines in this element should have the same line-height." + RenderTable {TABLE} at (0,268) size 784x178 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x176 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x145 - RenderTableCell {TD} at (0,85) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x150 + RenderTableCell {TD} at (0,88) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x145 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x69 [bgcolor=#808080] + RenderTableCell {TD} at (12,26) size 770x150 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x72 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -73,13 +73,13 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 228: "background and a 25px top padding" - RenderText {#text} at (228,18) size 758x51 + RenderText {#text} at (228,18) size 758x53 text run at (228,18) width 8: ". " text run at (236,18) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in" - text run at (0,35) width 293: "this element should have the same line-height. " - text run at (293,35) width 465: "There may be implementation-specific limits on how much of the padding" - text run at (0,52) width 200: "the user agent is able to display." - RenderBlock {P} at (4,89) size 762x52 [bgcolor=#808080] + text run at (0,36) width 293: "this element should have the same line-height. " + text run at (293,36) width 465: "There may be implementation-specific limits on how much of the padding" + text run at (0,54) width 200: "the user agent is able to display." + RenderBlock {P} at (4,92) size 762x54 [bgcolor=#808080] RenderText {#text} at (0,0) size 477x17 text run at (0,0) width 389: "This element is unstyled save for a background color of gray. " text run at (389,0) width 88: "It contains an " @@ -92,7 +92,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (644,0) size 757x35 text run at (644,0) width 113: ", giving it an aqua" text run at (0,18) width 498: "background and no top padding, since negative padding values are not allowed" - RenderText {#text} at (498,18) size 733x34 + RenderText {#text} at (498,18) size 733x35 text run at (498,18) width 8: ". " text run at (506,18) width 227: "Padding on inline elements does not" - text run at (0,35) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." + text run at (0,36) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." diff --git a/LayoutTests/platform/gtk/css1/box_properties/width-expected.png b/LayoutTests/platform/gtk/css1/box_properties/width-expected.png index 3a599b5b3fbf..79d15efd6b74 100644 Binary files a/LayoutTests/platform/gtk/css1/box_properties/width-expected.png and b/LayoutTests/platform/gtk/css1/box_properties/width-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt b/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt index a82bb78cb683..81469f8ed49f 100644 --- a/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt +++ b/LayoutTests/platform/gtk/css1/box_properties/width-expected.txt @@ -1,83 +1,83 @@ -layer at (0,0) size 785x1321 +layer at (0,0) size 785x1342 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1321 - RenderBlock {HTML} at (0,0) size 785x1321 - RenderBody {BODY} at (8,8) size 769x1305 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1342 + RenderBlock {HTML} at (0,0) size 785x1342 + RenderBody {BODY} at (8,8) size 769x1326 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x45 + RenderBlock {PRE} at (0,34) size 769x45 RenderText {#text} at (0,0) size 152x45 text run at (0,0) width 152: ".one {width: 50px;}" text run at (0,15) width 144: ".two {width: 50%;}" text run at (0,30) width 152: "TABLE {width: 50%;}" - RenderBlock {HR} at (0,91) size 769x2 [border: (1px inset #000000)] - RenderBlock (anonymous) at (0,101) size 769x50 + RenderBlock {HR} at (0,92) size 769x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (0,102) size 769x50 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,167) size 769x17 + RenderBlock {P} at (0,168) size 769x18 RenderText {#text} at (0,0) size 287x17 text run at (0,0) width 287: "The square above should be fifty pixels wide." - RenderBlock (anonymous) at (0,200) size 769x385 + RenderBlock (anonymous) at (0,202) size 769x385 RenderImage {IMG} at (0,0) size 385x385 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,601) size 769x17 + RenderBlock {P} at (0,603) size 769x18 RenderText {#text} at (0,0) size 671x17 text run at (0,0) width 671: "The square above should be half as wide as the image's parent element (either the BODY or the table cell)." - RenderBlock {P} at (0,634) size 385x86 - RenderText {#text} at (0,0) size 382x68 + RenderBlock {P} at (0,637) size 385x90 + RenderText {#text} at (0,0) size 382x71 text run at (0,0) width 382: "This paragraph should be half the width of its parent element" - text run at (0,17) width 379: "(either the BODY or the table, which should itself be half as" - text run at (0,34) width 188: "wide as the BODY element). " - text run at (188,34) width 178: "This is extra text included to" - text run at (0,51) width 246: "ensure that this will be a fair test of the " + text run at (0,18) width 379: "(either the BODY or the table, which should itself be half as" + text run at (0,36) width 188: "wide as the BODY element). " + text run at (188,36) width 178: "This is extra text included to" + text run at (0,54) width 246: "ensure that this will be a fair test of the " RenderInline {CODE} at (0,0) size 40x15 - RenderText {#text} at (246,54) size 40x15 - text run at (246,54) width 40: "width" - RenderText {#text} at (286,51) size 374x35 - text run at (286,51) width 57: " property" - text run at (0,69) width 374: "without the need for the user to resize the viewing window." - RenderTable {TABLE} at (0,736) size 385x569 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 383x567 - RenderTableRow {TR} at (0,0) size 383x25 - RenderTableCell {TD} at (0,0) size 383x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (246,57) size 40x15 + text run at (246,57) width 40: "width" + RenderText {#text} at (286,54) size 374x35 + text run at (286,54) width 57: " property" + text run at (0,72) width 374: "without the need for the user to resize the viewing window." + RenderTable {TABLE} at (0,743) size 385x583 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 383x581 + RenderTableRow {TR} at (0,0) size 383x26 + RenderTableCell {TD} at (0,0) size 383x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 383x542 - RenderTableCell {TD} at (0,283) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 383x555 + RenderTableCell {TD} at (0,290) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 371x542 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 371x555 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock (anonymous) at (4,4) size 363x50 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,70) size 363x17 + RenderBlock {P} at (4,70) size 363x18 RenderText {#text} at (0,0) size 287x17 text run at (0,0) width 287: "The square above should be fifty pixels wide." - RenderBlock (anonymous) at (4,103) size 363x181 + RenderBlock (anonymous) at (4,104) size 363x181 RenderImage {IMG} at (0,0) size 182x181 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,300) size 363x34 - RenderText {#text} at (0,0) size 348x34 + RenderBlock {P} at (4,301) size 363x36 + RenderText {#text} at (0,0) size 348x35 text run at (0,0) width 348: "The square above should be half as wide as the image's" - text run at (0,17) width 319: "parent element (either the BODY or the table cell)." - RenderBlock {P} at (4,350) size 182x188 - RenderText {#text} at (0,0) size 177x153 + text run at (0,18) width 319: "parent element (either the BODY or the table cell)." + RenderBlock {P} at (4,353) size 182x198 + RenderText {#text} at (0,0) size 177x161 text run at (0,0) width 160: "This paragraph should be" - text run at (0,17) width 165: "half the width of its parent" - text run at (0,34) width 167: "element (either the BODY" - text run at (0,51) width 163: "or the table, which should" - text run at (0,68) width 169: "itself be half as wide as the" - text run at (0,85) width 113: "BODY element). " - text run at (113,85) width 42: "This is" - text run at (0,102) width 177: "extra text included to ensure" - text run at (0,119) width 174: "that this will be a fair test of" - text run at (0,136) width 23: "the " + text run at (0,18) width 165: "half the width of its parent" + text run at (0,36) width 167: "element (either the BODY" + text run at (0,54) width 163: "or the table, which should" + text run at (0,72) width 169: "itself be half as wide as the" + text run at (0,90) width 113: "BODY element). " + text run at (113,90) width 42: "This is" + text run at (0,108) width 177: "extra text included to ensure" + text run at (0,126) width 174: "that this will be a fair test of" + text run at (0,144) width 23: "the " RenderInline {CODE} at (0,0) size 40x15 - RenderText {#text} at (23,139) size 40x15 - text run at (23,139) width 40: "width" - RenderText {#text} at (63,136) size 174x52 - text run at (63,136) width 109: " property without" - text run at (0,154) width 144: "the need for the user to" - text run at (0,171) width 174: "resize the viewing window." + RenderText {#text} at (23,147) size 40x15 + text run at (23,147) width 40: "width" + RenderText {#text} at (63,144) size 174x53 + text run at (63,144) width 109: " property without" + text run at (0,162) width 144: "the need for the user to" + text run at (0,180) width 174: "resize the viewing window." diff --git a/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.png b/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.png index 88887ac29f23..260eb588820a 100644 Binary files a/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.png and b/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.txt b/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.txt index cbaa71765fb8..5a30f5db4d9c 100644 --- a/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.txt +++ b/LayoutTests/platform/gtk/css1/cascade/cascade_order-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x768 +layer at (0,0) size 785x790 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x768 - RenderBlock {HTML} at (0,0) size 785x768 - RenderBody {BODY} at (8,8) size 769x752 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x790 + RenderBlock {HTML} at (0,0) size 785x790 + RenderBody {BODY} at (8,8) size 769x774 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x165 + RenderBlock {PRE} at (0,34) size 769x165 RenderText {#text} at (0,0) size 576x165 text run at (0,0) width 576: "" text run at (0,15) width 152: "LI {color: purple;}" @@ -19,46 +19,46 @@ layer at (0,0) size 785x768 text run at (0,120) width 176: ".test {color: purple;}" text run at (0,135) width 296: ".one {text-decoration: line-through;}" text run at (0,150) width 0: " " - RenderBlock {HR} at (0,211) size 769x2 [border: (1px inset #000000)] - RenderBlock {UL} at (0,229) size 769x136 - RenderListItem {LI} at (40,0) size 729x17 [color=#0000FF] + RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #000000)] + RenderBlock {UL} at (0,230) size 769x144 + RenderListItem {LI} at (40,0) size 729x18 [color=#0000FF] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 189x17 text run at (0,0) width 189: "This list item should be blue..." - RenderListItem {LI} at (40,17) size 729x68 [color=#0000FF] - RenderBlock (anonymous) at (0,0) size 729x17 + RenderListItem {LI} at (40,18) size 729x72 [color=#0000FF] + RenderBlock (anonymous) at (0,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "...and so should this; neither should be purple." - RenderBlock {UL} at (0,17) size 729x51 - RenderListItem {LI} at (40,0) size 689x17 [color=#808080] + RenderBlock {UL} at (0,18) size 729x54 + RenderListItem {LI} at (40,0) size 689x18 [color=#808080] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 190x17 text run at (0,0) width 190: "This list item should be gray..." - RenderListItem {LI} at (40,17) size 689x17 [color=#808080] + RenderListItem {LI} at (40,18) size 689x18 [color=#808080] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...as should this...." - RenderListItem {LI} at (40,34) size 689x17 [color=#008000] + RenderListItem {LI} at (40,36) size 689x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "...but this one should be green." - RenderListItem {LI} at (40,85) size 729x17 [color=#660000] + RenderListItem {LI} at (40,90) size 729x18 [color=#660000] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 171x17 text run at (0,0) width 171: "This ought to be dark red..." - RenderListItem {LI} at (40,102) size 729x17 [color=#008000] + RenderListItem {LI} at (40,108) size 729x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 85x17 text run at (0,0) width 85: "...this green..." - RenderListItem {LI} at (40,119) size 729x17 [color=#0000FF] + RenderListItem {LI} at (40,126) size 729x18 [color=#0000FF] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 96x17 text run at (0,0) width 96: "...and this blue." - RenderBlock {P} at (0,381) size 769x17 [color=#0000FF] + RenderBlock {P} at (0,390) size 769x18 [color=#0000FF] RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "This sentence should be blue (STYLE attr.)." - RenderBlock {P} at (0,414) size 769x18 [color=#800080] + RenderBlock {P} at (0,424) size 769x18 [color=#800080] RenderText {#text} at (0,0) size 204x17 text run at (0,0) width 204: "This sentence should be purple [" RenderInline {CODE} at (0,0) size 96x15 @@ -66,60 +66,60 @@ layer at (0,0) size 785x768 text run at (204,3) width 96: "class=\"test\"" RenderText {#text} at (300,0) size 9x17 text run at (300,0) width 9: "]." - RenderBlock {P} at (0,448) size 769x17 + RenderBlock {P} at (0,458) size 769x18 RenderText {#text} at (0,0) size 683x17 text run at (0,0) width 683: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." - RenderTable {TABLE} at (0,481) size 705x271 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 703x269 - RenderTableRow {TR} at (0,0) size 703x25 - RenderTableCell {TD} at (0,0) size 703x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,492) size 705x282 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 703x280 + RenderTableRow {TR} at (0,0) size 703x26 + RenderTableCell {TD} at (0,0) size 703x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 703x244 - RenderTableCell {TD} at (0,134) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 691x244 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 683x136 - RenderListItem {LI} at (40,0) size 643x17 [color=#0000FF] + RenderTableRow {TR} at (0,26) size 703x254 + RenderTableCell {TD} at (0,140) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 691x254 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 683x144 + RenderListItem {LI} at (40,0) size 643x18 [color=#0000FF] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 189x17 text run at (0,0) width 189: "This list item should be blue..." - RenderListItem {LI} at (40,17) size 643x68 [color=#0000FF] - RenderBlock (anonymous) at (0,0) size 643x17 + RenderListItem {LI} at (40,18) size 643x72 [color=#0000FF] + RenderBlock (anonymous) at (0,0) size 643x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "...and so should this; neither should be purple." - RenderBlock {UL} at (0,17) size 643x51 - RenderListItem {LI} at (40,0) size 603x17 [color=#808080] + RenderBlock {UL} at (0,18) size 643x54 + RenderListItem {LI} at (40,0) size 603x18 [color=#808080] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 190x17 text run at (0,0) width 190: "This list item should be gray..." - RenderListItem {LI} at (40,17) size 603x17 [color=#808080] + RenderListItem {LI} at (40,18) size 603x18 [color=#808080] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...as should this...." - RenderListItem {LI} at (40,34) size 603x17 [color=#008000] + RenderListItem {LI} at (40,36) size 603x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "...but this one should be green." - RenderListItem {LI} at (40,85) size 643x17 [color=#660000] + RenderListItem {LI} at (40,90) size 643x18 [color=#660000] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 171x17 text run at (0,0) width 171: "This ought to be dark red..." - RenderListItem {LI} at (40,102) size 643x17 [color=#008000] + RenderListItem {LI} at (40,108) size 643x18 [color=#008000] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 85x17 text run at (0,0) width 85: "...this green..." - RenderListItem {LI} at (40,119) size 643x17 [color=#0000FF] + RenderListItem {LI} at (40,126) size 643x18 [color=#0000FF] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 96x17 text run at (0,0) width 96: "...and this blue." - RenderBlock {P} at (4,156) size 683x17 [color=#0000FF] + RenderBlock {P} at (4,164) size 683x18 [color=#0000FF] RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "This sentence should be blue (STYLE attr.)." - RenderBlock {P} at (4,189) size 683x18 [color=#800080] + RenderBlock {P} at (4,198) size 683x18 [color=#800080] RenderText {#text} at (0,0) size 204x17 text run at (0,0) width 204: "This sentence should be purple [" RenderInline {CODE} at (0,0) size 96x15 @@ -127,6 +127,6 @@ layer at (0,0) size 785x768 text run at (204,3) width 96: "class=\"test\"" RenderText {#text} at (300,0) size 9x17 text run at (300,0) width 9: "]." - RenderBlock {P} at (4,223) size 683x17 + RenderBlock {P} at (4,232) size 683x18 RenderText {#text} at (0,0) size 683x17 text run at (0,0) width 683: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." diff --git a/LayoutTests/platform/gtk/css1/cascade/important-expected.png b/LayoutTests/platform/gtk/css1/cascade/important-expected.png index cca65b590c99..a9a102caa7ef 100644 Binary files a/LayoutTests/platform/gtk/css1/cascade/important-expected.png and b/LayoutTests/platform/gtk/css1/cascade/important-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/cascade/important-expected.txt b/LayoutTests/platform/gtk/css1/cascade/important-expected.txt index 14ff01220c26..b715761416fd 100644 --- a/LayoutTests/platform/gtk/css1/cascade/important-expected.txt +++ b/LayoutTests/platform/gtk/css1/cascade/important-expected.txt @@ -3,21 +3,21 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 232x60 text run at (0,0) width 232: "P {color: green ! important;}" text run at (0,15) width 120: "P {color: red;}" text run at (0,30) width 176: "P#id1 {color: purple;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x34 [color=#008000] - RenderText {#text} at (0,0) size 767x34 + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x36 [color=#008000] + RenderText {#text} at (0,0) size 767x35 text run at (0,0) width 767: "This sentence should be green, because the declaration marked important should override any other normal declaration for" - text run at (0,17) width 355: "the same element, even if it occurs later in the stylesheet." - RenderBlock {P} at (0,174) size 784x35 [color=#008000] + text run at (0,18) width 355: "the same element, even if it occurs later in the stylesheet." + RenderBlock {P} at (0,177) size 784x36 [color=#008000] RenderText {#text} at (0,0) size 403x17 text run at (0,0) width 403: "This sentence should also be green, even though it has an ID of " RenderInline {TT} at (0,0) size 24x15 @@ -27,28 +27,28 @@ layer at (0,0) size 800x600 text run at (427,0) width 258: ", which would ordinarily make it purple. " text run at (685,0) width 96: "This is because" text run at (0,18) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." - RenderBlock {P} at (0,225) size 784x34 [color=#008000] - RenderText {#text} at (0,0) size 779x34 + RenderBlock {P} at (0,229) size 784x36 [color=#008000] + RenderText {#text} at (0,0) size 779x35 text run at (0,0) width 604: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " text run at (604,0) width 175: "This is because declarations" - text run at (0,17) width 566: "marked important have more weight than normal declarations given in a STYLE attribute." - RenderTable {TABLE} at (0,275) size 784x170 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x168 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 566: "marked important have more weight than normal declarations given in a STYLE attribute." + RenderTable {TABLE} at (0,281) size 784x176 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x174 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x143 - RenderTableCell {TD} at (0,84) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x148 + RenderTableCell {TD} at (0,87) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x143 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x34 [color=#008000] - RenderText {#text} at (0,0) size 745x34 + RenderTableCell {TD} at (12,26) size 770x148 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x36 [color=#008000] + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This sentence should be green, because the declaration marked important should override any other normal declaration" - text run at (0,17) width 377: "for the same element, even if it occurs later in the stylesheet." - RenderBlock {P} at (4,54) size 762x35 [color=#008000] + text run at (0,18) width 377: "for the same element, even if it occurs later in the stylesheet." + RenderBlock {P} at (4,56) size 762x36 [color=#008000] RenderText {#text} at (0,0) size 403x17 text run at (0,0) width 403: "This sentence should also be green, even though it has an ID of " RenderInline {TT} at (0,0) size 24x15 @@ -58,8 +58,8 @@ layer at (0,0) size 800x600 text run at (427,0) width 258: ", which would ordinarily make it purple. " text run at (685,0) width 42: "This is" text run at (0,18) width 699: "because declarations marked important have more weight than normal declarations given in a STYLE attribute." - RenderBlock {P} at (4,105) size 762x34 [color=#008000] - RenderText {#text} at (0,0) size 700x34 + RenderBlock {P} at (4,108) size 762x36 [color=#008000] + RenderText {#text} at (0,0) size 700x35 text run at (0,0) width 604: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " text run at (604,0) width 96: "This is because" - text run at (0,17) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." + text run at (0,18) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." diff --git a/LayoutTests/platform/gtk/css1/classification/display-expected.png b/LayoutTests/platform/gtk/css1/classification/display-expected.png index 72ea6a0978ff..611d5f52b80d 100644 Binary files a/LayoutTests/platform/gtk/css1/classification/display-expected.png and b/LayoutTests/platform/gtk/css1/classification/display-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/classification/display-expected.txt b/LayoutTests/platform/gtk/css1/classification/display-expected.txt index 57ee562fac27..4897ad94a0a7 100644 --- a/LayoutTests/platform/gtk/css1/classification/display-expected.txt +++ b/LayoutTests/platform/gtk/css1/classification/display-expected.txt @@ -1,126 +1,126 @@ -layer at (0,0) size 785x794 +layer at (0,0) size 785x816 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x794 - RenderBlock {HTML} at (0,0) size 785x794 - RenderBody {BODY} at (8,8) size 769x778 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x816 + RenderBlock {HTML} at (0,0) size 785x816 + RenderBody {BODY} at (8,8) size 769x800 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x75 + RenderBlock {PRE} at (0,34) size 769x75 RenderText {#text} at (0,0) size 568x75 text run at (0,0) width 176: ".one {display: block;}" text run at (0,15) width 184: ".two {display: inline;}" text run at (0,30) width 568: ".three {display: list-item; list-style-type: square; margin-left: 3em;}" text run at (0,45) width 272: ".four {display: none; color: red;}" text run at (0,60) width 152: "I {display: block;}" - RenderBlock {HR} at (0,121) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,139) size 769x17 + RenderBlock {HR} at (0,122) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,140) size 769x18 RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "This sentence should be a block-level element." - RenderBlock (anonymous) at (0,172) size 769x52 + RenderBlock (anonymous) at (0,174) size 769x54 RenderInline {P} at (0,0) size 448x17 RenderText {#text} at (0,0) size 448x17 text run at (0,0) width 448: "This sentence should be part of an inline element, as are the next three. " - RenderInline {P} at (0,0) size 766x51 - RenderText {#text} at (448,0) size 766x51 + RenderInline {P} at (0,0) size 766x53 + RenderText {#text} at (448,0) size 766x53 text run at (448,0) width 274: "This sentence and the next two are part of a" - text run at (0,17) width 144: "second inline element. " - text run at (144,17) width 622: "They should therefore appear, along with the sentence above, to be all one paragraph which is four" - text run at (0,34) width 100: "sentences long. " - text run at (100,34) width 250: "If this is not the case, then the keyword " + text run at (0,18) width 144: "second inline element. " + text run at (144,18) width 622: "They should therefore appear, along with the sentence above, to be all one paragraph which is four" + text run at (0,36) width 100: "sentences long. " + text run at (100,36) width 250: "If this is not the case, then the keyword " RenderInline {CODE} at (0,0) size 48x15 - RenderText {#text} at (350,37) size 48x15 - text run at (350,37) width 48: "inline" - RenderText {#text} at (398,34) size 109x17 - text run at (398,34) width 109: " is being ignored." + RenderText {#text} at (350,39) size 48x15 + text run at (350,39) width 48: "inline" + RenderText {#text} at (398,36) size 109x17 + text run at (398,36) width 109: " is being ignored." RenderText {#text} at (0,0) size 0x0 - RenderListItem {P} at (48,240) size 721x52 + RenderListItem {P} at (48,244) size 721x54 RenderListMarker at (-17,0) size 7x17: black square - RenderText {#text} at (0,0) size 715x34 + RenderText {#text} at (0,0) size 715x35 text run at (0,0) width 715: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items" - text run at (0,17) width 18: "(if " + text run at (0,18) width 18: "(if " RenderInline {CODE} at (0,0) size 120x15 - RenderText {#text} at (18,20) size 120x15 - text run at (18,20) width 120: "list-style-type" - RenderText {#text} at (138,17) size 721x35 - text run at (138,17) width 359: " is supported, there will be a square for the item marker). " - text run at (497,17) width 224: "A 3em left margin has been applied" - text run at (0,35) width 376: "in order to ensure that there is space for the list-item marker." - RenderBlock {P} at (0,308) size 769x17 + RenderText {#text} at (18,21) size 120x15 + text run at (18,21) width 120: "list-style-type" + RenderText {#text} at (138,18) size 721x35 + text run at (138,18) width 359: " is supported, there will be a square for the item marker). " + text run at (497,18) width 224: "A 3em left margin has been applied" + text run at (0,36) width 376: "in order to ensure that there is space for the list-item marker." + RenderBlock {P} at (0,314) size 769x18 RenderText {#text} at (0,0) size 456x17 text run at (0,0) width 456: "The next paragraph should be invisible (if it's visible, you'll see red text)." - RenderBlock {P} at (0,341) size 769x17 + RenderBlock {P} at (0,348) size 769x18 RenderText {#text} at (0,0) size 247x17 text run at (0,0) width 247: "There should be no text after the colon:" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,374) size 769x51 - RenderBlock (anonymous) at (0,0) size 769x17 + RenderBlock {P} at (0,382) size 769x54 + RenderBlock (anonymous) at (0,0) size 769x18 RenderText {#text} at (0,0) size 112x17 text run at (0,0) width 112: "The italicized text" - RenderBlock {I} at (0,17) size 769x17 + RenderBlock {I} at (0,18) size 769x18 RenderText {#text} at (0,0) size 110x17 text run at (0,0) width 110: "in this paragraph" - RenderBlock (anonymous) at (0,34) size 769x17 + RenderBlock (anonymous) at (0,36) size 769x18 RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "should be a block-level element." - RenderTable {TABLE} at (0,441) size 769x337 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x335 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,452) size 769x348 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x346 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x310 - RenderTableCell {TD} at (0,167) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x310 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableRow {TR} at (0,26) size 767x320 + RenderTableCell {TD} at (0,173) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x320 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "This sentence should be a block-level element." - RenderBlock (anonymous) at (4,37) size 747x52 + RenderBlock (anonymous) at (4,38) size 747x54 RenderInline {P} at (0,0) size 448x17 RenderText {#text} at (0,0) size 448x17 text run at (0,0) width 448: "This sentence should be part of an inline element, as are the next three. " - RenderInline {P} at (0,0) size 736x51 - RenderText {#text} at (448,0) size 736x51 + RenderInline {P} at (0,0) size 736x53 + RenderText {#text} at (448,0) size 736x53 text run at (448,0) width 274: "This sentence and the next two are part of a" - text run at (0,17) width 144: "second inline element. " - text run at (144,17) width 592: "They should therefore appear, along with the sentence above, to be all one paragraph which is" - text run at (0,34) width 130: "four sentences long. " - text run at (130,34) width 250: "If this is not the case, then the keyword " + text run at (0,18) width 144: "second inline element. " + text run at (144,18) width 592: "They should therefore appear, along with the sentence above, to be all one paragraph which is" + text run at (0,36) width 130: "four sentences long. " + text run at (130,36) width 250: "If this is not the case, then the keyword " RenderInline {CODE} at (0,0) size 48x15 - RenderText {#text} at (380,37) size 48x15 - text run at (380,37) width 48: "inline" - RenderText {#text} at (428,34) size 109x17 - text run at (428,34) width 109: " is being ignored." + RenderText {#text} at (380,39) size 48x15 + text run at (380,39) width 48: "inline" + RenderText {#text} at (428,36) size 109x17 + text run at (428,36) width 109: " is being ignored." RenderText {#text} at (0,0) size 0x0 - RenderListItem {P} at (52,105) size 699x52 + RenderListItem {P} at (52,108) size 699x54 RenderListMarker at (-17,0) size 7x17: black square - RenderText {#text} at (0,0) size 678x34 + RenderText {#text} at (0,0) size 678x35 text run at (0,0) width 678: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list" - text run at (0,17) width 55: "items (if " + text run at (0,18) width 55: "items (if " RenderInline {CODE} at (0,0) size 120x15 - RenderText {#text} at (55,20) size 120x15 - text run at (55,20) width 120: "list-style-type" - RenderText {#text} at (175,17) size 674x35 - text run at (175,17) width 359: " is supported, there will be a square for the item marker). " - text run at (534,17) width 140: "A 3em left margin has" - text run at (0,35) width 460: "been applied in order to ensure that there is space for the list-item marker." - RenderBlock {P} at (4,173) size 747x17 + RenderText {#text} at (55,21) size 120x15 + text run at (55,21) width 120: "list-style-type" + RenderText {#text} at (175,18) size 674x35 + text run at (175,18) width 359: " is supported, there will be a square for the item marker). " + text run at (534,18) width 140: "A 3em left margin has" + text run at (0,36) width 460: "been applied in order to ensure that there is space for the list-item marker." + RenderBlock {P} at (4,178) size 747x18 RenderText {#text} at (0,0) size 456x17 text run at (0,0) width 456: "The next paragraph should be invisible (if it's visible, you'll see red text)." - RenderBlock {P} at (4,206) size 747x17 + RenderBlock {P} at (4,212) size 747x18 RenderText {#text} at (0,0) size 247x17 text run at (0,0) width 247: "There should be no text after the colon:" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,239) size 747x51 - RenderBlock (anonymous) at (0,0) size 747x17 + RenderBlock {P} at (4,246) size 747x54 + RenderBlock (anonymous) at (0,0) size 747x18 RenderText {#text} at (0,0) size 112x17 text run at (0,0) width 112: "The italicized text" - RenderBlock {I} at (0,17) size 747x17 + RenderBlock {I} at (0,18) size 747x18 RenderText {#text} at (0,0) size 110x17 text run at (0,0) width 110: "in this paragraph" - RenderBlock (anonymous) at (0,34) size 747x17 + RenderBlock (anonymous) at (0,36) size 747x18 RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "should be a block-level element." diff --git a/LayoutTests/platform/gtk/css1/classification/list_style-expected.png b/LayoutTests/platform/gtk/css1/classification/list_style-expected.png index a1b8ccb7a027..9f9e6be9cd1a 100644 Binary files a/LayoutTests/platform/gtk/css1/classification/list_style-expected.png and b/LayoutTests/platform/gtk/css1/classification/list_style-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/classification/list_style-expected.txt b/LayoutTests/platform/gtk/css1/classification/list_style-expected.txt index 733935755068..d3275a8a6cac 100644 --- a/LayoutTests/platform/gtk/css1/classification/list_style-expected.txt +++ b/LayoutTests/platform/gtk/css1/classification/list_style-expected.txt @@ -3,49 +3,49 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x30 + RenderBlock {PRE} at (0,34) size 784x30 RenderText {#text} at (0,0) size 496x30 text run at (0,0) width 304: ".one {list-style: upper-alpha inside;}" text run at (0,15) width 496: ".two {list-style: url(../resources/oransqr.gif) disc outside;}" - RenderBlock {HR} at (0,76) size 784x2 [border: (1px inset #000000)] - RenderBlock {UL} at (0,94) size 784x34 - RenderListItem {LI} at (40,0) size 744x34 + RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)] + RenderBlock {UL} at (0,95) size 784x36 + RenderListItem {LI} at (40,0) size 744x36 RenderListMarker at (0,0) size 20x17: "A" - RenderText {#text} at (20,0) size 731x34 + RenderText {#text} at (20,0) size 731x35 text run at (20,0) width 711: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin," - text run at (0,17) width 286: "leaving no blank space beneath the capital-A." - RenderBlock {UL} at (0,144) size 784x35 - RenderListItem {LI} at (40,0) size 744x35 + text run at (0,18) width 286: "leaving no blank space beneath the capital-A." + RenderBlock {UL} at (0,147) size 784x37 + RenderListItem {LI} at (40,0) size 744x37 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,1) size 736x34 + RenderText {#text} at (0,1) size 736x35 text run at (0,1) width 476: "The text in this item have an orange square for its bullet; failing that, a disc. " text run at (476,1) width 260: "Also, the bullet should be outside the text" - text run at (0,18) width 256: "block, as the list has been set to 'outside'." - RenderTable {TABLE} at (0,195) size 784x136 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x134 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,19) width 256: "block, as the list has been set to 'outside'." + RenderTable {TABLE} at (0,200) size 784x141 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x139 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x109 - RenderTableCell {TD} at (0,67) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x109 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 762x34 - RenderListItem {LI} at (40,0) size 722x34 + RenderTableRow {TR} at (0,26) size 782x113 + RenderTableCell {TD} at (0,69) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 770x113 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 762x36 + RenderListItem {LI} at (40,0) size 722x36 RenderListMarker at (0,0) size 20x17: "A" - RenderText {#text} at (20,0) size 679x34 + RenderText {#text} at (20,0) size 679x35 text run at (20,0) width 659: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left" - text run at (0,17) width 338: "margin, leaving no blank space beneath the capital-A." - RenderBlock {UL} at (4,54) size 762x35 - RenderListItem {LI} at (40,0) size 722x35 + text run at (0,18) width 338: "margin, leaving no blank space beneath the capital-A." + RenderBlock {UL} at (4,56) size 762x37 + RenderListItem {LI} at (40,0) size 722x37 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,1) size 709x34 + RenderText {#text} at (0,1) size 709x35 text run at (0,1) width 476: "The text in this item have an orange square for its bullet; failing that, a disc. " text run at (476,1) width 233: "Also, the bullet should be outside the" - text run at (0,18) width 283: "text block, as the list has been set to 'outside'." + text run at (0,19) width 283: "text block, as the list has been set to 'outside'." diff --git a/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.png b/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.png index a7042bdbc995..0b69a0f764b9 100644 Binary files a/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.png and b/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.txt b/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.txt index 137142453028..67667fbc4e0e 100644 --- a/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.txt +++ b/LayoutTests/platform/gtk/css1/classification/list_style_image-expected.txt @@ -3,76 +3,76 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 440x45 text run at (0,0) width 440: ".one {list-style-image: url(../resources/oransqr.gif);}" text run at (0,15) width 240: ".two {list-style-image: none;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {UL} at (0,109) size 784x54 - RenderListItem {LI} at (40,0) size 744x18 + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {UL} at (0,110) size 784x57 + RenderListItem {LI} at (40,0) size 744x19 RenderListMarker at (-22,0) size 15x15 RenderText {#text} at (0,1) size 62x17 text run at (0,1) width 62: "This list..." - RenderListItem {LI} at (40,18) size 744x18 + RenderListItem {LI} at (40,19) size 744x19 RenderListMarker at (-22,0) size 15x15 RenderText {#text} at (0,1) size 113x17 text run at (0,1) width 113: "...should feature..." - RenderListItem {LI} at (40,36) size 744x18 + RenderListItem {LI} at (40,38) size 744x19 RenderListMarker at (-22,0) size 15x15 RenderText {#text} at (0,1) size 146x17 text run at (0,1) width 146: "...images for each item." - RenderBlock {UL} at (0,179) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,183) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 231x17 text run at (0,0) width 231: "...standard list markers for each item." - RenderTable {TABLE} at (0,246) size 293x172 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 291x170 - RenderTableRow {TR} at (0,0) size 291x25 - RenderTableCell {TD} at (0,0) size 291x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,253) size 293x179 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 291x177 + RenderTableRow {TR} at (0,0) size 291x26 + RenderTableCell {TD} at (0,0) size 291x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 291x145 - RenderTableCell {TD} at (0,85) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 279x145 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 271x54 - RenderListItem {LI} at (40,0) size 231x18 + RenderTableRow {TR} at (0,26) size 291x151 + RenderTableCell {TD} at (0,88) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 279x151 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 271x57 + RenderListItem {LI} at (40,0) size 231x19 RenderListMarker at (-22,0) size 15x15 RenderText {#text} at (0,1) size 62x17 text run at (0,1) width 62: "This list..." - RenderListItem {LI} at (40,18) size 231x18 + RenderListItem {LI} at (40,19) size 231x19 RenderListMarker at (-22,0) size 15x15 RenderText {#text} at (0,1) size 113x17 text run at (0,1) width 113: "...should feature..." - RenderListItem {LI} at (40,36) size 231x18 + RenderListItem {LI} at (40,38) size 231x19 RenderListMarker at (-22,0) size 15x15 RenderText {#text} at (0,1) size 146x17 text run at (0,1) width 146: "...images for each item." - RenderBlock {UL} at (4,74) size 271x51 - RenderListItem {LI} at (40,0) size 231x17 + RenderBlock {UL} at (4,77) size 271x54 + RenderListItem {LI} at (40,0) size 231x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 231x17 + RenderListItem {LI} at (40,18) size 231x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 231x17 + RenderListItem {LI} at (40,36) size 231x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 231x17 text run at (0,0) width 231: "...standard list markers for each item." diff --git a/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.png b/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.png index 231654d093a6..de6a40308b47 100644 Binary files a/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.png and b/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.txt b/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.txt index bda81997f600..c4577bd17d24 100644 --- a/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.txt +++ b/LayoutTests/platform/gtk/css1/classification/list_style_position-expected.txt @@ -3,48 +3,48 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 288x45 text run at (0,0) width 288: ".one {list-style-position: outside;}" text run at (0,15) width 280: ".two {list-style-position: inside;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {UL} at (0,109) size 784x34 - RenderListItem {LI} at (40,0) size 744x34 + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {UL} at (0,110) size 784x36 + RenderListItem {LI} at (40,0) size 744x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 725x34 + RenderText {#text} at (0,0) size 725x35 text run at (0,0) width 725: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank" - text run at (0,17) width 154: "space beneath the bullet." - RenderBlock {UL} at (0,159) size 784x34 - RenderListItem {LI} at (40,0) size 744x34 + text run at (0,18) width 154: "space beneath the bullet." + RenderBlock {UL} at (0,162) size 784x36 + RenderListItem {LI} at (40,0) size 744x36 RenderListMarker at (-1,0) size 7x17: bullet - RenderText {#text} at (14,0) size 702x34 + RenderText {#text} at (14,0) size 702x35 text run at (14,0) width 688: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," - text run at (0,17) width 263: "leaving no blank space beneath the bullet." - RenderTable {TABLE} at (0,209) size 784x135 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x133 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 263: "leaving no blank space beneath the bullet." + RenderTable {TABLE} at (0,214) size 784x140 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x138 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x108 - RenderTableCell {TD} at (0,66) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x108 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 762x34 - RenderListItem {LI} at (40,0) size 722x34 + RenderTableRow {TR} at (0,26) size 782x112 + RenderTableCell {TD} at (0,69) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x112 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 762x36 + RenderListItem {LI} at (40,0) size 722x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 686x34 + RenderText {#text} at (0,0) size 686x35 text run at (0,0) width 686: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving" - text run at (0,17) width 193: "blank space beneath the bullet." - RenderBlock {UL} at (4,54) size 762x34 - RenderListItem {LI} at (40,0) size 722x34 + text run at (0,18) width 193: "blank space beneath the bullet." + RenderBlock {UL} at (4,56) size 762x36 + RenderListItem {LI} at (40,0) size 722x36 RenderListMarker at (-1,0) size 7x17: bullet - RenderText {#text} at (14,0) size 702x34 + RenderText {#text} at (14,0) size 702x35 text run at (14,0) width 688: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," - text run at (0,17) width 263: "leaving no blank space beneath the bullet." + text run at (0,18) width 263: "leaving no blank space beneath the bullet." diff --git a/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.png b/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.png index 76a5b0caffb1..b9e1a2280404 100644 Binary files a/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.png and b/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.txt b/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.txt index a4f2f6e53927..b8cf5d6fd721 100644 --- a/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.txt +++ b/LayoutTests/platform/gtk/css1/classification/list_style_type-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1471 +layer at (0,0) size 785x1527 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1471 - RenderBlock {HTML} at (0,0) size 785x1471 - RenderBody {BODY} at (8,8) size 769x1455 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1527 + RenderBlock {HTML} at (0,0) size 785x1527 + RenderBody {BODY} at (8,8) size 769x1511 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x150 + RenderBlock {PRE} at (0,34) size 769x150 RenderText {#text} at (0,0) size 304x150 text run at (0,0) width 232: ".one {list-style-type: disc;}" text run at (0,15) width 248: ".two {list-style-type: circle;}" @@ -18,244 +18,244 @@ layer at (0,0) size 785x1471 text run at (0,105) width 272: ".eight {list-style-type: decimal;}" text run at (0,120) width 240: ".nine {list-style-type: none;}" text run at (0,135) width 0: " " - RenderBlock {HR} at (0,196) size 769x2 [border: (1px inset #000000)] - RenderBlock {UL} at (0,214) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {HR} at (0,197) size 769x2 [border: (1px inset #000000)] + RenderBlock {UL} at (0,215) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 133x17 text run at (0,0) width 133: "...discs for each item." - RenderBlock {UL} at (0,281) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {UL} at (0,285) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 142x17 text run at (0,0) width 142: "...circles for each item." - RenderBlock {UL} at (0,348) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {UL} at (0,355) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 149x17 text run at (0,0) width 149: "...squares for each item." - RenderBlock {OL} at (0,415) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {OL} at (0,425) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-16,0) size 12x17: "i" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-20,0) size 16x17: "ii" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-24,0) size 20x17: "iii" RenderText {#text} at (0,0) size 276x17 text run at (0,0) width 276: "...lowercase Roman numerals for each item." - RenderBlock {OL} at (0,482) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {OL} at (0,495) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-17,0) size 13x17: "I" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-22,0) size 18x17: "II" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-27,0) size 23x17: "III" RenderText {#text} at (0,0) size 276x17 text run at (0,0) width 276: "...uppercase Roman numerals for each item." - RenderBlock {OL} at (0,549) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {OL} at (0,565) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-19,0) size 15x17: "a" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-20,0) size 16x17: "b" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-19,0) size 15x17: "c" RenderText {#text} at (0,0) size 206x17 text run at (0,0) width 206: "...lowercase letters for each item." - RenderBlock {OL} at (0,616) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {OL} at (0,635) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-24,0) size 20x17: "A" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-23,0) size 19x17: "B" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-23,0) size 19x17: "C" RenderText {#text} at (0,0) size 206x17 text run at (0,0) width 206: "...uppercase letters for each item." - RenderBlock {OL} at (0,683) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {OL} at (0,705) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-24,0) size 20x17: "A" RenderText {#text} at (0,0) size 155x17 text run at (0,0) width 155: "This list should feature..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderListMarker at (-23,0) size 19x17: "B" RenderText {#text} at (0,0) size 147x17 text run at (0,0) width 147: "...letters for each item..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderListMarker at (-20,0) size 16x17: "3" RenderText {#text} at (0,0) size 110x17 text run at (0,0) width 110: "...except this one." - RenderBlock {UL} at (0,750) size 769x51 - RenderListItem {LI} at (40,0) size 729x17 + RenderBlock {UL} at (0,775) size 769x54 + RenderListItem {LI} at (40,0) size 729x18 RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 729x17 + RenderListItem {LI} at (40,18) size 729x18 RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 729x17 + RenderListItem {LI} at (40,36) size 729x18 RenderText {#text} at (0,0) size 150x17 text run at (0,0) width 150: "...nothing for each item." - RenderTable {TABLE} at (0,817) size 338x638 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 336x636 - RenderTableRow {TR} at (0,0) size 336x25 - RenderTableCell {TD} at (0,0) size 336x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,845) size 338x666 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 336x664 + RenderTableRow {TR} at (0,0) size 336x26 + RenderTableCell {TD} at (0,0) size 336x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 336x611 - RenderTableCell {TD} at (0,318) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 336x638 + RenderTableCell {TD} at (0,332) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 324x611 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderTableCell {TD} at (12,26) size 324x638 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 133x17 text run at (0,0) width 133: "...discs for each item." - RenderBlock {UL} at (4,71) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {UL} at (4,74) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 142x17 text run at (0,0) width 142: "...circles for each item." - RenderBlock {UL} at (4,138) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {UL} at (4,144) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 149x17 text run at (0,0) width 149: "...squares for each item." - RenderBlock {OL} at (4,205) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {OL} at (4,214) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-16,0) size 12x17: "i" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-20,0) size 16x17: "ii" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-24,0) size 20x17: "iii" RenderText {#text} at (0,0) size 276x17 text run at (0,0) width 276: "...lowercase Roman numerals for each item." - RenderBlock {OL} at (4,272) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {OL} at (4,284) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-17,0) size 13x17: "I" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-22,0) size 18x17: "II" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-27,0) size 23x17: "III" RenderText {#text} at (0,0) size 276x17 text run at (0,0) width 276: "...uppercase Roman numerals for each item." - RenderBlock {OL} at (4,339) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {OL} at (4,354) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-19,0) size 15x17: "a" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-20,0) size 16x17: "b" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-19,0) size 15x17: "c" RenderText {#text} at (0,0) size 206x17 text run at (0,0) width 206: "...lowercase letters for each item." - RenderBlock {OL} at (4,406) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {OL} at (4,424) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-24,0) size 20x17: "A" RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-23,0) size 19x17: "B" RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-23,0) size 19x17: "C" RenderText {#text} at (0,0) size 206x17 text run at (0,0) width 206: "...uppercase letters for each item." - RenderBlock {OL} at (4,473) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {OL} at (4,494) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderListMarker at (-24,0) size 20x17: "A" RenderText {#text} at (0,0) size 155x17 text run at (0,0) width 155: "This list should feature..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderListMarker at (-23,0) size 19x17: "B" RenderText {#text} at (0,0) size 147x17 text run at (0,0) width 147: "...letters for each item..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderListMarker at (-20,0) size 16x17: "3" RenderText {#text} at (0,0) size 110x17 text run at (0,0) width 110: "...except this one." - RenderBlock {UL} at (4,540) size 316x51 - RenderListItem {LI} at (40,0) size 276x17 + RenderBlock {UL} at (4,564) size 316x54 + RenderListItem {LI} at (40,0) size 276x18 RenderText {#text} at (0,0) size 62x17 text run at (0,0) width 62: "This list..." - RenderListItem {LI} at (40,17) size 276x17 + RenderListItem {LI} at (40,18) size 276x18 RenderText {#text} at (0,0) size 113x17 text run at (0,0) width 113: "...should feature..." - RenderListItem {LI} at (40,34) size 276x17 + RenderListItem {LI} at (40,36) size 276x18 RenderText {#text} at (0,0) size 150x17 text run at (0,0) width 150: "...nothing for each item." diff --git a/LayoutTests/platform/gtk/css1/classification/white_space-expected.png b/LayoutTests/platform/gtk/css1/classification/white_space-expected.png index 465c26a9e328..2f0c3e458348 100644 Binary files a/LayoutTests/platform/gtk/css1/classification/white_space-expected.png and b/LayoutTests/platform/gtk/css1/classification/white_space-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/classification/white_space-expected.txt b/LayoutTests/platform/gtk/css1/classification/white_space-expected.txt index b514955223bd..0be867de1647 100644 --- a/LayoutTests/platform/gtk/css1/classification/white_space-expected.txt +++ b/LayoutTests/platform/gtk/css1/classification/white_space-expected.txt @@ -3,67 +3,67 @@ layer at (0,0) size 921x585 layer at (0,0) size 800x585 RenderBlock {HTML} at (0,0) size 800x585 RenderBody {BODY} at (8,8) size 784x569 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 232x60 text run at (0,0) width 192: ".one {white-space: pre;}" text run at (0,15) width 216: ".two {white-space: nowrap;}" text run at (0,30) width 232: ".three {white-space: normal;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x85 - RenderText {#text} at (0,0) size 569x85 + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x90 + RenderText {#text} at (0,0) size 569x89 text run at (0,0) width 0: " " - text run at (0,17) width 569: "This sentence should show extra space where there would ordinarily not be any." - text run at (0,34) width 296: " There should also be preservation of returns" - text run at (0,51) width 97: "as this sentence" - text run at (0,68) width 184: " very clearly demonstrates." - RenderBlock {P} at (0,225) size 784x17 + text run at (0,18) width 569: "This sentence should show extra space where there would ordinarily not be any." + text run at (0,36) width 296: " There should also be preservation of returns" + text run at (0,54) width 97: "as this sentence" + text run at (0,72) width 184: " very clearly demonstrates." + RenderBlock {P} at (0,231) size 784x18 RenderText {#text} at (0,0) size 891x17 text run at (0,0) width 891: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - RenderBlock {P} at (0,258) size 784x34 - RenderText {#text} at (0,0) size 296x34 + RenderBlock {P} at (0,265) size 784x36 + RenderText {#text} at (0,0) size 296x35 text run at (0,0) width 0: " " - text run at (0,17) width 296: "This sentence should show extra space, " + text run at (0,18) width 296: "This sentence should show extra space, " RenderInline {SPAN} at (0,0) size 156x17 - RenderText {#text} at (296,17) size 156x17 - text run at (296,17) width 84: "except in the " - text run at (380,17) width 72: "second half" - RenderText {#text} at (452,17) size 4x17 - text run at (452,17) width 4: "." - text run at (456,17) width 0: " " - RenderTable {TABLE} at (0,308) size 913x203 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 911x201 - RenderTableRow {TR} at (0,0) size 911x25 - RenderTableCell {TD} at (0,0) size 911x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (296,18) size 156x17 + text run at (296,18) width 84: "except in the " + text run at (380,18) width 72: "second half" + RenderText {#text} at (452,18) size 4x17 + text run at (452,18) width 4: "." + text run at (456,18) width 0: " " + RenderTable {TABLE} at (0,317) size 913x212 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 911x210 + RenderTableRow {TR} at (0,0) size 911x26 + RenderTableCell {TD} at (0,0) size 911x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 911x176 - RenderTableCell {TD} at (0,100) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 899x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 891x85 - RenderText {#text} at (0,0) size 569x85 + RenderTableRow {TR} at (0,26) size 911x184 + RenderTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 899x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 891x90 + RenderText {#text} at (0,0) size 569x89 text run at (0,0) width 0: " " - text run at (0,17) width 569: "This sentence should show extra space where there would ordinarily not be any." - text run at (0,34) width 296: " There should also be preservation of returns" - text run at (0,51) width 97: "as this sentence" - text run at (0,68) width 184: " very clearly demonstrates." - RenderBlock {P} at (4,105) size 891x17 + text run at (0,18) width 569: "This sentence should show extra space where there would ordinarily not be any." + text run at (0,36) width 296: " There should also be preservation of returns" + text run at (0,54) width 97: "as this sentence" + text run at (0,72) width 184: " very clearly demonstrates." + RenderBlock {P} at (4,110) size 891x18 RenderText {#text} at (0,0) size 891x17 text run at (0,0) width 891: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - RenderBlock {P} at (4,138) size 891x34 - RenderText {#text} at (0,0) size 296x34 + RenderBlock {P} at (4,144) size 891x36 + RenderText {#text} at (0,0) size 296x35 text run at (0,0) width 0: " " - text run at (0,17) width 296: "This sentence should show extra space, " + text run at (0,18) width 296: "This sentence should show extra space, " RenderInline {SPAN} at (0,0) size 156x17 - RenderText {#text} at (296,17) size 156x17 - text run at (296,17) width 84: "except in the " - text run at (380,17) width 72: "second half" - RenderText {#text} at (452,17) size 4x17 - text run at (452,17) width 4: "." - text run at (456,17) width 0: " " + RenderText {#text} at (296,18) size 156x17 + text run at (296,18) width 84: "except in the " + text run at (380,18) width 72: "second half" + RenderText {#text} at (452,18) size 4x17 + text run at (452,18) width 4: "." + text run at (456,18) width 0: " " diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/background-expected.png index 2fa8f69b2a56..6f0f103060f9 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/background-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/background-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/background-expected.txt index f2763b179fa7..a78fc5803cbb 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/background-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/background-expected.txt @@ -1,86 +1,86 @@ -layer at (0,0) size 785x697 +layer at (0,0) size 785x721 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x697 - RenderBlock {HTML} at (0,0) size 785x697 - RenderBody {BODY} at (8,8) size 769x681 [bgcolor=#008000] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x721 + RenderBlock {HTML} at (0,0) size 785x721 + RenderBody {BODY} at (8,8) size 769x705 [bgcolor=#008000] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 648x60 text run at (0,0) width 648: "BODY {background: green url(../resources/oransqr.gif) repeat-x center top fixed;}" text run at (0,15) width 568: ".one {background: lime url(../resources/oransqr.gif) repeat-y 100% 0%;}" text run at (0,30) width 592: ".two {background: lime url(../resources/oransqr.gif) repeat-y center top;}" text run at (0,45) width 592: ".three {background: lime url(../resources/oransqr.gif) repeat-x left top;}" - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 769x52 + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 769x54 RenderText {#text} at (0,0) size 728x17 text run at (0,0) width 728: "This document should have a green background with an orange strip running across the entire top of the page, since" RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (0,20) size 64x15 - text run at (0,20) width 64: "repeat-x" - RenderText {#text} at (64,17) size 753x35 - text run at (64,17) width 298: " indicates tiling in both directions of the x-axis. " - text run at (362,17) width 298: "Furthermore, the strip should be fixed in place. " - text run at (660,17) width 93: "I'll have to add" - text run at (0,35) width 492: "extra text at the end of this page to make it long enough to scroll conveniently." - RenderBlock {P} at (0,192) size 769x51 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 762x51 + RenderText {#text} at (0,21) size 64x15 + text run at (0,21) width 64: "repeat-x" + RenderText {#text} at (64,18) size 753x35 + text run at (64,18) width 298: " indicates tiling in both directions of the x-axis. " + text run at (362,18) width 298: "Furthermore, the strip should be fixed in place. " + text run at (660,18) width 93: "I'll have to add" + text run at (0,36) width 492: "extra text at the end of this page to make it long enough to scroll conveniently." + RenderBlock {P} at (0,195) size 769x54 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 762x53 text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,17) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,34) width 119: "these declarations. " - text run at (119,34) width 308: "Hey, I didn't say the page would be pretty, did I?" - RenderBlock {P} at (0,259) size 769x51 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 762x51 + text run at (0,18) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" + text run at (0,36) width 119: "these declarations. " + text run at (119,36) width 308: "Hey, I didn't say the page would be pretty, did I?" + RenderBlock {P} at (0,265) size 769x54 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 762x53 text run at (0,0) width 752: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,17) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,34) width 119: "these declarations. " - text run at (119,34) width 308: "Hey, I didn't say the page would be pretty, did I?" - RenderBlock {P} at (0,326) size 769x51 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 762x51 + text run at (0,18) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" + text run at (0,36) width 119: "these declarations. " + text run at (119,36) width 308: "Hey, I didn't say the page would be pretty, did I?" + RenderBlock {P} at (0,335) size 769x54 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 762x53 text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,17) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,34) width 119: "these declarations. " - text run at (119,34) width 308: "Hey, I didn't say the page would be pretty, did I?" - RenderTable {TABLE} at (0,393) size 769x288 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x286 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" + text run at (0,36) width 119: "these declarations. " + text run at (119,36) width 308: "Hey, I didn't say the page would be pretty, did I?" + RenderTable {TABLE} at (0,405) size 769x300 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x298 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x261 - RenderTableCell {TD} at (0,143) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x272 + RenderTableCell {TD} at (0,149) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x261 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x52 + RenderTableCell {TD} at (12,26) size 755x272 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x54 RenderText {#text} at (0,0) size 728x17 text run at (0,0) width 728: "This document should have a green background with an orange strip running across the entire top of the page, since" RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (0,20) size 64x15 - text run at (0,20) width 64: "repeat-x" - RenderText {#text} at (64,17) size 726x35 - text run at (64,17) width 298: " indicates tiling in both directions of the x-axis. " - text run at (362,17) width 298: "Furthermore, the strip should be fixed in place. " - text run at (660,17) width 66: "I'll have to" - text run at (0,35) width 519: "add extra text at the end of this page to make it long enough to scroll conveniently." - RenderBlock {P} at (4,72) size 747x51 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 743x51 + RenderText {#text} at (0,21) size 64x15 + text run at (0,21) width 64: "repeat-x" + RenderText {#text} at (64,18) size 726x35 + text run at (64,18) width 298: " indicates tiling in both directions of the x-axis. " + text run at (362,18) width 298: "Furthermore, the strip should be fixed in place. " + text run at (660,18) width 66: "I'll have to" + text run at (0,36) width 519: "add extra text at the end of this page to make it long enough to scroll conveniently." + RenderBlock {P} at (4,74) size 747x54 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 743x53 text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,17) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,34) width 178: "handling these declarations. " - text run at (178,34) width 308: "Hey, I didn't say the page would be pretty, did I?" - RenderBlock {P} at (4,139) size 747x51 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 739x51 + text run at (0,18) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" + text run at (0,36) width 178: "handling these declarations. " + text run at (178,36) width 308: "Hey, I didn't say the page would be pretty, did I?" + RenderBlock {P} at (4,144) size 747x54 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 739x53 text run at (0,0) width 700: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the" - text run at (0,17) width 52: "bottom. " - text run at (52,17) width 687: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser" - text run at (0,34) width 194: "in handling these declarations. " - text run at (194,34) width 308: "Hey, I didn't say the page would be pretty, did I?" - RenderBlock {P} at (4,206) size 747x51 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 743x51 + text run at (0,18) width 52: "bottom. " + text run at (52,18) width 687: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser" + text run at (0,36) width 194: "in handling these declarations. " + text run at (194,36) width 308: "Hey, I didn't say the page would be pretty, did I?" + RenderBlock {P} at (4,214) size 747x54 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 743x53 text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,17) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,34) width 178: "handling these declarations. " - text run at (178,34) width 308: "Hey, I didn't say the page would be pretty, did I?" + text run at (0,18) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" + text run at (0,36) width 178: "handling these declarations. " + text run at (178,36) width 308: "Hey, I didn't say the page would be pretty, did I?" diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.png index f4df28fc1277..f91b08300dc5 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.txt index 8717e13f123b..e4c04209fa39 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/background_attachment-expected.txt @@ -1,39 +1,39 @@ -layer at (0,0) size 880x1158 +layer at (0,0) size 880x1194 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x1158 - RenderBlock {HTML} at (0,0) size 785x1159 - RenderBody {BODY} at (8,8) size 769x1143 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1194 + RenderBlock {HTML} at (0,0) size 785x1195 + RenderBody {BODY} at (8,8) size 769x1179 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x30 + RenderBlock {PRE} at (0,34) size 769x30 RenderText {#text} at (0,0) size 872x30 text run at (0,0) width 872: "BODY {background-image: url(../resources/bg.gif); background-repeat: repeat-x; background-attachment: fixed;}" text run at (0,15) width 0: " " - RenderBlock {HR} at (0,76) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 769x85 - RenderText {#text} at (0,0) size 763x85 + RenderBlock {HR} at (0,77) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 769x90 + RenderText {#text} at (0,0) size 763x89 text run at (0,0) width 763: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does" - text run at (0,17) width 201: "NOT scroll with the document. " - text run at (201,17) width 552: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when" - text run at (0,34) width 195: "the end of the page is reached. " - text run at (195,34) width 566: "In addition, the default Test Suite background should NOT appear, as it's been overridden" - text run at (0,51) width 174: "by the styles shown above. " - text run at (174,51) width 546: "I'll have to add a lot of extra text to the page in order to make all this something we can" - text run at (0,68) width 98: "actually check. " - text run at (98,68) width 227: "Don't worry, I'll think of something." - RenderBlock {P} at (0,195) size 769x17 + text run at (0,18) width 201: "NOT scroll with the document. " + text run at (201,18) width 552: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when" + text run at (0,36) width 195: "the end of the page is reached. " + text run at (195,36) width 566: "In addition, the default Test Suite background should NOT appear, as it's been overridden" + text run at (0,54) width 174: "by the styles shown above. " + text run at (174,54) width 546: "I'll have to add a lot of extra text to the page in order to make all this something we can" + text run at (0,72) width 98: "actually check. " + text run at (98,72) width 227: "Don't worry, I'll think of something." + RenderBlock {P} at (0,201) size 769x18 RenderText {#text} at (0,0) size 508x17 text run at (0,0) width 417: "In fact, why not the relevant section from the CSS1 specification? " text run at (417,0) width 91: "A capital idea." - RenderBlock {HR} at (0,228) size 769x2 [border: (1px inset #000000)] - RenderBlock {HR} at (0,238) size 769x2 [border: (1px inset #000000)] - RenderBlock {H4} at (0,261) size 769x18 + RenderBlock {HR} at (0,235) size 769x2 [border: (1px inset #000000)] + RenderBlock {HR} at (0,245) size 769x2 [border: (1px inset #000000)] + RenderBlock {H4} at (0,268) size 769x19 RenderInline {A} at (0,0) size 220x17 RenderText {#text} at (0,0) size 220x17 text run at (0,0) width 220: "5.3.5 'background-attachment'" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,299) size 769x86 + RenderBlock {P} at (0,307) size 769x91 RenderInline {EM} at (0,0) size 42x17 RenderText {#text} at (0,0) size 42x17 text run at (0,0) width 42: "Value:" @@ -41,83 +41,83 @@ layer at (0,0) size 785x1158 text run at (42,0) width 81: " scroll | fixed" RenderBR {BR} at (123,14) size 0x0 RenderInline {EM} at (0,0) size 42x17 - RenderText {#text} at (0,17) size 42x17 - text run at (0,17) width 42: "Initial:" - RenderText {#text} at (42,17) size 38x17 - text run at (42,17) width 38: " scroll" - RenderBR {BR} at (80,31) size 0x0 + RenderText {#text} at (0,18) size 42x17 + text run at (0,18) width 42: "Initial:" + RenderText {#text} at (42,18) size 38x17 + text run at (42,18) width 38: " scroll" + RenderBR {BR} at (80,32) size 0x0 RenderInline {EM} at (0,0) size 68x17 - RenderText {#text} at (0,34) size 68x17 - text run at (0,34) width 68: "Applies to:" - RenderText {#text} at (68,34) size 78x17 - text run at (68,34) width 78: " all elements" - RenderBR {BR} at (146,48) size 0x0 + RenderText {#text} at (0,36) size 68x17 + text run at (0,36) width 68: "Applies to:" + RenderText {#text} at (68,36) size 78x17 + text run at (68,36) width 78: " all elements" + RenderBR {BR} at (146,50) size 0x0 RenderInline {EM} at (0,0) size 62x17 - RenderText {#text} at (0,51) size 62x17 - text run at (0,51) width 62: "Inherited:" - RenderText {#text} at (62,51) size 20x17 - text run at (62,51) width 20: " no" - RenderBR {BR} at (82,65) size 0x0 + RenderText {#text} at (0,54) size 62x17 + text run at (0,54) width 62: "Inherited:" + RenderText {#text} at (62,54) size 20x17 + text run at (62,54) width 20: " no" + RenderBR {BR} at (82,68) size 0x0 RenderInline {EM} at (0,0) size 121x17 - RenderText {#text} at (0,68) size 121x17 - text run at (0,68) width 121: "Percentage values:" - RenderText {#text} at (121,68) size 32x17 - text run at (121,68) width 32: " N/A" - RenderBR {BR} at (153,82) size 0x0 - RenderBlock {P} at (0,400) size 769x35 - RenderText {#text} at (0,0) size 765x34 + RenderText {#text} at (0,72) size 121x17 + text run at (0,72) width 121: "Percentage values:" + RenderText {#text} at (121,72) size 32x17 + text run at (121,72) width 32: " N/A" + RenderBR {BR} at (153,86) size 0x0 + RenderBlock {P} at (0,413) size 769x37 + RenderText {#text} at (0,0) size 765x35 text run at (0,0) width 765: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas" - text run at (0,17) width 230: "or if it scrolls along with the content." - RenderBlock {PRE} at (0,450) size 769x76 + text run at (0,18) width 230: "or if it scrolls along with the content." + RenderBlock {PRE} at (0,465) size 769x76 RenderText {#text} at (0,0) size 296x75 text run at (0,0) width 72: " BODY { " text run at (0,15) width 296: " background: red url(pendant.gif);" text run at (0,30) width 256: " background-repeat: repeat-y;" text run at (0,45) width 264: " background-attachment: fixed;" text run at (0,60) width 24: " }" - RenderBlock {P} at (0,541) size 769x52 + RenderBlock {P} at (0,556) size 769x55 RenderInline {EM} at (0,0) size 72x17 RenderText {#text} at (0,0) size 72x17 text run at (0,0) width 72: "CSS1 core:" - RenderText {#text} at (72,0) size 767x51 + RenderText {#text} at (72,0) size 767x53 text run at (72,0) width 671: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,17) width 767: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that support" - text run at (0,34) width 42: "'fixed'." - RenderTable {TABLE} at (0,608) size 769x535 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x532 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 767: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that support" + text run at (0,36) width 42: "'fixed'." + RenderTable {TABLE} at (0,626) size 769x553 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x550 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x507 - RenderTableCell {TD} at (0,265) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x524 + RenderTableCell {TD} at (0,274) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x507 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x85 - RenderText {#text} at (0,0) size 747x85 + RenderTableCell {TD} at (12,26) size 755x524 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x90 + RenderText {#text} at (0,0) size 747x89 text run at (0,0) width 730: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which" - text run at (0,17) width 234: "does NOT scroll with the document. " - text run at (234,17) width 513: "It should, instead, appear to be a fixed pattern past which the content scrolls, even" - text run at (0,34) width 234: "when the end of the page is reached. " - text run at (234,34) width 494: "In addition, the default Test Suite background should NOT appear, as it's been" - text run at (0,51) width 246: "overridden by the styles shown above. " - text run at (246,51) width 497: "I'll have to add a lot of extra text to the page in order to make all this something" - text run at (0,68) width 147: "we can actually check. " - text run at (147,68) width 227: "Don't worry, I'll think of something." - RenderBlock {P} at (4,105) size 747x17 + text run at (0,18) width 234: "does NOT scroll with the document. " + text run at (234,18) width 513: "It should, instead, appear to be a fixed pattern past which the content scrolls, even" + text run at (0,36) width 234: "when the end of the page is reached. " + text run at (234,36) width 494: "In addition, the default Test Suite background should NOT appear, as it's been" + text run at (0,54) width 246: "overridden by the styles shown above. " + text run at (246,54) width 497: "I'll have to add a lot of extra text to the page in order to make all this something" + text run at (0,72) width 147: "we can actually check. " + text run at (147,72) width 227: "Don't worry, I'll think of something." + RenderBlock {P} at (4,110) size 747x18 RenderText {#text} at (0,0) size 508x17 text run at (0,0) width 417: "In fact, why not the relevant section from the CSS1 specification? " text run at (417,0) width 91: "A capital idea." - RenderBlock {HR} at (4,138) size 747x2 [border: (1px inset #000000)] - RenderBlock {HR} at (4,148) size 747x2 [border: (1px inset #000000)] - RenderBlock {H4} at (4,171) size 747x18 + RenderBlock {HR} at (4,144) size 747x2 [border: (1px inset #000000)] + RenderBlock {HR} at (4,154) size 747x2 [border: (1px inset #000000)] + RenderBlock {H4} at (4,177) size 747x19 RenderInline {A} at (0,0) size 220x17 RenderText {#text} at (0,0) size 220x17 text run at (0,0) width 220: "5.3.5 'background-attachment'" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,209) size 747x86 + RenderBlock {P} at (4,216) size 747x91 RenderInline {EM} at (0,0) size 42x17 RenderText {#text} at (0,0) size 42x17 text run at (0,0) width 42: "Value:" @@ -125,45 +125,45 @@ layer at (0,0) size 785x1158 text run at (42,0) width 81: " scroll | fixed" RenderBR {BR} at (123,14) size 0x0 RenderInline {EM} at (0,0) size 42x17 - RenderText {#text} at (0,17) size 42x17 - text run at (0,17) width 42: "Initial:" - RenderText {#text} at (42,17) size 38x17 - text run at (42,17) width 38: " scroll" - RenderBR {BR} at (80,31) size 0x0 + RenderText {#text} at (0,18) size 42x17 + text run at (0,18) width 42: "Initial:" + RenderText {#text} at (42,18) size 38x17 + text run at (42,18) width 38: " scroll" + RenderBR {BR} at (80,32) size 0x0 RenderInline {EM} at (0,0) size 68x17 - RenderText {#text} at (0,34) size 68x17 - text run at (0,34) width 68: "Applies to:" - RenderText {#text} at (68,34) size 78x17 - text run at (68,34) width 78: " all elements" - RenderBR {BR} at (146,48) size 0x0 + RenderText {#text} at (0,36) size 68x17 + text run at (0,36) width 68: "Applies to:" + RenderText {#text} at (68,36) size 78x17 + text run at (68,36) width 78: " all elements" + RenderBR {BR} at (146,50) size 0x0 RenderInline {EM} at (0,0) size 62x17 - RenderText {#text} at (0,51) size 62x17 - text run at (0,51) width 62: "Inherited:" - RenderText {#text} at (62,51) size 20x17 - text run at (62,51) width 20: " no" - RenderBR {BR} at (82,65) size 0x0 + RenderText {#text} at (0,54) size 62x17 + text run at (0,54) width 62: "Inherited:" + RenderText {#text} at (62,54) size 20x17 + text run at (62,54) width 20: " no" + RenderBR {BR} at (82,68) size 0x0 RenderInline {EM} at (0,0) size 121x17 - RenderText {#text} at (0,68) size 121x17 - text run at (0,68) width 121: "Percentage values:" - RenderText {#text} at (121,68) size 32x17 - text run at (121,68) width 32: " N/A" - RenderBR {BR} at (153,82) size 0x0 - RenderBlock {P} at (4,310) size 747x35 - RenderText {#text} at (0,0) size 718x34 + RenderText {#text} at (0,72) size 121x17 + text run at (0,72) width 121: "Percentage values:" + RenderText {#text} at (121,72) size 32x17 + text run at (121,72) width 32: " N/A" + RenderBR {BR} at (153,86) size 0x0 + RenderBlock {P} at (4,322) size 747x37 + RenderText {#text} at (0,0) size 718x35 text run at (0,0) width 718: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the" - text run at (0,17) width 277: "canvas or if it scrolls along with the content." - RenderBlock {PRE} at (4,360) size 747x76 + text run at (0,18) width 277: "canvas or if it scrolls along with the content." + RenderBlock {PRE} at (4,374) size 747x76 RenderText {#text} at (0,0) size 296x75 text run at (0,0) width 72: " BODY { " text run at (0,15) width 296: " background: red url(pendant.gif);" text run at (0,30) width 256: " background-repeat: repeat-y;" text run at (0,45) width 264: " background-attachment: fixed;" text run at (0,60) width 24: " }" - RenderBlock {P} at (4,451) size 747x52 + RenderBlock {P} at (4,465) size 747x55 RenderInline {EM} at (0,0) size 72x17 RenderText {#text} at (0,0) size 72x17 text run at (0,0) width 72: "CSS1 core:" - RenderText {#text} at (72,0) size 743x51 + RenderText {#text} at (72,0) size 743x53 text run at (72,0) width 671: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,17) width 716: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that" - text run at (0,34) width 93: "support 'fixed'." + text run at (0,18) width 716: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that" + text run at (0,36) width 93: "support 'fixed'." diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.png index a8af79f98466..44c9ae1f4c7f 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.txt index 9dd88e75e598..4429b547d91c 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/background_color-expected.txt @@ -3,78 +3,78 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 [bgcolor=#008000] + RenderBlock {P} at (0,0) size 784x18 [bgcolor=#008000] RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 296x60 text run at (0,0) width 224: "P {background-color: green;}" text run at (0,15) width 240: ".one {background-color: lime;}" text run at (0,30) width 296: ".two {background-color: transparent;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x17 [bgcolor=#008000] + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x18 [bgcolor=#008000] RenderText {#text} at (0,0) size 277x17 text run at (0,0) width 277: "This element's background should be green." - RenderBlock {P} at (0,157) size 784x17 [bgcolor=#00FF00] + RenderBlock {P} at (0,159) size 784x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 350x17 text run at (0,0) width 350: "This element's background should be lime (light green)." - RenderBlock {P} at (0,190) size 784x52 [bgcolor=#008000] + RenderBlock {P} at (0,193) size 784x54 [bgcolor=#008000] RenderText {#text} at (0,0) size 652x17 text run at (0,0) width 652: "This element's background should be green, and the last word in this sentence should also have a green " RenderInline {SPAN} at (0,0) size 75x17 RenderText {#text} at (652,0) size 75x17 text run at (652,0) width 75: "background" - RenderText {#text} at (727,0) size 779x51 + RenderText {#text} at (727,0) size 779x53 text run at (727,0) width 8: ". " text run at (735,0) width 42: "This is" - text run at (0,17) width 779: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\"" - text run at (0,34) width 109: "which was set to " + text run at (0,18) width 779: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\"" + text run at (0,36) width 109: "which was set to " RenderInline {CODE} at (0,0) size 88x15 - RenderText {#text} at (109,37) size 88x15 - text run at (109,37) width 88: "transparent" - RenderText {#text} at (197,34) size 395x17 - text run at (197,34) width 8: ". " - text run at (205,34) width 387: "If the document background is visible, the browser is in error." - RenderBlock {P} at (0,258) size 784x17 + RenderText {#text} at (109,39) size 88x15 + text run at (109,39) width 88: "transparent" + RenderText {#text} at (197,36) size 395x17 + text run at (197,36) width 8: ". " + text run at (205,36) width 387: "If the document background is visible, the browser is in error." + RenderBlock {P} at (0,263) size 784x18 RenderText {#text} at (0,0) size 744x17 text run at (0,0) width 462: "This element should allow the document background to \"shine through.\" " text run at (462,0) width 282: "There should be no green backgrounds here!" - RenderTable {TABLE} at (0,291) size 784x186 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x184 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,297) size 784x192 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x190 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x159 - RenderTableCell {TD} at (0,92) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x164 + RenderTableCell {TD} at (0,95) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x159 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x17 [bgcolor=#008000] + RenderTableCell {TD} at (12,26) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x18 [bgcolor=#008000] RenderText {#text} at (0,0) size 277x17 text run at (0,0) width 277: "This element's background should be green." - RenderBlock {P} at (4,37) size 762x17 [bgcolor=#00FF00] + RenderBlock {P} at (4,38) size 762x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 350x17 text run at (0,0) width 350: "This element's background should be lime (light green)." - RenderBlock {P} at (4,70) size 762x52 [bgcolor=#008000] + RenderBlock {P} at (4,72) size 762x54 [bgcolor=#008000] RenderText {#text} at (0,0) size 652x17 text run at (0,0) width 652: "This element's background should be green, and the last word in this sentence should also have a green " RenderInline {SPAN} at (0,0) size 75x17 RenderText {#text} at (652,0) size 75x17 text run at (652,0) width 75: "background" - RenderText {#text} at (727,0) size 749x51 + RenderText {#text} at (727,0) size 749x53 text run at (727,0) width 4: "." - text run at (0,17) width 749: "This is because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word" - text run at (0,34) width 185: "\"sentence,\" which was set to " + text run at (0,18) width 749: "This is because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word" + text run at (0,36) width 185: "\"sentence,\" which was set to " RenderInline {CODE} at (0,0) size 88x15 - RenderText {#text} at (185,37) size 88x15 - text run at (185,37) width 88: "transparent" - RenderText {#text} at (273,34) size 395x17 - text run at (273,34) width 8: ". " - text run at (281,34) width 387: "If the document background is visible, the browser is in error." - RenderBlock {P} at (4,138) size 762x17 + RenderText {#text} at (185,39) size 88x15 + text run at (185,39) width 88: "transparent" + RenderText {#text} at (273,36) size 395x17 + text run at (273,36) width 8: ". " + text run at (281,36) width 387: "If the document background is visible, the browser is in error." + RenderBlock {P} at (4,142) size 762x18 RenderText {#text} at (0,0) size 744x17 text run at (0,0) width 462: "This element should allow the document background to \"shine through.\" " text run at (462,0) width 282: "There should be no green backgrounds here!" diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.png index a749e147cfc3..c290af9dd7c5 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.txt index d4f68a6247e1..0efd7fb25eca 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/background_image-expected.txt @@ -3,90 +3,90 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 376x45 text run at (0,0) width 376: "P {background-image: url(../resources/bg.gif);}" text run at (0,15) width 240: ".one {background-image: none;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x34 - RenderText {#text} at (0,0) size 746x34 + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x36 + RenderText {#text} at (0,0) size 746x35 text run at (0,0) width 502: "This sentence should be backed by an image-- a green grid pattern, in this case. " text run at (502,0) width 244: "The background image should also tile" - text run at (0,17) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - RenderBlock {P} at (0,159) size 784x69 + text run at (0,18) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." + RenderBlock {P} at (0,162) size 784x72 RenderText {#text} at (0,0) size 596x17 text run at (0,0) width 596: "This sentence should be backed by a repeated green-grid image, as should the last three words " RenderInline {STRONG} at (0,0) size 102x17 RenderInline {SPAN} at (0,0) size 102x17 RenderText {#text} at (596,0) size 102x17 text run at (596,0) width 102: "in this sentence" - RenderText {#text} at (698,0) size 770x34 + RenderText {#text} at (698,0) size 770x35 text run at (698,0) width 8: ". " text run at (706,0) width 64: "If it is not," - text run at (0,17) width 31: "then " + text run at (0,18) width 31: "then " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (31,20) size 32x15 - text run at (31,20) width 32: "none" - RenderText {#text} at (63,17) size 169x17 - text run at (63,17) width 164: " is interpreted incorrectly. " - text run at (227,17) width 5: "(" + RenderText {#text} at (31,21) size 32x15 + text run at (31,21) width 32: "none" + RenderText {#text} at (63,18) size 169x17 + text run at (63,18) width 164: " is interpreted incorrectly. " + text run at (227,18) width 5: "(" RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (232,20) size 32x15 - text run at (232,20) width 32: "none" - RenderText {#text} at (264,17) size 771x52 - text run at (264,17) width 502: " means that the element has no background image, allowing the parent to \"shine" - text run at (0,35) width 771: "through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be" - text run at (0,52) width 50: "visible.)" - RenderBlock {P} at (0,244) size 784x34 - RenderText {#text} at (0,0) size 765x34 + RenderText {#text} at (232,21) size 32x15 + text run at (232,21) width 32: "none" + RenderText {#text} at (264,18) size 771x53 + text run at (264,18) width 502: " means that the element has no background image, allowing the parent to \"shine" + text run at (0,36) width 771: "through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be" + text run at (0,54) width 50: "visible.)" + RenderBlock {P} at (0,250) size 784x36 + RenderText {#text} at (0,0) size 765x35 text run at (0,0) width 765: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\"" - text run at (0,17) width 48: "instead." - RenderTable {TABLE} at (0,294) size 784x204 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x202 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 48: "instead." + RenderTable {TABLE} at (0,302) size 784x212 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x210 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x177 - RenderTableCell {TD} at (0,101) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x184 + RenderTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x177 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x34 - RenderText {#text} at (0,0) size 746x34 + RenderTableCell {TD} at (12,26) size 770x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x36 + RenderText {#text} at (0,0) size 746x35 text run at (0,0) width 502: "This sentence should be backed by an image-- a green grid pattern, in this case. " text run at (502,0) width 244: "The background image should also tile" - text run at (0,17) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - RenderBlock {P} at (4,54) size 762x69 + text run at (0,18) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." + RenderBlock {P} at (4,56) size 762x72 RenderText {#text} at (0,0) size 596x17 text run at (0,0) width 596: "This sentence should be backed by a repeated green-grid image, as should the last three words " RenderInline {STRONG} at (0,0) size 102x17 RenderInline {SPAN} at (0,0) size 102x17 RenderText {#text} at (596,0) size 102x17 text run at (596,0) width 102: "in this sentence" - RenderText {#text} at (698,0) size 742x34 + RenderText {#text} at (698,0) size 742x35 text run at (698,0) width 8: ". " text run at (706,0) width 36: "If it is" - text run at (0,17) width 59: "not, then " + text run at (0,18) width 59: "not, then " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (59,20) size 32x15 - text run at (59,20) width 32: "none" - RenderText {#text} at (91,17) size 169x17 - text run at (91,17) width 164: " is interpreted incorrectly. " - text run at (255,17) width 5: "(" + RenderText {#text} at (59,21) size 32x15 + text run at (59,21) width 32: "none" + RenderText {#text} at (91,18) size 169x17 + text run at (91,18) width 164: " is interpreted incorrectly. " + text run at (255,18) width 5: "(" RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (260,20) size 32x15 - text run at (260,20) width 32: "none" - RenderText {#text} at (292,17) size 750x52 - text run at (292,17) width 458: " means that the element has no background image, allowing the parent to" - text run at (0,35) width 750: "\"shine through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image" - text run at (0,52) width 115: "should be visible.)" - RenderBlock {P} at (4,139) size 762x34 - RenderText {#text} at (0,0) size 705x34 + RenderText {#text} at (260,21) size 32x15 + text run at (260,21) width 32: "none" + RenderText {#text} at (292,18) size 750x53 + text run at (292,18) width 458: " means that the element has no background image, allowing the parent to" + text run at (0,36) width 750: "\"shine through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image" + text run at (0,54) width 115: "should be visible.)" + RenderBlock {P} at (4,144) size 762x36 + RenderText {#text} at (0,0) size 705x35 text run at (0,0) width 705: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine" - text run at (0,17) width 108: "through\" instead." + text run at (0,18) width 108: "through\" instead." diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.png index 9e0ddca49bb9..c72a42fd1129 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.txt index 156301224ccb..71518509a8ac 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/background_position-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1409 +layer at (0,0) size 785x1458 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1409 - RenderBlock {HTML} at (0,0) size 785x1409 - RenderBody {BODY} at (8,8) size 769x1393 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1458 + RenderBlock {HTML} at (0,0) size 785x1458 + RenderBody {BODY} at (8,8) size 769x1442 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x255 + RenderBlock {PRE} at (0,34) size 769x255 RenderText {#text} at (0,0) size 688x255 text run at (0,0) width 648: "BODY {background-image: url(../resources/bg.gif); background-position: right top;" text run at (0,15) width 288: " background-repeat: no-repeat;}" @@ -25,108 +25,108 @@ layer at (0,0) size 785x1409 text run at (0,210) width 664: ".seven {background-image: url(../resources/bg.gif); background-position: 20px 20px;" text run at (0,225) width 488: " background-repeat: no-repeat; background-color: aqua;}" text run at (0,240) width 0: " " - RenderBlock {HR} at (0,301) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,319) size 769x17 + RenderBlock {HR} at (0,302) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,320) size 769x18 RenderText {#text} at (0,0) size 503x17 text run at (0,0) width 503: "This document should have a single, small green image in its upper right corner." - RenderBlock {P} at (0,352) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 768x51 + RenderBlock {P} at (0,354) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 768x53 text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,17) width 227: "fixed at the center of the paragraph. " - text run at (227,17) width 541: "The background color will make it easier to determine the edges of the paragraph, and" - text run at (0,34) width 262: "therefore allow you to calculate its center." - RenderBlock {P} at (0,419) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 768x51 + text run at (0,18) width 227: "fixed at the center of the paragraph. " + text run at (227,18) width 541: "The background color will make it easier to determine the edges of the paragraph, and" + text run at (0,36) width 262: "therefore allow you to calculate its center." + RenderBlock {P} at (0,424) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 768x53 text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,17) width 227: "fixed at the center of the paragraph. " - text run at (227,17) width 541: "The background color will make it easier to determine the edges of the paragraph, and" - text run at (0,34) width 262: "therefore allow you to calculate its center." - RenderBlock {P} at (0,486) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 749x51 + text run at (0,18) width 227: "fixed at the center of the paragraph. " + text run at (227,18) width 541: "The background color will make it easier to determine the edges of the paragraph, and" + text run at (0,36) width 262: "therefore allow you to calculate its center." + RenderBlock {P} at (0,494) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 749x53 text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,17) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,17) width 340: "The background color will make it easier to determine" - text run at (0,34) width 436: "the edges of the paragraph, and therefore allow you to see its corners." - RenderBlock {P} at (0,553) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 749x51 + text run at (0,18) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,18) width 340: "The background color will make it easier to determine" + text run at (0,36) width 436: "the edges of the paragraph, and therefore allow you to see its corners." + RenderBlock {P} at (0,564) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 749x53 text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,17) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,17) width 340: "The background color will make it easier to determine" - text run at (0,34) width 436: "the edges of the paragraph, and therefore allow you to see its corners." - RenderBlock {P} at (0,620) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 768x51 + text run at (0,18) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,18) width 340: "The background color will make it easier to determine" + text run at (0,36) width 436: "the edges of the paragraph, and therefore allow you to see its corners." + RenderBlock {P} at (0,634) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 768x53 text run at (0,0) width 768: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should" - text run at (0,17) width 270: "be fixed at the left center of the paragraph. " - text run at (270,17) width 443: "The background color will make it easier to determine the edges of the" - text run at (0,34) width 360: "paragraph, and therefore allow you to calculate its center." - RenderBlock {P} at (0,687) size 769x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 761x51 + text run at (0,18) width 270: "be fixed at the left center of the paragraph. " + text run at (270,18) width 443: "The background color will make it easier to determine the edges of the" + text run at (0,36) width 360: "paragraph, and therefore allow you to calculate its center." + RenderBlock {P} at (0,704) size 769x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 761x53 text run at (0,0) width 749: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down." - text run at (0,17) width 761: "The background color will make it easier to determine the edges of the paragraph, which should help in determining if all" - text run at (0,34) width 647: "this is so, and the extra text should make the element long enough for this test to be simpler to evaluate." - RenderBlock {P} at (0,754) size 769x68 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 760x68 + text run at (0,18) width 761: "The background color will make it easier to determine the edges of the paragraph, which should help in determining if all" + text run at (0,36) width 647: "this is so, and the extra text should make the element long enough for this test to be simpler to evaluate." + RenderBlock {P} at (0,774) size 769x72 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 760x71 text run at (0,0) width 749: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand" - text run at (0,17) width 760: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of" - text run at (0,34) width 80: "the element. " - text run at (80,34) width 656: "The background color will make it easier to determine the edges of the paragraph, which should assist in" - text run at (0,51) width 120: "evaluating this test." - RenderTable {TABLE} at (0,838) size 769x555 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x553 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 760: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of" + text run at (0,36) width 80: "the element. " + text run at (80,36) width 656: "The background color will make it easier to determine the edges of the paragraph, which should assist in" + text run at (0,54) width 120: "evaluating this test." + RenderTable {TABLE} at (0,862) size 769x580 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x578 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x528 - RenderTableCell {TD} at (0,276) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x528 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableRow {TR} at (0,26) size 767x552 + RenderTableCell {TD} at (0,289) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x552 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 503x17 text run at (0,0) width 503: "This document should have a single, small green image in its upper right corner." - RenderBlock {P} at (4,37) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 741x51 + RenderBlock {P} at (4,38) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 741x53 text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,17) width 227: "fixed at the center of the paragraph. " - text run at (227,17) width 514: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,34) width 289: "and therefore allow you to calculate its center." - RenderBlock {P} at (4,104) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 741x51 + text run at (0,18) width 227: "fixed at the center of the paragraph. " + text run at (227,18) width 514: "The background color will make it easier to determine the edges of the paragraph," + text run at (0,36) width 289: "and therefore allow you to calculate its center." + RenderBlock {P} at (4,108) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 741x53 text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,17) width 227: "fixed at the center of the paragraph. " - text run at (227,17) width 514: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,34) width 289: "and therefore allow you to calculate its center." - RenderBlock {P} at (4,171) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 730x51 + text run at (0,18) width 227: "fixed at the center of the paragraph. " + text run at (227,18) width 514: "The background color will make it easier to determine the edges of the paragraph," + text run at (0,36) width 289: "and therefore allow you to calculate its center." + RenderBlock {P} at (4,178) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 730x53 text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,17) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,17) width 274: "The background color will make it easier to" - text run at (0,34) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." - RenderBlock {P} at (4,238) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 730x51 + text run at (0,18) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,18) width 274: "The background color will make it easier to" + text run at (0,36) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." + RenderBlock {P} at (4,248) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 730x53 text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,17) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,17) width 274: "The background color will make it easier to" - text run at (0,34) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." - RenderBlock {P} at (4,305) size 747x51 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 736x51 + text run at (0,18) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,18) width 274: "The background color will make it easier to" + text run at (0,36) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." + RenderBlock {P} at (4,318) size 747x54 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 736x53 text run at (0,0) width 722: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image" - text run at (0,17) width 316: "should be fixed at the left center of the paragraph. " - text run at (316,17) width 420: "The background color will make it easier to determine the edges of" - text run at (0,34) width 383: "the paragraph, and therefore allow you to calculate its center." - RenderBlock {P} at (4,372) size 747x68 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 705x68 + text run at (0,18) width 316: "should be fixed at the left center of the paragraph. " + text run at (316,18) width 420: "The background color will make it easier to determine the edges of" + text run at (0,36) width 383: "the paragraph, and therefore allow you to calculate its center." + RenderBlock {P} at (4,388) size 747x72 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 705x71 text run at (0,0) width 705: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25%" - text run at (0,17) width 44: "down. " - text run at (44,17) width 650: "The background color will make it easier to determine the edges of the paragraph, which should help in" - text run at (0,34) width 698: "determining if all this is so, and the extra text should make the element long enough for this test to be simpler to" - text run at (0,51) width 56: "evaluate." - RenderBlock {P} at (4,456) size 747x68 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 744x68 + text run at (0,18) width 44: "down. " + text run at (44,18) width 650: "The background color will make it easier to determine the edges of the paragraph, which should help in" + text run at (0,36) width 698: "determining if all this is so, and the extra text should make the element long enough for this test to be simpler to" + text run at (0,54) width 56: "evaluate." + RenderBlock {P} at (4,476) size 747x72 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 744x71 text run at (0,0) width 718: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-" - text run at (0,17) width 734: "hand corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left" - text run at (0,34) width 141: "corner of the element. " - text run at (141,34) width 603: "The background color will make it easier to determine the edges of the paragraph, which should" - text run at (0,51) width 173: "assist in evaluating this test." + text run at (0,18) width 734: "hand corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left" + text run at (0,36) width 141: "corner of the element. " + text run at (141,36) width 603: "The background color will make it easier to determine the edges of the paragraph, which should" + text run at (0,54) width 173: "assist in evaluating this test." diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.png index 4c2ed4a9020c..2ac68246a747 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.txt index eb443f54c97a..18525388b6b9 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/background_repeat-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 888x1782 +layer at (0,0) size 888x1838 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x1782 - RenderBlock {HTML} at (0,0) size 785x1782 - RenderBody {BODY} at (8,8) size 769x1766 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1838 + RenderBlock {HTML} at (0,0) size 785x1838 + RenderBody {BODY} at (8,8) size 769x1822 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x225 + RenderBlock {PRE} at (0,34) size 769x225 RenderText {#text} at (0,0) size 880x225 text run at (0,0) width 672: ".one {background-image: url(../resources/oransqr.gif); background-repeat: repeat-y;}" text run at (0,15) width 672: ".two {background-image: url(../resources/oransqr.gif); background-repeat: repeat-x;}" @@ -23,274 +23,274 @@ layer at (0,0) size 785x1782 text run at (0,180) width 704: ".nine {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" text run at (0,195) width 240: " background-color: red;}" text run at (0,210) width 0: " " - RenderBlock {HR} at (0,271) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,289) size 769x52 - RenderText {#text} at (0,0) size 762x34 + RenderBlock {HR} at (0,272) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,290) size 769x54 + RenderText {#text} at (0,0) size 762x35 text run at (0,0) width 762: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default" - text run at (0,17) width 22: "for " + text run at (0,18) width 22: "for " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (22,20) size 152x15 - text run at (22,20) width 152: "background-position" - RenderText {#text} at (174,17) size 730x35 - text run at (174,17) width 320: " is '0% 0%' and that property is not declared here). " - text run at (494,17) width 236: "This is extra text included for the sole" - text run at (0,35) width 260: "purpose of making the paragraph longer. " - text run at (260,35) width 221: "Thank you for your understanding." - RenderBlock {P} at (0,357) size 769x52 - RenderText {#text} at (0,0) size 762x34 + RenderText {#text} at (22,21) size 152x15 + text run at (22,21) width 152: "background-position" + RenderText {#text} at (174,18) size 730x35 + text run at (174,18) width 320: " is '0% 0%' and that property is not declared here). " + text run at (494,18) width 236: "This is extra text included for the sole" + text run at (0,36) width 260: "purpose of making the paragraph longer. " + text run at (260,36) width 221: "Thank you for your understanding." + RenderBlock {P} at (0,360) size 769x54 + RenderText {#text} at (0,0) size 762x35 text run at (0,0) width 762: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default" - text run at (0,17) width 22: "for " + text run at (0,18) width 22: "for " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (22,20) size 152x15 - text run at (22,20) width 152: "background-position" - RenderText {#text} at (174,17) size 730x35 - text run at (174,17) width 320: " is '0% 0%' and that property is not declared here). " - text run at (494,17) width 236: "This is extra text included for the sole" - text run at (0,35) width 260: "purpose of making the paragraph longer. " - text run at (260,35) width 221: "Thank you for your understanding." - RenderBlock {P} at (0,425) size 769x52 + RenderText {#text} at (22,21) size 152x15 + text run at (22,21) width 152: "background-position" + RenderText {#text} at (174,18) size 730x35 + text run at (174,18) width 320: " is '0% 0%' and that property is not declared here). " + text run at (494,18) width 236: "This is extra text included for the sole" + text run at (0,36) width 260: "purpose of making the paragraph longer. " + text run at (260,36) width 221: "Thank you for your understanding." + RenderBlock {P} at (0,430) size 769x54 RenderText {#text} at (0,0) size 697x17 text run at (0,0) width 697: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (0,20) size 152x15 - text run at (0,20) width 152: "background-position" - RenderText {#text} at (152,17) size 762x35 - text run at (152,17) width 320: " is '0% 0%' and that property is not declared here). " - text run at (472,17) width 290: "This is extra text included for the sole purpose" - text run at (0,35) width 206: "of making the paragraph longer. " - text run at (206,35) width 221: "Thank you for your understanding." - RenderBlock {P} at (0,493) size 769x70 - RenderText {#text} at (0,0) size 762x34 + RenderText {#text} at (0,21) size 152x15 + text run at (0,21) width 152: "background-position" + RenderText {#text} at (152,18) size 762x35 + text run at (152,18) width 320: " is '0% 0%' and that property is not declared here). " + text run at (472,18) width 290: "This is extra text included for the sole purpose" + text run at (0,36) width 206: "of making the paragraph longer. " + text run at (206,36) width 221: "Thank you for your understanding." + RenderBlock {P} at (0,500) size 769x72 + RenderText {#text} at (0,0) size 762x35 text run at (0,0) width 762: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" - text run at (0,17) width 216: "exactly centered in the paragraph. " - text run at (216,17) width 100: "This is because " + text run at (0,18) width 216: "exactly centered in the paragraph. " + text run at (216,18) width 100: "This is because " RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (316,20) size 64x15 - text run at (316,20) width 64: "repeat-y" - RenderText {#text} at (380,17) size 114x17 - text run at (380,17) width 114: " specifies tiling in " + RenderText {#text} at (316,21) size 64x15 + text run at (316,21) width 64: "repeat-y" + RenderText {#text} at (380,18) size 114x17 + text run at (380,18) width 114: " specifies tiling in " RenderInline {EM} at (0,0) size 28x17 - RenderText {#text} at (494,17) size 28x17 - text run at (494,17) width 28: "both" - RenderText {#text} at (522,17) size 764x35 - text run at (522,17) width 158: " directions on the y-axis. " - text run at (680,17) width 84: "Note that this" - text run at (0,35) width 267: "test is only valid if the user agent supports " + RenderText {#text} at (494,18) size 28x17 + text run at (494,18) width 28: "both" + RenderText {#text} at (522,18) size 764x35 + text run at (522,18) width 158: " directions on the y-axis. " + text run at (680,18) width 84: "Note that this" + text run at (0,36) width 267: "test is only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (267,38) size 152x15 - text run at (267,38) width 152: "background-position" - RenderText {#text} at (419,35) size 33x17 - text run at (419,35) width 33: " (see " + RenderText {#text} at (267,39) size 152x15 + text run at (267,39) width 152: "background-position" + RenderText {#text} at (419,36) size 33x17 + text run at (419,36) width 33: " (see " RenderInline {A} at (0,0) size 57x17 [color=#0000FF] - RenderText {#text} at (452,35) size 57x17 - text run at (452,35) width 57: "test 5.3.6" - RenderText {#text} at (509,35) size 759x35 - text run at (509,35) width 13: "). " - text run at (522,35) width 237: "I'll fill the paragraph with extra text to" - text run at (0,53) width 342: "make the conformance (or lack thereof) more obvious." - RenderBlock {P} at (0,579) size 769x87 [bgcolor=#FF0000] + RenderText {#text} at (452,36) size 57x17 + text run at (452,36) width 57: "test 5.3.6" + RenderText {#text} at (509,36) size 759x35 + text run at (509,36) width 13: "). " + text run at (522,36) width 237: "I'll fill the paragraph with extra text to" + text run at (0,54) width 342: "make the conformance (or lack thereof) more obvious." + RenderBlock {P} at (0,588) size 769x90 [bgcolor=#FF0000] RenderText {#text} at (0,0) size 754x17 text run at (0,0) width 658: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " text run at (658,0) width 96: "This is because" RenderInline {CODE} at (0,0) size 136x15 - RenderText {#text} at (0,20) size 136x15 - text run at (0,20) width 136: "background-repeat" - RenderText {#text} at (136,17) size 114x17 - text run at (136,17) width 114: " specifies tiling in " + RenderText {#text} at (0,21) size 136x15 + text run at (0,21) width 136: "background-repeat" + RenderText {#text} at (136,18) size 114x17 + text run at (136,18) width 114: " specifies tiling in " RenderInline {EM} at (0,0) size 16x17 - RenderText {#text} at (250,17) size 16x17 - text run at (250,17) width 16: "all" - RenderText {#text} at (266,17) size 750x35 - text run at (266,17) width 361: " directions, regardless of the position of the origin image. " - text run at (627,17) width 123: "Note that this test is" - text run at (0,35) width 228: "only valid if the user agent supports " + RenderText {#text} at (250,18) size 16x17 + text run at (250,18) width 16: "all" + RenderText {#text} at (266,18) size 750x35 + text run at (266,18) width 361: " directions, regardless of the position of the origin image. " + text run at (627,18) width 123: "Note that this test is" + text run at (0,36) width 228: "only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (228,38) size 152x15 - text run at (228,38) width 152: "background-position" - RenderText {#text} at (380,35) size 33x17 - text run at (380,35) width 33: " (see " + RenderText {#text} at (228,39) size 152x15 + text run at (228,39) width 152: "background-position" + RenderText {#text} at (380,36) size 33x17 + text run at (380,36) width 33: " (see " RenderInline {A} at (0,0) size 57x17 [color=#0000FF] - RenderText {#text} at (413,35) size 57x17 - text run at (413,35) width 57: "test 5.3.6" - RenderText {#text} at (470,35) size 766x52 - text run at (470,35) width 13: "). " - text run at (483,35) width 275: "I'll fill the paragraph with extra text to make" - text run at (0,53) width 308: "the conformance (or lack thereof) more obvious. " - text run at (308,53) width 458: "A background color is present, although if it is visible then the image has" - text run at (0,70) width 140: "not bee correctly tiled." - RenderBlock {P} at (0,682) size 769x51 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 764x51 + RenderText {#text} at (413,36) size 57x17 + text run at (413,36) width 57: "test 5.3.6" + RenderText {#text} at (470,36) size 766x53 + text run at (470,36) width 13: "). " + text run at (483,36) width 275: "I'll fill the paragraph with extra text to make" + text run at (0,54) width 308: "the conformance (or lack thereof) more obvious. " + text run at (308,54) width 458: "A background color is present, although if it is visible then the image has" + text run at (0,72) width 140: "not bee correctly tiled." + RenderBlock {P} at (0,694) size 769x54 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 764x53 text run at (0,0) width 764: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be" - text run at (0,17) width 277: "the exact center of the top of the paragraph. " - text run at (277,17) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,34) width 58: "obvious. " - text run at (58,34) width 654: "A background color is present, although if it is visible, then the image may not have been tiled correctly." - RenderBlock {P} at (0,749) size 769x51 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 753x51 + text run at (0,18) width 277: "the exact center of the top of the paragraph. " + text run at (277,18) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" + text run at (0,36) width 58: "obvious. " + text run at (58,36) width 654: "A background color is present, although if it is visible, then the image may not have been tiled correctly." + RenderBlock {P} at (0,764) size 769x54 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 753x53 text run at (0,0) width 488: "This sentence should have a fully tiled background which starts at its top left. " text run at (488,0) width 220: "I'll fill it with extra text to make the" - text run at (0,17) width 285: "conformance (or lack thereof) more obvious. " - text run at (285,17) width 468: "A background color is present, although if it is visible, then the image may" - text run at (0,34) width 182: "not have been tiled correctly." - RenderBlock {P} at (0,816) size 769x68 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 769x68 + text run at (0,18) width 285: "conformance (or lack thereof) more obvious. " + text run at (285,18) width 468: "A background color is present, although if it is visible, then the image may" + text run at (0,36) width 182: "not have been tiled correctly." + RenderBlock {P} at (0,834) size 769x72 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 769x71 text run at (0,0) width 760: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of" - text run at (0,17) width 688: "the image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (688,17) width 81: "I'll fill it with" - text run at (0,34) width 424: "extra text to make the conformance (or lack thereof) more obvious. " - text run at (424,34) width 341: "A background color is present, although if it is visible," - text run at (0,51) width 309: "then the image may not have been tiled correctly." - RenderBlock {P} at (0,900) size 769x102 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 769x102 + text run at (0,18) width 688: "the image should be anchored in the bottom right corner, with the tiled background extending out from there. " + text run at (688,18) width 81: "I'll fill it with" + text run at (0,36) width 424: "extra text to make the conformance (or lack thereof) more obvious. " + text run at (424,36) width 341: "A background color is present, although if it is visible," + text run at (0,54) width 309: "then the image may not have been tiled correctly." + RenderBlock {P} at (0,922) size 769x108 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 769x107 text run at (0,0) width 718: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,17) width 407: "background's origin should be the exact center of the paragraph. " - text run at (407,17) width 358: "I'll fill it with extra text to make the conformance (or lack" - text run at (0,34) width 147: "thereof) more obvious. " - text run at (147,34) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (589,34) width 180: "This is true because I am not" - text run at (0,51) width 765: "able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to use in" - text run at (0,68) width 116: "this circumstance. " - text run at (116,68) width 241: "This ought to be enough text, though. " - text run at (357,68) width 395: "A background color is present, although if it is visible, then the" - text run at (0,85) width 255: "image may not have been tiled correctly." - RenderTable {TABLE} at (0,1018) size 769x748 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x746 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 407: "background's origin should be the exact center of the paragraph. " + text run at (407,18) width 358: "I'll fill it with extra text to make the conformance (or lack" + text run at (0,36) width 147: "thereof) more obvious. " + text run at (147,36) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " + text run at (589,36) width 180: "This is true because I am not" + text run at (0,54) width 765: "able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to use in" + text run at (0,72) width 116: "this circumstance. " + text run at (116,72) width 241: "This ought to be enough text, though. " + text run at (357,72) width 395: "A background color is present, although if it is visible, then the" + text run at (0,90) width 255: "image may not have been tiled correctly." + RenderTable {TABLE} at (0,1046) size 769x776 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x774 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x721 - RenderTableCell {TD} at (0,373) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x748 + RenderTableCell {TD} at (0,387) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x721 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x52 - RenderText {#text} at (0,0) size 715x34 + RenderTableCell {TD} at (12,26) size 755x748 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x54 + RenderText {#text} at (0,0) size 715x35 text run at (0,0) width 715: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the" - text run at (0,17) width 69: "default for " + text run at (0,18) width 69: "default for " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (69,20) size 152x15 - text run at (69,20) width 152: "background-position" - RenderText {#text} at (221,17) size 725x35 - text run at (221,17) width 320: " is '0% 0%' and that property is not declared here). " - text run at (541,17) width 184: "This is extra text included for" - text run at (0,35) width 312: "the sole purpose of making the paragraph longer. " - text run at (312,35) width 221: "Thank you for your understanding." - RenderBlock {P} at (4,72) size 747x52 - RenderText {#text} at (0,0) size 715x34 + RenderText {#text} at (69,21) size 152x15 + text run at (69,21) width 152: "background-position" + RenderText {#text} at (221,18) size 725x35 + text run at (221,18) width 320: " is '0% 0%' and that property is not declared here). " + text run at (541,18) width 184: "This is extra text included for" + text run at (0,36) width 312: "the sole purpose of making the paragraph longer. " + text run at (312,36) width 221: "Thank you for your understanding." + RenderBlock {P} at (4,74) size 747x54 + RenderText {#text} at (0,0) size 715x35 text run at (0,0) width 715: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the" - text run at (0,17) width 69: "default for " + text run at (0,18) width 69: "default for " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (69,20) size 152x15 - text run at (69,20) width 152: "background-position" - RenderText {#text} at (221,17) size 725x35 - text run at (221,17) width 320: " is '0% 0%' and that property is not declared here). " - text run at (541,17) width 184: "This is extra text included for" - text run at (0,35) width 312: "the sole purpose of making the paragraph longer. " - text run at (312,35) width 221: "Thank you for your understanding." - RenderBlock {P} at (4,140) size 747x52 + RenderText {#text} at (69,21) size 152x15 + text run at (69,21) width 152: "background-position" + RenderText {#text} at (221,18) size 725x35 + text run at (221,18) width 320: " is '0% 0%' and that property is not declared here). " + text run at (541,18) width 184: "This is extra text included for" + text run at (0,36) width 312: "the sole purpose of making the paragraph longer. " + text run at (312,36) width 221: "Thank you for your understanding." + RenderBlock {P} at (4,144) size 747x54 RenderText {#text} at (0,0) size 697x17 text run at (0,0) width 697: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (0,20) size 152x15 - text run at (0,20) width 152: "background-position" - RenderText {#text} at (152,17) size 708x35 - text run at (152,17) width 320: " is '0% 0%' and that property is not declared here). " - text run at (472,17) width 236: "This is extra text included for the sole" - text run at (0,35) width 260: "purpose of making the paragraph longer. " - text run at (260,35) width 221: "Thank you for your understanding." - RenderBlock {P} at (4,208) size 747x70 - RenderText {#text} at (0,0) size 720x34 + RenderText {#text} at (0,21) size 152x15 + text run at (0,21) width 152: "background-position" + RenderText {#text} at (152,18) size 708x35 + text run at (152,18) width 320: " is '0% 0%' and that property is not declared here). " + text run at (472,18) width 236: "This is extra text included for the sole" + text run at (0,36) width 260: "purpose of making the paragraph longer. " + text run at (260,36) width 221: "Thank you for your understanding." + RenderBlock {P} at (4,214) size 747x72 + RenderText {#text} at (0,0) size 720x35 text run at (0,0) width 720: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin" - text run at (0,17) width 258: "image exactly centered in the paragraph. " - text run at (258,17) width 100: "This is because " + text run at (0,18) width 258: "image exactly centered in the paragraph. " + text run at (258,18) width 100: "This is because " RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (358,20) size 64x15 - text run at (358,20) width 64: "repeat-y" - RenderText {#text} at (422,17) size 114x17 - text run at (422,17) width 114: " specifies tiling in " + RenderText {#text} at (358,21) size 64x15 + text run at (358,21) width 64: "repeat-y" + RenderText {#text} at (422,18) size 114x17 + text run at (422,18) width 114: " specifies tiling in " RenderInline {EM} at (0,0) size 28x17 - RenderText {#text} at (536,17) size 28x17 - text run at (536,17) width 28: "both" - RenderText {#text} at (564,17) size 718x35 - text run at (564,17) width 154: " directions on the y-axis." - text run at (0,35) width 355: "Note that this test is only valid if the user agent supports " + RenderText {#text} at (536,18) size 28x17 + text run at (536,18) width 28: "both" + RenderText {#text} at (564,18) size 718x35 + text run at (564,18) width 154: " directions on the y-axis." + text run at (0,36) width 355: "Note that this test is only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (355,38) size 152x15 - text run at (355,38) width 152: "background-position" - RenderText {#text} at (507,35) size 33x17 - text run at (507,35) width 33: " (see " + RenderText {#text} at (355,39) size 152x15 + text run at (355,39) width 152: "background-position" + RenderText {#text} at (507,36) size 33x17 + text run at (507,36) width 33: " (see " RenderInline {A} at (0,0) size 57x17 [color=#0000FF] - RenderText {#text} at (540,35) size 57x17 - text run at (540,35) width 57: "test 5.3.6" - RenderText {#text} at (597,35) size 737x35 - text run at (597,35) width 13: "). " - text run at (610,35) width 127: "I'll fill the paragraph" - text run at (0,53) width 452: "with extra text to make the conformance (or lack thereof) more obvious." - RenderBlock {P} at (4,294) size 747x87 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 700x34 + RenderText {#text} at (540,36) size 57x17 + text run at (540,36) width 57: "test 5.3.6" + RenderText {#text} at (597,36) size 737x35 + text run at (597,36) width 13: "). " + text run at (610,36) width 127: "I'll fill the paragraph" + text run at (0,54) width 452: "with extra text to make the conformance (or lack thereof) more obvious." + RenderBlock {P} at (4,302) size 747x90 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 700x35 text run at (0,0) width 658: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " text run at (658,0) width 42: "This is" - text run at (0,17) width 54: "because " + text run at (0,18) width 54: "because " RenderInline {CODE} at (0,0) size 136x15 - RenderText {#text} at (54,20) size 136x15 - text run at (54,20) width 136: "background-repeat" - RenderText {#text} at (190,17) size 114x17 - text run at (190,17) width 114: " specifies tiling in " + RenderText {#text} at (54,21) size 136x15 + text run at (54,21) width 136: "background-repeat" + RenderText {#text} at (190,18) size 114x17 + text run at (190,18) width 114: " specifies tiling in " RenderInline {EM} at (0,0) size 16x17 - RenderText {#text} at (304,17) size 16x17 - text run at (304,17) width 16: "all" - RenderText {#text} at (320,17) size 739x35 - text run at (320,17) width 361: " directions, regardless of the position of the origin image. " - text run at (681,17) width 58: "Note that" - text run at (0,35) width 293: "this test is only valid if the user agent supports " + RenderText {#text} at (304,18) size 16x17 + text run at (304,18) width 16: "all" + RenderText {#text} at (320,18) size 739x35 + text run at (320,18) width 361: " directions, regardless of the position of the origin image. " + text run at (681,18) width 58: "Note that" + text run at (0,36) width 293: "this test is only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x15 - RenderText {#text} at (293,38) size 152x15 - text run at (293,38) width 152: "background-position" - RenderText {#text} at (445,35) size 33x17 - text run at (445,35) width 33: " (see " + RenderText {#text} at (293,39) size 152x15 + text run at (293,39) width 152: "background-position" + RenderText {#text} at (445,36) size 33x17 + text run at (445,36) width 33: " (see " RenderInline {A} at (0,0) size 57x17 [color=#0000FF] - RenderText {#text} at (478,35) size 57x17 - text run at (478,35) width 57: "test 5.3.6" - RenderText {#text} at (535,35) size 742x52 - text run at (535,35) width 13: "). " - text run at (548,35) width 194: "I'll fill the paragraph with extra" - text run at (0,53) width 389: "text to make the conformance (or lack thereof) more obvious. " - text run at (389,53) width 337: "A background color is present, although if it is visible" - text run at (0,70) width 261: "then the image has not bee correctly tiled." - RenderBlock {P} at (4,397) size 747x51 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 745x51 + RenderText {#text} at (478,36) size 57x17 + text run at (478,36) width 57: "test 5.3.6" + RenderText {#text} at (535,36) size 742x53 + text run at (535,36) width 13: "). " + text run at (548,36) width 194: "I'll fill the paragraph with extra" + text run at (0,54) width 389: "text to make the conformance (or lack thereof) more obvious. " + text run at (389,54) width 337: "A background color is present, although if it is visible" + text run at (0,72) width 261: "then the image has not bee correctly tiled." + RenderBlock {P} at (4,408) size 747x54 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 745x53 text run at (0,0) width 745: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should" - text run at (0,17) width 296: "be the exact center of the top of the paragraph. " - text run at (296,17) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,34) width 58: "obvious. " - text run at (58,34) width 654: "A background color is present, although if it is visible, then the image may not have been tiled correctly." - RenderBlock {P} at (4,464) size 747x51 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 722x51 + text run at (0,18) width 296: "be the exact center of the top of the paragraph. " + text run at (296,18) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" + text run at (0,36) width 58: "obvious. " + text run at (58,36) width 654: "A background color is present, although if it is visible, then the image may not have been tiled correctly." + RenderBlock {P} at (4,478) size 747x54 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 722x53 text run at (0,0) width 488: "This sentence should have a fully tiled background which starts at its top left. " text run at (488,0) width 220: "I'll fill it with extra text to make the" - text run at (0,17) width 285: "conformance (or lack thereof) more obvious. " - text run at (285,17) width 437: "A background color is present, although if it is visible, then the image" - text run at (0,34) width 213: "may not have been tiled correctly." - RenderBlock {P} at (4,531) size 747x68 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 746x68 + text run at (0,18) width 285: "conformance (or lack thereof) more obvious. " + text run at (285,18) width 437: "A background color is present, although if it is visible, then the image" + text run at (0,36) width 213: "may not have been tiled correctly." + RenderBlock {P} at (4,548) size 747x72 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 746x71 text run at (0,0) width 743: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance" - text run at (0,17) width 705: "of the image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (705,17) width 37: "I'll fill" - text run at (0,34) width 468: "it with extra text to make the conformance (or lack thereof) more obvious. " - text run at (468,34) width 278: "A background color is present, although if it" - text run at (0,51) width 372: "is visible, then the image may not have been tiled correctly." - RenderBlock {P} at (4,615) size 747x102 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 743x102 + text run at (0,18) width 705: "of the image should be anchored in the bottom right corner, with the tiled background extending out from there. " + text run at (705,18) width 37: "I'll fill" + text run at (0,36) width 468: "it with extra text to make the conformance (or lack thereof) more obvious. " + text run at (468,36) width 278: "A background color is present, although if it" + text run at (0,54) width 372: "is visible, then the image may not have been tiled correctly." + RenderBlock {P} at (4,636) size 747x108 [bgcolor=#FF0000] + RenderText {#text} at (0,0) size 743x107 text run at (0,0) width 718: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,17) width 407: "background's origin should be the exact center of the paragraph. " - text run at (407,17) width 328: "I'll fill it with extra text to make the conformance (or" - text run at (0,34) width 177: "lack thereof) more obvious. " - text run at (177,34) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (619,34) width 124: "This is true because" - text run at (0,51) width 729: "I am not able to increase the text size without resorting to either headings or other CSS properties, neither of which I" - text run at (0,68) width 208: "want to use in this circumstance. " - text run at (208,68) width 241: "This ought to be enough text, though. " - text run at (449,68) width 292: "A background color is present, although if it is" - text run at (0,85) width 358: "visible, then the image may not have been tiled correctly." + text run at (0,18) width 407: "background's origin should be the exact center of the paragraph. " + text run at (407,18) width 328: "I'll fill it with extra text to make the conformance (or" + text run at (0,36) width 177: "lack thereof) more obvious. " + text run at (177,36) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " + text run at (619,36) width 124: "This is true because" + text run at (0,54) width 729: "I am not able to increase the text size without resorting to either headings or other CSS properties, neither of which I" + text run at (0,72) width 208: "want to use in this circumstance. " + text run at (208,72) width 241: "This ought to be enough text, though. " + text run at (449,72) width 292: "A background color is present, although if it is" + text run at (0,90) width 358: "visible, then the image may not have been tiled correctly." diff --git a/LayoutTests/platform/gtk/css1/color_and_background/color-expected.png b/LayoutTests/platform/gtk/css1/color_and_background/color-expected.png index 5b1a94a30e2a..9c9cb5153b9a 100644 Binary files a/LayoutTests/platform/gtk/css1/color_and_background/color-expected.png and b/LayoutTests/platform/gtk/css1/color_and_background/color-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/color_and_background/color-expected.txt b/LayoutTests/platform/gtk/css1/color_and_background/color-expected.txt index 059306748521..75c69cf2e200 100644 --- a/LayoutTests/platform/gtk/css1/color_and_background/color-expected.txt +++ b/LayoutTests/platform/gtk/css1/color_and_background/color-expected.txt @@ -3,35 +3,35 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x30 + RenderBlock {PRE} at (0,34) size 784x30 RenderText {#text} at (0,0) size 160x30 text run at (0,0) width 160: ".one {color: green;}" text run at (0,15) width 0: " " - RenderBlock {HR} at (0,76) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 784x17 [color=#008000] + RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,127) size 784x17 [color=#008000] + RenderBlock {P} at (0,129) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderTable {TABLE} at (0,160) size 216x85 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 214x83 - RenderTableRow {TR} at (0,0) size 214x25 - RenderTableCell {TD} at (0,0) size 214x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,163) size 216x88 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 214x86 + RenderTableRow {TR} at (0,0) size 214x26 + RenderTableCell {TD} at (0,0) size 214x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 214x58 - RenderTableCell {TD} at (0,41) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 202x58 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 194x17 [color=#008000] + RenderTableRow {TR} at (0,26) size 214x60 + RenderTableCell {TD} at (0,43) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 202x60 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 194x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,37) size 194x17 [color=#008000] + RenderBlock {P} at (4,38) size 194x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.png b/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.png index e3766fe725ba..c9b936b84e4b 100644 Binary files a/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.png and b/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.txt b/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.txt index 06b00fb89949..82649cbbfce6 100644 --- a/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.txt +++ b/LayoutTests/platform/gtk/css1/conformance/forward_compatible_parsing-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x3933 +layer at (0,0) size 785x4035 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x3933 - RenderBlock {HTML} at (0,0) size 785x3933 - RenderBody {BODY} at (8,8) size 769x3917 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x4035 + RenderBlock {HTML} at (0,0) size 785x4035 + RenderBody {BODY} at (8,8) size 769x4019 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x810 + RenderBlock {PRE} at (0,34) size 769x810 RenderText {#text} at (0,0) size 568x810 text run at (0,0) width 304: "P.one {color: green; rotation: 70deg;}" text run at (0,15) width 176: "P.oneb {color: green;}" @@ -62,14 +62,14 @@ layer at (0,0) size 785x3933 text run at (0,765) width 112: " color: maroon" text run at (0,780) width 208: "P.twentyfour {color: red;}" text run at (0,795) width 0: " " - RenderBlock {HR} at (0,856) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,874) size 769x17 [color=#008000] + RenderBlock {HR} at (0,857) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,875) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 485x17 text run at (0,0) width 485: "This paragraph should be green, because only the rotation should be ignored." - RenderBlock {P} at (0,907) size 769x17 [color=#008000] + RenderBlock {P} at (0,909) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 623x17 text run at (0,0) width 623: "This paragraph should be green, since error-checking should be done before calculating specificity." - RenderBlock {P} at (0,940) size 769x35 + RenderBlock {P} at (0,943) size 769x36 RenderText {#text} at (0,0) size 560x17 text run at (0,0) width 560: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " RenderInline {CODE} at (0,0) size 56x15 @@ -78,153 +78,153 @@ layer at (0,0) size 785x3933 RenderText {#text} at (616,0) size 760x35 text run at (616,0) width 144: " is an invalid keyword," text run at (0,18) width 520: "and in CSS2, it will cause the gray background (not the white grid) to be inherited." - RenderBlock {P} at (0,991) size 769x17 + RenderBlock {P} at (0,995) size 769x18 RenderText {#text} at (0,0) size 639x17 text run at (0,0) width 639: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - RenderBlock {P} at (0,1024) size 769x17 + RenderBlock {P} at (0,1029) size 769x18 RenderText {#text} at (0,0) size 639x17 text run at (0,0) width 639: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - RenderBlock {P} at (0,1057) size 769x17 + RenderBlock {P} at (0,1063) size 769x18 RenderText {#text} at (0,0) size 526x17 text run at (0,0) width 526: "This paragraph should have a white background, since keywords cannot be quoted." - RenderBlock {P} at (0,1090) size 769x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 756x34 + RenderBlock {P} at (0,1097) size 769x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 756x35 text run at (3,3) width 643: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " text run at (646,3) width 113: "This should cause" - text run at (3,20) width 318: "the user agent to use the default value of 'medium'." - RenderBlock {P} at (0,1146) size 769x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 740x34 + text run at (3,21) width 318: "the user agent to use the default value of 'medium'." + RenderBlock {P} at (0,1155) size 769x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 740x35 text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,20) width 228: "because the border-width is invalid. " - text run at (231,20) width 435: "This should cause the user agent to use the default value of 'medium'." - RenderBlock {P} at (0,1202) size 769x57 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 754x51 + text run at (3,21) width 228: "because the border-width is invalid. " + text run at (231,21) width 435: "This should cause the user agent to use the default value of 'medium'." + RenderBlock {P} at (0,1213) size 769x60 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 754x53 text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,20) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (591,20) width 166: "This should cause the user" - text run at (3,37) width 265: "agent to use the default value of 'medium'." - RenderBlock {P} at (0,1275) size 769x57 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 751x51 + text run at (3,21) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " + text run at (591,21) width 166: "This should cause the user" + text run at (3,39) width 265: "agent to use the default value of 'medium'." + RenderBlock {P} at (0,1289) size 769x60 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 751x53 text run at (3,3) width 743: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,20) width 547: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (550,20) width 204: "This should cause the user agent" - text run at (3,37) width 227: "to use the default value of 'medium'." - RenderBlock {P} at (0,1348) size 769x17 + text run at (3,21) width 547: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " + text run at (550,21) width 204: "This should cause the user agent" + text run at (3,39) width 227: "to use the default value of 'medium'." + RenderBlock {P} at (0,1365) size 769x18 RenderText {#text} at (0,0) size 660x17 text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - RenderBlock {P} at (0,1381) size 769x34 [color=#008000] - RenderText {#text} at (0,0) size 760x34 + RenderBlock {P} at (0,1399) size 769x36 [color=#008000] + RenderText {#text} at (0,0) size 760x35 text run at (0,0) width 207: "This paragraph should be green. " text run at (207,0) width 553: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" - text run at (0,17) width 237: "standards (e.g., font names or URLs.)" - RenderBlock {OL} at (0,1431) size 769x17 - RenderListItem {LI} at (40,0) size 729x17 + text run at (0,18) width 237: "standards (e.g., font names or URLs.)" + RenderBlock {OL} at (0,1451) size 769x18 + RenderListItem {LI} at (40,0) size 729x18 RenderListMarker at (-20,0) size 16x17: "1" RenderText {#text} at (0,0) size 621x17 text run at (0,0) width 621: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - RenderBlock {P} at (0,1464) size 769x34 - RenderText {#text} at (0,0) size 752x34 + RenderBlock {P} at (0,1485) size 769x36 + RenderText {#text} at (0,0) size 752x35 text run at (0,0) width 752: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is" - text run at (0,17) width 110: "not the first child." - RenderBlock {UL} at (0,1514) size 769x34 - RenderListItem {LI} at (40,0) size 729x34 + text run at (0,18) width 110: "not the first child." + RenderBlock {UL} at (0,1537) size 769x36 + RenderListItem {LI} at (40,0) size 729x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 690x34 + RenderText {#text} at (0,0) size 690x35 text run at (0,0) width 690: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,17) width 229: "CSS2, the selector should not apply." - RenderBlock {BLOCKQUOTE} at (40,1564) size 689x34 - RenderText {#text} at (0,0) size 688x34 + text run at (0,18) width 229: "CSS2, the selector should not apply." + RenderBlock {BLOCKQUOTE} at (40,1589) size 689x36 + RenderText {#text} at (0,0) size 688x35 text run at (0,0) width 688: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2," - text run at (0,17) width 184: "the selector should not apply." - RenderBlock {P} at (0,1614) size 769x34 - RenderInline {ACRONYM} at (0,0) size 748x34 - RenderText {#text} at (0,0) size 748x34 + text run at (0,18) width 184: "the selector should not apply." + RenderBlock {P} at (0,1641) size 769x36 + RenderInline {ACRONYM} at (0,0) size 748x35 + RenderText {#text} at (0,0) size 748x35 text run at (0,0) width 748: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,17) width 109: "should not apply." - RenderBlock {ADDRESS} at (0,1664) size 769x34 - RenderText {#text} at (0,0) size 745x34 + text run at (0,18) width 109: "should not apply." + RenderBlock {ADDRESS} at (0,1693) size 769x36 + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,17) width 109: "should not apply." - RenderBlock {P} at (0,1714) size 769x34 - RenderInline {SPAN} at (0,0) size 768x34 - RenderText {#text} at (0,0) size 768x34 + text run at (0,18) width 109: "should not apply." + RenderBlock {P} at (0,1745) size 769x36 + RenderInline {SPAN} at (0,0) size 768x35 + RenderText {#text} at (0,0) size 768x35 text run at (0,0) width 768: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" - text run at (0,17) width 63: "not apply." - RenderBlock {P} at (0,1764) size 769x34 - RenderText {#text} at (0,0) size 753x34 + text run at (0,18) width 63: "not apply." + RenderBlock {P} at (0,1797) size 769x36 + RenderText {#text} at (0,0) size 753x35 text run at (0,0) width 664: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " text run at (664,0) width 89: "However, it is" - text run at (0,17) width 592: "valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - RenderBlock {P} at (0,1814) size 769x17 + text run at (0,18) width 592: "valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." + RenderBlock {P} at (0,1849) size 769x18 RenderText {#text} at (0,0) size 660x17 text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - RenderBlock {P} at (0,1847) size 769x71 + RenderBlock {P} at (0,1883) size 769x72 RenderText {#text} at (0,0) size 737x17 text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (0,20) size 64x15 - text run at (0,20) width 64: "diagonal" - RenderText {#text} at (64,17) size 226x17 - text run at (64,17) width 226: " is not a valid keyword, making the " + RenderText {#text} at (0,21) size 64x15 + text run at (0,21) width 64: "diagonal" + RenderText {#text} at (64,18) size 226x17 + text run at (64,18) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x15 - RenderText {#text} at (290,20) size 120x15 - text run at (290,20) width 120: "text-decoration" - RenderText {#text} at (410,17) size 131x17 - text run at (410,17) width 55: " invalid. " - text run at (465,17) width 76: "In addition, " + RenderText {#text} at (290,21) size 120x15 + text run at (290,21) width 120: "text-decoration" + RenderText {#text} at (410,18) size 131x17 + text run at (410,18) width 55: " invalid. " + text run at (465,18) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x15 - RenderText {#text} at (541,20) size 88x15 - text run at (541,20) width 88: "highlighted" - RenderText {#text} at (629,17) size 758x35 - text run at (629,17) width 129: " is not a valid part of" - text run at (0,35) width 23: "the " + RenderText {#text} at (541,21) size 88x15 + text run at (541,21) width 88: "highlighted" + RenderText {#text} at (629,18) size 758x35 + text run at (629,18) width 129: " is not a valid part of" + text run at (0,36) width 23: "the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (23,38) size 32x15 - text run at (23,38) width 32: "font" - RenderText {#text} at (55,35) size 721x35 - text run at (55,35) width 179: " property, making it invalid. " - text run at (234,35) width 487: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,53) width 71: "paragraph. " - text run at (71,53) width 190: "If this is not the case, then the " + RenderText {#text} at (23,39) size 32x15 + text run at (23,39) width 32: "font" + RenderText {#text} at (55,36) size 721x35 + text run at (55,36) width 179: " property, making it invalid. " + text run at (234,36) width 487: "Therefore, this paragraph's font should be the UA default, and match the next" + text run at (0,54) width 71: "paragraph. " + text run at (71,54) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (261,56) size 32x15 - text run at (261,56) width 32: "font" - RenderText {#text} at (293,53) size 248x17 - text run at (293,53) width 248: " declaration is being improperly parsed." - RenderBlock {P} at (0,1934) size 769x71 + RenderText {#text} at (261,57) size 32x15 + text run at (261,57) width 32: "font" + RenderText {#text} at (293,54) size 248x17 + text run at (293,54) width 248: " declaration is being improperly parsed." + RenderBlock {P} at (0,1971) size 769x72 RenderText {#text} at (0,0) size 737x17 text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (0,20) size 64x15 - text run at (0,20) width 64: "diagonal" - RenderText {#text} at (64,17) size 226x17 - text run at (64,17) width 226: " is not a valid keyword, making the " + RenderText {#text} at (0,21) size 64x15 + text run at (0,21) width 64: "diagonal" + RenderText {#text} at (64,18) size 226x17 + text run at (64,18) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x15 - RenderText {#text} at (290,20) size 120x15 - text run at (290,20) width 120: "text-decoration" - RenderText {#text} at (410,17) size 131x17 - text run at (410,17) width 55: " invalid. " - text run at (465,17) width 76: "In addition, " + RenderText {#text} at (290,21) size 120x15 + text run at (290,21) width 120: "text-decoration" + RenderText {#text} at (410,18) size 131x17 + text run at (410,18) width 55: " invalid. " + text run at (465,18) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x15 - RenderText {#text} at (541,20) size 88x15 - text run at (541,20) width 88: "highlighted" - RenderText {#text} at (629,17) size 758x35 - text run at (629,17) width 129: " is not a valid part of" - text run at (0,35) width 23: "the " + RenderText {#text} at (541,21) size 88x15 + text run at (541,21) width 88: "highlighted" + RenderText {#text} at (629,18) size 758x35 + text run at (629,18) width 129: " is not a valid part of" + text run at (0,36) width 23: "the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (23,38) size 32x15 - text run at (23,38) width 32: "font" - RenderText {#text} at (55,35) size 748x35 - text run at (55,35) width 179: " property, making it invalid. " - text run at (234,35) width 514: "Therefore, this paragraph's font should be the UA default, and match the previous" - text run at (0,53) width 71: "paragraph. " - text run at (71,53) width 190: "If this is not the case, then the " + RenderText {#text} at (23,39) size 32x15 + text run at (23,39) width 32: "font" + RenderText {#text} at (55,36) size 748x35 + text run at (55,36) width 179: " property, making it invalid. " + text run at (234,36) width 514: "Therefore, this paragraph's font should be the UA default, and match the previous" + text run at (0,54) width 71: "paragraph. " + text run at (71,54) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (261,56) size 32x15 - text run at (261,56) width 32: "font" - RenderText {#text} at (293,53) size 248x17 - text run at (293,53) width 248: " declaration is being improperly parsed." - RenderBlock {P} at (0,2021) size 769x51 + RenderText {#text} at (261,57) size 32x15 + text run at (261,57) width 32: "font" + RenderText {#text} at (293,54) size 248x17 + text run at (293,54) width 248: " declaration is being improperly parsed." + RenderBlock {P} at (0,2059) size 769x54 RenderText {#text} at (0,0) size 530x17 text run at (0,0) width 501: "The text of this paragraph should be normal size because the selector is invalid. " text run at (501,0) width 29: "The " @@ -236,60 +236,60 @@ layer at (0,0) size 785x3933 RenderInline {STRONG} at (0,0) size 72x17 RenderText {#text} at (684,0) size 72x17 text run at (684,0) width 72: "strong text" - RenderText {#text} at (0,17) size 761x34 - text run at (0,17) width 761: "within it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there" - text run at (0,34) width 520: "could be an operator within the selector that has higher precedence than a comma)." - RenderBlock {P} at (0,2088) size 769x34 + RenderText {#text} at (0,18) size 761x35 + text run at (0,18) width 761: "within it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there" + text run at (0,36) width 520: "could be an operator within the selector that has higher precedence than a comma)." + RenderBlock {P} at (0,2129) size 769x36 RenderText {#text} at (0,0) size 464x17 text run at (0,0) width 464: "This paragraph should be black, because the line before the declaration is " RenderInline {STRONG} at (0,0) size 22x17 RenderText {#text} at (464,0) size 22x17 text run at (464,0) width 22: "not" - RenderText {#text} at (486,0) size 743x34 + RenderText {#text} at (486,0) size 743x35 text run at (486,0) width 257: " a comment and therefore the selector for" - text run at (0,17) width 139: "P.nineteenb is invalid." - RenderBlock {P} at (0,2138) size 769x17 [color=#0000FF] + text run at (0,18) width 139: "P.nineteenb is invalid." + RenderBlock {P} at (0,2181) size 769x18 [color=#0000FF] RenderText {#text} at (0,0) size 470x17 text run at (0,0) width 470: "This paragraph should be blue, because only the first declaration is invalid." - RenderBlock {P} at (0,2171) size 769x17 [color=#008000] + RenderBlock {P} at (0,2215) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 478x17 text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - RenderBlock {P} at (0,2204) size 769x17 [color=#800080] + RenderBlock {P} at (0,2249) size 769x18 [color=#800080] RenderText {#text} at (0,0) size 483x17 text run at (0,0) width 483: "This paragraph should be purple, because only the first declaration is invalid." - RenderBlock {P} at (0,2237) size 769x17 [color=#008000] + RenderBlock {P} at (0,2283) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 478x17 text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - RenderBlock {P} at (0,2270) size 769x17 [color=#008000] + RenderBlock {P} at (0,2317) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 478x17 text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - RenderBlock {P} at (0,2303) size 769x17 + RenderBlock {P} at (0,2351) size 769x18 RenderText {#text} at (48,0) size 601x17 text run at (48,0) width 485: "This paragraph should be indented half an inch, but it should not be maroon. " text run at (533,0) width 116: "It should be black." - RenderBlock {P} at (0,2336) size 769x34 - RenderText {#text} at (0,0) size 751x34 + RenderBlock {P} at (0,2385) size 769x36 + RenderText {#text} at (0,0) size 751x35 text run at (0,0) width 751: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,17) width 616: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." - RenderTable {TABLE} at (0,2386) size 769x1531 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1529 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 616: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." + RenderTable {TABLE} at (0,2437) size 769x1582 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1580 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1504 - RenderTableCell {TD} at (0,764) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1504 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [color=#008000] + RenderTableRow {TR} at (0,26) size 767x1554 + RenderTableCell {TD} at (0,790) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x1554 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 485x17 text run at (0,0) width 485: "This paragraph should be green, because only the rotation should be ignored." - RenderBlock {P} at (4,37) size 747x17 [color=#008000] + RenderBlock {P} at (4,38) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 623x17 text run at (0,0) width 623: "This paragraph should be green, since error-checking should be done before calculating specificity." - RenderBlock {P} at (4,70) size 747x35 + RenderBlock {P} at (4,72) size 747x36 RenderText {#text} at (0,0) size 560x17 text run at (0,0) width 560: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " RenderInline {CODE} at (0,0) size 56x15 @@ -298,153 +298,153 @@ layer at (0,0) size 785x3933 RenderText {#text} at (616,0) size 696x35 text run at (616,0) width 80: " is an invalid" text run at (0,18) width 584: "keyword, and in CSS2, it will cause the gray background (not the white grid) to be inherited." - RenderBlock {P} at (4,121) size 747x17 + RenderBlock {P} at (4,124) size 747x18 RenderText {#text} at (0,0) size 639x17 text run at (0,0) width 639: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - RenderBlock {P} at (4,154) size 747x17 + RenderBlock {P} at (4,158) size 747x18 RenderText {#text} at (0,0) size 639x17 text run at (0,0) width 639: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - RenderBlock {P} at (4,187) size 747x17 + RenderBlock {P} at (4,192) size 747x18 RenderText {#text} at (0,0) size 526x17 text run at (0,0) width 526: "This paragraph should have a white background, since keywords cannot be quoted." - RenderBlock {P} at (4,220) size 747x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 717x34 + RenderBlock {P} at (4,226) size 747x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 717x35 text run at (3,3) width 643: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " text run at (646,3) width 74: "This should" - text run at (3,20) width 357: "cause the user agent to use the default value of 'medium'." - RenderBlock {P} at (4,276) size 747x40 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 740x34 + text run at (3,21) width 357: "cause the user agent to use the default value of 'medium'." + RenderBlock {P} at (4,284) size 747x42 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 740x35 text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,20) width 228: "because the border-width is invalid. " - text run at (231,20) width 435: "This should cause the user agent to use the default value of 'medium'." - RenderBlock {P} at (4,332) size 747x57 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 740x51 + text run at (3,21) width 228: "because the border-width is invalid. " + text run at (231,21) width 435: "This should cause the user agent to use the default value of 'medium'." + RenderBlock {P} at (4,342) size 747x60 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 740x53 text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,20) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (591,20) width 136: "This should cause the" - text run at (3,37) width 295: "user agent to use the default value of 'medium'." - RenderBlock {P} at (4,405) size 747x57 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 736x51 + text run at (3,21) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " + text run at (591,21) width 136: "This should cause the" + text run at (3,39) width 295: "user agent to use the default value of 'medium'." + RenderBlock {P} at (4,418) size 747x60 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 736x53 text run at (3,3) width 720: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because" - text run at (3,20) width 570: "the border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (573,20) width 166: "This should cause the user" - text run at (3,37) width 265: "agent to use the default value of 'medium'." - RenderBlock {P} at (4,478) size 747x17 + text run at (3,21) width 570: "the border-width does not have any value to go with its pixel unit, and is therefore invalid. " + text run at (573,21) width 166: "This should cause the user" + text run at (3,39) width 265: "agent to use the default value of 'medium'." + RenderBlock {P} at (4,494) size 747x18 RenderText {#text} at (0,0) size 660x17 text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - RenderBlock {P} at (4,511) size 747x34 [color=#008000] - RenderText {#text} at (0,0) size 724x34 + RenderBlock {P} at (4,528) size 747x36 [color=#008000] + RenderText {#text} at (0,0) size 724x35 text run at (0,0) width 207: "This paragraph should be green. " text run at (207,0) width 517: "CSS is case-insensitive, unless required to be case sensitive due to interaction with" - text run at (0,17) width 273: "other standards (e.g., font names or URLs.)" - RenderBlock {OL} at (4,561) size 747x17 - RenderListItem {LI} at (40,0) size 707x17 + text run at (0,18) width 273: "other standards (e.g., font names or URLs.)" + RenderBlock {OL} at (4,580) size 747x18 + RenderListItem {LI} at (40,0) size 707x18 RenderListMarker at (-20,0) size 16x17: "1" RenderText {#text} at (0,0) size 621x17 text run at (0,0) width 621: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - RenderBlock {P} at (4,594) size 747x34 - RenderText {#text} at (0,0) size 738x34 + RenderBlock {P} at (4,614) size 747x36 + RenderText {#text} at (0,0) size 738x35 text run at (0,0) width 738: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph" - text run at (0,17) width 124: "is not the first child." - RenderBlock {UL} at (4,644) size 747x34 - RenderListItem {LI} at (40,0) size 707x34 + text run at (0,18) width 124: "is not the first child." + RenderBlock {UL} at (4,666) size 747x36 + RenderListItem {LI} at (40,0) size 707x36 RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 690x34 + RenderText {#text} at (0,0) size 690x35 text run at (0,0) width 690: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,17) width 229: "CSS2, the selector should not apply." - RenderBlock {BLOCKQUOTE} at (44,694) size 667x34 - RenderText {#text} at (0,0) size 643x34 + text run at (0,18) width 229: "CSS2, the selector should not apply." + RenderBlock {BLOCKQUOTE} at (44,718) size 667x36 + RenderText {#text} at (0,0) size 643x35 text run at (0,0) width 643: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,17) width 229: "CSS2, the selector should not apply." - RenderBlock {P} at (4,744) size 747x34 - RenderInline {ACRONYM} at (0,0) size 696x34 - RenderText {#text} at (0,0) size 696x34 + text run at (0,18) width 229: "CSS2, the selector should not apply." + RenderBlock {P} at (4,770) size 747x36 + RenderInline {ACRONYM} at (0,0) size 696x35 + RenderText {#text} at (0,0) size 696x35 text run at (0,0) width 696: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,17) width 161: "selector should not apply." - RenderBlock {ADDRESS} at (4,794) size 747x34 - RenderText {#text} at (0,0) size 745x34 + text run at (0,18) width 161: "selector should not apply." + RenderBlock {ADDRESS} at (4,822) size 747x36 + RenderText {#text} at (0,0) size 745x35 text run at (0,0) width 745: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,17) width 109: "should not apply." - RenderBlock {P} at (4,844) size 747x34 - RenderInline {SPAN} at (0,0) size 722x34 - RenderText {#text} at (0,0) size 722x34 + text run at (0,18) width 109: "should not apply." + RenderBlock {P} at (4,874) size 747x36 + RenderInline {SPAN} at (0,0) size 722x35 + RenderText {#text} at (0,0) size 722x35 text run at (0,0) width 722: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,17) width 109: "should not apply." - RenderBlock {P} at (4,894) size 747x34 - RenderText {#text} at (0,0) size 739x34 + text run at (0,18) width 109: "should not apply." + RenderBlock {P} at (4,926) size 747x36 + RenderText {#text} at (0,0) size 739x35 text run at (0,0) width 664: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " text run at (664,0) width 75: "However, it" - text run at (0,17) width 606: "is valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - RenderBlock {P} at (4,944) size 747x17 + text run at (0,18) width 606: "is valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." + RenderBlock {P} at (4,978) size 747x18 RenderText {#text} at (0,0) size 660x17 text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - RenderBlock {P} at (4,977) size 747x71 + RenderBlock {P} at (4,1012) size 747x72 RenderText {#text} at (0,0) size 737x17 text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (0,20) size 64x15 - text run at (0,20) width 64: "diagonal" - RenderText {#text} at (64,17) size 226x17 - text run at (64,17) width 226: " is not a valid keyword, making the " + RenderText {#text} at (0,21) size 64x15 + text run at (0,21) width 64: "diagonal" + RenderText {#text} at (64,18) size 226x17 + text run at (64,18) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x15 - RenderText {#text} at (290,20) size 120x15 - text run at (290,20) width 120: "text-decoration" - RenderText {#text} at (410,17) size 131x17 - text run at (410,17) width 55: " invalid. " - text run at (465,17) width 76: "In addition, " + RenderText {#text} at (290,21) size 120x15 + text run at (290,21) width 120: "text-decoration" + RenderText {#text} at (410,18) size 131x17 + text run at (410,18) width 55: " invalid. " + text run at (465,18) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x15 - RenderText {#text} at (541,20) size 88x15 - text run at (541,20) width 88: "highlighted" - RenderText {#text} at (629,17) size 741x35 - text run at (629,17) width 112: " is not a valid part" - text run at (0,35) width 40: "of the " + RenderText {#text} at (541,21) size 88x15 + text run at (541,21) width 88: "highlighted" + RenderText {#text} at (629,18) size 741x35 + text run at (629,18) width 112: " is not a valid part" + text run at (0,36) width 40: "of the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (40,38) size 32x15 - text run at (40,38) width 32: "font" - RenderText {#text} at (72,35) size 738x35 - text run at (72,35) width 179: " property, making it invalid. " - text run at (251,35) width 487: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,53) width 71: "paragraph. " - text run at (71,53) width 190: "If this is not the case, then the " + RenderText {#text} at (40,39) size 32x15 + text run at (40,39) width 32: "font" + RenderText {#text} at (72,36) size 738x35 + text run at (72,36) width 179: " property, making it invalid. " + text run at (251,36) width 487: "Therefore, this paragraph's font should be the UA default, and match the next" + text run at (0,54) width 71: "paragraph. " + text run at (71,54) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (261,56) size 32x15 - text run at (261,56) width 32: "font" - RenderText {#text} at (293,53) size 248x17 - text run at (293,53) width 248: " declaration is being improperly parsed." - RenderBlock {P} at (4,1064) size 747x71 + RenderText {#text} at (261,57) size 32x15 + text run at (261,57) width 32: "font" + RenderText {#text} at (293,54) size 248x17 + text run at (293,54) width 248: " declaration is being improperly parsed." + RenderBlock {P} at (4,1100) size 747x72 RenderText {#text} at (0,0) size 737x17 text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x15 - RenderText {#text} at (0,20) size 64x15 - text run at (0,20) width 64: "diagonal" - RenderText {#text} at (64,17) size 226x17 - text run at (64,17) width 226: " is not a valid keyword, making the " + RenderText {#text} at (0,21) size 64x15 + text run at (0,21) width 64: "diagonal" + RenderText {#text} at (64,18) size 226x17 + text run at (64,18) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x15 - RenderText {#text} at (290,20) size 120x15 - text run at (290,20) width 120: "text-decoration" - RenderText {#text} at (410,17) size 131x17 - text run at (410,17) width 55: " invalid. " - text run at (465,17) width 76: "In addition, " + RenderText {#text} at (290,21) size 120x15 + text run at (290,21) width 120: "text-decoration" + RenderText {#text} at (410,18) size 131x17 + text run at (410,18) width 55: " invalid. " + text run at (465,18) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x15 - RenderText {#text} at (541,20) size 88x15 - text run at (541,20) width 88: "highlighted" - RenderText {#text} at (629,17) size 741x35 - text run at (629,17) width 112: " is not a valid part" - text run at (0,35) width 40: "of the " + RenderText {#text} at (541,21) size 88x15 + text run at (541,21) width 88: "highlighted" + RenderText {#text} at (629,18) size 741x35 + text run at (629,18) width 112: " is not a valid part" + text run at (0,36) width 40: "of the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (40,38) size 32x15 - text run at (40,38) width 32: "font" - RenderText {#text} at (72,35) size 707x35 - text run at (72,35) width 179: " property, making it invalid. " - text run at (251,35) width 456: "Therefore, this paragraph's font should be the UA default, and match the" - text run at (0,53) width 129: "previous paragraph. " - text run at (129,53) width 190: "If this is not the case, then the " + RenderText {#text} at (40,39) size 32x15 + text run at (40,39) width 32: "font" + RenderText {#text} at (72,36) size 707x35 + text run at (72,36) width 179: " property, making it invalid. " + text run at (251,36) width 456: "Therefore, this paragraph's font should be the UA default, and match the" + text run at (0,54) width 129: "previous paragraph. " + text run at (129,54) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (319,56) size 32x15 - text run at (319,56) width 32: "font" - RenderText {#text} at (351,53) size 248x17 - text run at (351,53) width 248: " declaration is being improperly parsed." - RenderBlock {P} at (4,1151) size 747x51 + RenderText {#text} at (319,57) size 32x15 + text run at (319,57) width 32: "font" + RenderText {#text} at (351,54) size 248x17 + text run at (351,54) width 248: " declaration is being improperly parsed." + RenderBlock {P} at (4,1188) size 747x54 RenderText {#text} at (0,0) size 530x17 text run at (0,0) width 501: "The text of this paragraph should be normal size because the selector is invalid. " text run at (501,0) width 29: "The " @@ -453,42 +453,42 @@ layer at (0,0) size 785x3933 text run at (530,0) width 100: "emphasized text" RenderText {#text} at (630,0) size 54x17 text run at (630,0) width 54: " and the " - RenderInline {STRONG} at (0,0) size 727x34 - RenderText {#text} at (684,0) size 727x34 + RenderInline {STRONG} at (0,0) size 727x35 + RenderText {#text} at (684,0) size 727x35 text run at (684,0) width 43: "strong" - text run at (0,17) width 25: "text" - RenderText {#text} at (25,17) size 718x34 - text run at (25,17) width 693: " within it should also be normal size, since the entire ruleset should be skipped (since in some future version of" - text run at (0,34) width 592: "CSS, there could be an operator within the selector that has higher precedence than a comma)." - RenderBlock {P} at (4,1218) size 747x34 + text run at (0,18) width 25: "text" + RenderText {#text} at (25,18) size 718x35 + text run at (25,18) width 693: " within it should also be normal size, since the entire ruleset should be skipped (since in some future version of" + text run at (0,36) width 592: "CSS, there could be an operator within the selector that has higher precedence than a comma)." + RenderBlock {P} at (4,1258) size 747x36 RenderText {#text} at (0,0) size 464x17 text run at (0,0) width 464: "This paragraph should be black, because the line before the declaration is " RenderInline {STRONG} at (0,0) size 22x17 RenderText {#text} at (464,0) size 22x17 text run at (464,0) width 22: "not" - RenderText {#text} at (486,0) size 743x34 + RenderText {#text} at (486,0) size 743x35 text run at (486,0) width 257: " a comment and therefore the selector for" - text run at (0,17) width 139: "P.nineteenb is invalid." - RenderBlock {P} at (4,1268) size 747x17 [color=#0000FF] + text run at (0,18) width 139: "P.nineteenb is invalid." + RenderBlock {P} at (4,1310) size 747x18 [color=#0000FF] RenderText {#text} at (0,0) size 470x17 text run at (0,0) width 470: "This paragraph should be blue, because only the first declaration is invalid." - RenderBlock {P} at (4,1301) size 747x17 [color=#008000] + RenderBlock {P} at (4,1344) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 478x17 text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - RenderBlock {P} at (4,1334) size 747x17 [color=#800080] + RenderBlock {P} at (4,1378) size 747x18 [color=#800080] RenderText {#text} at (0,0) size 483x17 text run at (0,0) width 483: "This paragraph should be purple, because only the first declaration is invalid." - RenderBlock {P} at (4,1367) size 747x17 [color=#008000] + RenderBlock {P} at (4,1412) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 478x17 text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - RenderBlock {P} at (4,1400) size 747x17 [color=#008000] + RenderBlock {P} at (4,1446) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 478x17 text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - RenderBlock {P} at (4,1433) size 747x17 + RenderBlock {P} at (4,1480) size 747x18 RenderText {#text} at (48,0) size 601x17 text run at (48,0) width 485: "This paragraph should be indented half an inch, but it should not be maroon. " text run at (533,0) width 116: "It should be black." - RenderBlock {P} at (4,1466) size 747x34 - RenderText {#text} at (0,0) size 728x34 + RenderBlock {P} at (4,1514) size 747x36 + RenderText {#text} at (0,0) size 728x35 text run at (0,0) width 728: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of" - text run at (0,17) width 639: "the selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." + text run at (0,18) width 639: "the selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." diff --git a/LayoutTests/platform/gtk/css1/font_properties/font-expected.png b/LayoutTests/platform/gtk/css1/font_properties/font-expected.png index 48dd175729d4..c4752ef18013 100644 Binary files a/LayoutTests/platform/gtk/css1/font_properties/font-expected.png and b/LayoutTests/platform/gtk/css1/font_properties/font-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/font_properties/font-expected.txt b/LayoutTests/platform/gtk/css1/font_properties/font-expected.txt index d828ec7c8c89..97ed9aefa11c 100644 --- a/LayoutTests/platform/gtk/css1/font_properties/font-expected.txt +++ b/LayoutTests/platform/gtk/css1/font_properties/font-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x4374 +layer at (0,0) size 785x4381 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x4374 - RenderBlock {HTML} at (0,0) size 785x4374 - RenderBody {BODY} at (8,8) size 769x4358 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x14 +layer at (0,0) size 785x4381 + RenderBlock {HTML} at (0,0) size 785x4381 + RenderBody {BODY} at (8,8) size 769x4365 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x15 RenderText {#text} at (0,0) size 264x14 text run at (0,0) width 264: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,26) size 769x168 + RenderBlock {PRE} at (0,27) size 769x168 RenderText {#text} at (0,0) size 399x168 text run at (0,0) width 161: "BODY {font-size: 12px;}" text run at (0,14) width 322: ".one {font: italic small-caps 13pt Helvetica;}" @@ -20,29 +20,29 @@ layer at (0,0) size 785x4374 text run at (0,126) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}" text run at (0,140) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}" text run at (0,154) width 266: "SPAN.color {background-color: silver;}" - RenderBlock {HR} at (0,206) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,220) size 769x14 + RenderBlock {HR} at (0,207) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,221) size 769x15 RenderText {#text} at (0,0) size 706x14 text run at (0,0) width 423: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " text run at (423,0) width 283: "This is the \"base font size\" referred to in the following tests." - RenderBlock {P} at (0,251) size 769x20 + RenderBlock {P} at (0,253) size 769x21 RenderText {#text} at (0,0) size 497x19 text run at (0,0) width 497: "This element should be 13pt. Helvetica which is in small-cap italics." - RenderBlock {P} at (0,288) size 769x82 + RenderBlock {P} at (0,291) size 769x82 RenderText {#text} at (0,3) size 762x74 text run at (0,3) width 282: "This element should be in a serif font. " text run at (282,3) width 480: "Its font-size should be 150% the base font size, and its line-height" text run at (0,30) width 423: "should 150% of that value (18px and 27px, respectively). " text run at (423,30) width 297: "Extra text is included for the purposes of" text run at (0,57) width 208: "testing this more effectively." - RenderBlock {P} at (0,387) size 769x82 + RenderBlock {P} at (0,390) size 769x82 RenderText {#text} at (0,3) size 760x74 text run at (0,3) width 348: "This element should be in a sans-serif font. " text run at (348,3) width 412: "Its font-size should be 150% the base font size, and" text run at (0,30) width 568: "its line-height should 150% of that value (18px and 27px, respectively). " text run at (568,30) width 192: "Extra text is included for" text run at (0,57) width 351: "the purposes of testing this more effectively." - RenderBlock {P} at (0,486) size 769x81 + RenderBlock {P} at (0,489) size 769x81 RenderText {#text} at (0,5) size 749x41 text run at (0,5) width 619: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " text run at (619,5) width 130: "For example, if the font-" @@ -55,7 +55,7 @@ layer at (0,0) size 785x4374 text run at (408,31) width 274: "The actual value of the font-size is UA-dependent. " text run at (682,31) width 65: "Extra text is" text run at (0,59) width 308: "included for the purposes of testing this more effectively." - RenderBlock {P} at (0,584) size 769x109 + RenderBlock {P} at (0,587) size 769x109 RenderText {#text} at (0,3) size 750x101 text run at (0,3) width 728: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. " text run at (728,3) width 22: "Its" @@ -63,7 +63,7 @@ layer at (0,0) size 785x4374 text run at (0,57) width 246: "(18px and 27px, respectively). " text run at (246,57) width 480: "Extra text is included for the purposes of testing this more" text run at (0,84) width 95: "effectively." - RenderBlock {P} at (0,710) size 769x217 + RenderBlock {P} at (0,713) size 769x217 RenderText {#text} at (0,17) size 745x182 text run at (0,17) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " text run at (723,17) width 22: "Its" @@ -71,7 +71,7 @@ layer at (0,0) size 785x4374 text run at (0,125) width 245: "(18px and 54px, respectively). " text run at (245,125) width 479: "Extra text is included for the purposes of testing this more" text run at (0,179) width 94: "effectively." - RenderBlock {P} at (0,944) size 769x145 + RenderBlock {P} at (0,947) size 769x145 RenderText {#text} at (0,8) size 750x128 text run at (0,8) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of" text run at (0,44) width 55: "900. " @@ -79,14 +79,14 @@ layer at (0,0) size 785x4374 text run at (0,80) width 618: "2em, or twice the element's font size (18px and 36px, respectively). " text run at (618,80) width 113: "Extra text is" text run at (0,116) width 499: "included for the purposes of testing this more effectively." - RenderBlock {P} at (0,1106) size 769x289 + RenderBlock {P} at (0,1109) size 769x289 RenderText {#text} at (0,38) size 745x212 text run at (0,38) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " text run at (723,38) width 22: "Its" text run at (0,134) width 693: "font-size should be 150% the base font size, or 18px, and its line-height should be 1in. " text run at (693,134) width 47: "Extra" text run at (0,230) width 526: "text is included for the purposes of testing this more effectively." - RenderBlock {P} at (0,1412) size 769x145 + RenderBlock {P} at (0,1415) size 769x145 RenderText {#text} at (0,8) size 752x128 text run at (0,8) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of" text run at (0,44) width 40: "700. " @@ -94,12 +94,12 @@ layer at (0,0) size 785x4374 text run at (0,80) width 176: "element's font size). " text run at (176,80) width 500: "Extra text is included for the purposes of testing this more" text run at (0,116) width 93: "effectively." - RenderBlock {P} at (0,1574) size 769x51 + RenderBlock {P} at (0,1577) size 769x51 RenderText {#text} at (0,7) size 754x36 text run at (0,7) width 301: "This element should be in a sans-serif font, with a weight of 400. " text run at (301,7) width 453: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." text run at (0,32) width 318: "Extra text is included for the purposes of testing this more effectively." - RenderBlock {P} at (0,1642) size 769x271 + RenderBlock {P} at (0,1645) size 769x271 RenderInline {SPAN} at (0,0) size 761x236 [bgcolor=#C0C0C0] RenderText {#text} at (0,17) size 761x236 text run at (0,17) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -109,27 +109,27 @@ layer at (0,0) size 785x4374 text run at (0,179) width 737: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,233) width 64: "spacing." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,1930) size 769x2428 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x2426 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,1933) size 769x2432 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x2430 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x2401 - RenderTableCell {TD} at (0,1212) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x2404 + RenderTableCell {TD} at (0,1214) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x2401 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 732x34 + RenderTableCell {TD} at (12,26) size 755x2404 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 732x35 text run at (0,0) width 564: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " text run at (564,0) width 168: "This is the \"base font size\"" - text run at (0,17) width 204: "referred to in the following tests." - RenderBlock {P} at (4,55) size 747x20 + text run at (0,18) width 204: "referred to in the following tests." + RenderBlock {P} at (4,57) size 747x21 RenderText {#text} at (0,0) size 497x19 text run at (0,0) width 497: "This element should be 13pt. Helvetica which is in small-cap italics." - RenderBlock {P} at (4,98) size 747x145 + RenderBlock {P} at (4,101) size 747x145 RenderText {#text} at (0,5) size 735x134 text run at (0,5) width 374: "This element should be in a serif font. " text run at (374,5) width 361: "Its font-size should be 150% the base" @@ -137,7 +137,7 @@ layer at (0,0) size 785x4374 text run at (0,77) width 138: "respectively). " text run at (138,77) width 563: "Extra text is included for the purposes of testing this more" text run at (0,113) width 111: "effectively." - RenderBlock {P} at (4,266) size 747x145 + RenderBlock {P} at (4,269) size 747x145 RenderText {#text} at (0,4) size 733x135 text run at (0,4) width 461: "This element should be in a sans-serif font. " text run at (461,4) width 232: "Its font-size should be" @@ -145,7 +145,7 @@ layer at (0,0) size 785x4374 text run at (0,76) width 324: "(18px and 27px, respectively). " text run at (324,76) width 399: "Extra text is included for the purposes" text run at (0,112) width 322: "of testing this more effectively." - RenderBlock {P} at (4,434) size 747x81 + RenderBlock {P} at (4,437) size 747x81 RenderText {#text} at (0,5) size 720x41 text run at (0,5) width 619: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " text run at (619,5) width 101: "For example, if the" @@ -158,7 +158,7 @@ layer at (0,0) size 785x4374 text run at (434,31) width 274: "The actual value of the font-size is UA-dependent. " text run at (708,31) width 29: "Extra" text run at (0,59) width 344: "text is included for the purposes of testing this more effectively." - RenderBlock {P} at (4,538) size 747x181 + RenderBlock {P} at (4,541) size 747x181 RenderText {#text} at (0,4) size 721x171 text run at (0,4) width 714: "This element should be in a sans-serif font, italicized and small caps," text run at (0,40) width 226: "with a weight of 900. " @@ -167,7 +167,7 @@ layer at (0,0) size 785x4374 text run at (0,112) width 148: "respectively). " text run at (148,112) width 561: "Extra text is included for the purposes of testing this" text run at (0,148) width 176: "more effectively." - RenderBlock {P} at (4,742) size 747x361 + RenderBlock {P} at (4,745) size 747x361 RenderText {#text} at (0,22) size 716x315 text run at (0,22) width 702: "This element should be in a sans-serif font, italicized and small caps," text run at (0,94) width 225: "with a weight of 100. " @@ -176,14 +176,14 @@ layer at (0,0) size 785x4374 text run at (0,238) width 147: "respectively). " text run at (147,238) width 559: "Extra text is included for the purposes of testing this" text run at (0,310) width 175: "more effectively." - RenderBlock {P} at (4,1126) size 747x157 + RenderBlock {P} at (4,1129) size 747x157 RenderText {#text} at (0,8) size 740x140 text run at (0,8) width 740: "This element should be in a monospace font, italicized and small caps, with a weight" text run at (0,47) width 88: "of 900. " text run at (88,47) width 620: "Its font-size should be 150% the base font size, and its line-height" text run at (0,86) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)." text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." - RenderBlock {P} at (4,1306) size 747x385 + RenderBlock {P} at (4,1309) size 747x385 RenderText {#text} at (0,34) size 739x315 text run at (0,34) width 702: "This element should be in a sans-serif font, italicized and small caps," text run at (0,130) width 225: "with a weight of 500. " @@ -191,7 +191,7 @@ layer at (0,0) size 785x4374 text run at (0,226) width 433: "or 18px, and its line-height should be 1in. " text run at (433,226) width 306: "Extra text is included for the" text run at (0,322) width 428: "purposes of testing this more effectively." - RenderBlock {P} at (4,1714) size 747x145 + RenderBlock {P} at (4,1717) size 747x145 RenderText {#text} at (0,8) size 730x128 text run at (0,8) width 730: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" text run at (0,44) width 62: "of 700. " @@ -199,13 +199,13 @@ layer at (0,0) size 785x4374 text run at (0,80) width 176: "element's font size). " text run at (176,80) width 500: "Extra text is included for the purposes of testing this more" text run at (0,116) width 93: "effectively." - RenderBlock {P} at (4,1876) size 747x65 + RenderBlock {P} at (4,1879) size 747x65 RenderText {#text} at (0,8) size 714x47 text run at (0,8) width 378: "This element should be in a sans-serif font, with a weight of 400. " text run at (378,8) width 336: "Its font-size should be 80% of 12px, or 9.6px, and its line-" text run at (0,40) width 235: "height shoud be 2.5 times that, or 24px. " text run at (235,40) width 405: "Extra text is included for the purposes of testing this more effectively." - RenderBlock {P} at (4,1964) size 747x433 + RenderBlock {P} at (4,1967) size 747x433 RenderInline {SPAN} at (0,0) size 716x387 [bgcolor=#C0C0C0] RenderText {#text} at (0,22) size 716x387 text run at (0,22) width 702: "This element should be in a sans-serif font, italicized and small caps," diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.png b/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.png index 3034fab08e66..1920eae5531a 100644 Binary files a/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.png and b/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.txt b/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.txt index a5ea3565aa43..14ab93c59933 100644 --- a/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.txt +++ b/LayoutTests/platform/gtk/css1/font_properties/font_family-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1235 +layer at (0,0) size 785x1257 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1235 - RenderBlock {HTML} at (0,0) size 785x1235 - RenderBody {BODY} at (8,8) size 769x1219 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1257 + RenderBlock {HTML} at (0,0) size 785x1257 + RenderBody {BODY} at (8,8) size 769x1241 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x135 + RenderBlock {PRE} at (0,34) size 769x135 RenderText {#text} at (0,0) size 312x135 text run at (0,0) width 216: "DIV.a {font-family: serif;}" text run at (0,15) width 248: "DIV.b {font-family: monospace;}" @@ -17,110 +17,110 @@ layer at (0,0) size 785x1235 text run at (0,90) width 248: ".five {font-family: monospace;}" text run at (0,105) width 312: ".six {font-family: sans-serif,cursive;}" text run at (0,120) width 304: ".seven {font-family: monospace,serif;}" - RenderBlock {HR} at (0,181) size 769x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (0,199) size 769x180 - RenderBlock {P} at (0,0) size 769x17 + RenderBlock {HR} at (0,182) size 769x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,200) size 769x185 + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 638x17 text run at (0,0) width 638: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - RenderBlock {P} at (0,33) size 769x17 + RenderBlock {P} at (0,34) size 769x18 RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,66) size 769x17 + RenderBlock {P} at (0,68) size 769x18 RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,99) size 769x17 + RenderBlock {P} at (0,102) size 769x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a cursive font." - RenderBlock {P} at (0,132) size 769x17 + RenderBlock {P} at (0,136) size 769x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a fantasy font." - RenderBlock {P} at (0,165) size 769x15 + RenderBlock {P} at (0,170) size 769x15 RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." - RenderBlock {HR} at (0,392) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,410) size 769x17 + RenderBlock {HR} at (0,398) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,416) size 769x18 RenderText {#text} at (0,0) size 396x17 text run at (0,0) width 396: "This sentence should be in a sans-serif font, not cursive." - RenderBlock {P} at (0,443) size 769x18 + RenderBlock {P} at (0,450) size 769x18 RenderText {#text} at (0,0) size 550x18 text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - RenderBlock {HR} at (0,477) size 769x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (0,492) size 769x193 + RenderBlock {HR} at (0,484) size 769x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,499) size 769x197 RenderBlock {P} at (0,0) size 769x30 RenderText {#text} at (0,0) size 768x30 text run at (0,0) width 768: "This sentence is normal for the first division, which is the next five sentences; it should be a" text run at (0,15) width 120: "monospace font." - RenderBlock {P} at (0,46) size 769x17 + RenderBlock {P} at (0,46) size 769x18 RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,79) size 769x17 + RenderBlock {P} at (0,80) size 769x18 RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,112) size 769x17 + RenderBlock {P} at (0,114) size 769x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a cursive font." - RenderBlock {P} at (0,145) size 769x17 + RenderBlock {P} at (0,148) size 769x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a fantasy font." - RenderBlock {P} at (0,178) size 769x15 + RenderBlock {P} at (0,182) size 769x15 RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." - RenderTable {TABLE} at (0,698) size 769x521 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x519 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,709) size 769x532 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x530 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x494 - RenderTableCell {TD} at (0,259) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x494 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {DIV} at (4,4) size 747x180 - RenderBlock {P} at (0,0) size 747x17 + RenderTableRow {TR} at (0,26) size 767x504 + RenderTableCell {TD} at (0,265) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x504 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {DIV} at (4,4) size 747x185 + RenderBlock {P} at (0,0) size 747x18 RenderText {#text} at (0,0) size 638x17 text run at (0,0) width 638: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - RenderBlock {P} at (0,33) size 747x17 + RenderBlock {P} at (0,34) size 747x18 RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,66) size 747x17 + RenderBlock {P} at (0,68) size 747x18 RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,99) size 747x17 + RenderBlock {P} at (0,102) size 747x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a cursive font." - RenderBlock {P} at (0,132) size 747x17 + RenderBlock {P} at (0,136) size 747x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a fantasy font." - RenderBlock {P} at (0,165) size 747x15 + RenderBlock {P} at (0,170) size 747x15 RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." - RenderBlock {HR} at (4,197) size 747x2 [border: (1px inset #000000)] - RenderBlock {P} at (4,215) size 747x17 + RenderBlock {HR} at (4,202) size 747x2 [border: (1px inset #000000)] + RenderBlock {P} at (4,220) size 747x18 RenderText {#text} at (0,0) size 396x17 text run at (0,0) width 396: "This sentence should be in a sans-serif font, not cursive." - RenderBlock {P} at (4,248) size 747x18 + RenderBlock {P} at (4,254) size 747x18 RenderText {#text} at (0,0) size 550x18 text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - RenderBlock {HR} at (4,282) size 747x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (4,297) size 747x193 + RenderBlock {HR} at (4,288) size 747x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (4,303) size 747x197 RenderBlock {P} at (0,0) size 747x30 RenderText {#text} at (0,0) size 728x30 text run at (0,0) width 728: "This sentence is normal for the first division, which is the next five sentences; it should" text run at (0,15) width 160: "be a monospace font." - RenderBlock {P} at (0,46) size 747x17 + RenderBlock {P} at (0,46) size 747x18 RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,79) size 747x17 + RenderBlock {P} at (0,80) size 747x18 RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,112) size 747x17 + RenderBlock {P} at (0,114) size 747x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a cursive font." - RenderBlock {P} at (0,145) size 747x17 + RenderBlock {P} at (0,148) size 747x18 RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a fantasy font." - RenderBlock {P} at (0,178) size 747x15 + RenderBlock {P} at (0,182) size 747x15 RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.png b/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.png index 6495efb6c9c1..d54d64f03e7b 100644 Binary files a/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.png and b/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.txt b/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.txt index c16ce5474f81..72676910f612 100644 --- a/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.txt +++ b/LayoutTests/platform/gtk/css1/font_properties/font_size-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x2758 +layer at (0,0) size 785x2812 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2758 - RenderBlock {HTML} at (0,0) size 785x2758 - RenderBody {BODY} at (8,8) size 769x2742 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2812 + RenderBlock {HTML} at (0,0) size 785x2812 + RenderBody {BODY} at (8,8) size 769x2796 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x300 + RenderBlock {PRE} at (0,34) size 769x300 RenderText {#text} at (0,0) size 224x300 text run at (0,0) width 200: ".one {font-size: medium;}" text run at (0,15) width 200: ".two {font-size: larger;}" @@ -28,11 +28,11 @@ layer at (0,0) size 785x2758 text run at (0,255) width 168: ".i {font-size: 200%;}" text run at (0,270) width 184: ".j {font-size: -0.5in;}" text run at (0,285) width 0: " " - RenderBlock {HR} at (0,346) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,364) size 769x17 + RenderBlock {HR} at (0,347) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,365) size 769x18 RenderText {#text} at (0,0) size 688x17 text run at (0,0) width 688: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - RenderBlock {P} at (0,397) size 769x18 + RenderBlock {P} at (0,399) size 769x18 RenderText {#text} at (0,0) size 186x17 text run at (0,0) width 186: "This sentence has been set to " RenderInline {CODE} at (0,0) size 48x15 @@ -40,13 +40,13 @@ layer at (0,0) size 785x2758 text run at (186,3) width 48: "medium" RenderText {#text} at (234,0) size 361x17 text run at (234,0) width 361: ", which may or may not be the same size as unstyled text." - RenderBlock {P} at (0,434) size 769x22 + RenderBlock {P} at (0,436) size 769x23 RenderText {#text} at (0,0) size 377x21 text run at (0,0) width 377: "This sentence should be larger than unstyled text." - RenderBlock {P} at (0,474) size 769x16 + RenderBlock {P} at (0,477) size 769x17 RenderText {#text} at (0,0) size 276x15 text run at (0,0) width 276: "This sentence should be smaller than unstyled text." - RenderBlock {P} at (0,502) size 769x18 + RenderBlock {P} at (0,506) size 769x19 RenderText {#text} at (0,6) size 305x10 text run at (0,6) width 305: "This sentence should be very small, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -54,7 +54,7 @@ layer at (0,0) size 785x2758 text run at (305,0) width 51: "medium" RenderText {#text} at (356,6) size 2x10 text run at (356,6) width 2: "." - RenderBlock {P} at (0,529) size 769x18 + RenderBlock {P} at (0,534) size 769x19 RenderText {#text} at (0,5) size 327x11 text run at (0,5) width 327: "This sentence should be rather small, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -62,7 +62,7 @@ layer at (0,0) size 785x2758 text run at (327,0) width 51: "medium" RenderText {#text} at (378,5) size 3x11 text run at (378,5) width 3: "." - RenderBlock {P} at (0,559) size 769x18 + RenderBlock {P} at (0,565) size 769x19 RenderText {#text} at (0,2) size 401x15 text run at (0,2) width 401: "This sentence should be small, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -70,7 +70,7 @@ layer at (0,0) size 785x2758 text run at (401,0) width 51: "medium" RenderText {#text} at (452,2) size 3x15 text run at (452,2) width 3: "." - RenderBlock {P} at (0,594) size 769x21 + RenderBlock {P} at (0,601) size 769x22 RenderText {#text} at (0,0) size 540x20 text run at (0,0) width 540: "This sentence should be large, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -78,71 +78,71 @@ layer at (0,0) size 785x2758 text run at (540,2) width 51: "medium" RenderText {#text} at (591,0) size 5x20 text run at (591,0) width 5: "." - RenderBlock {P} at (0,638) size 769x53 - RenderText {#text} at (0,0) size 745x52 + RenderBlock {P} at (0,646) size 769x55 + RenderText {#text} at (0,0) size 745x53 text run at (0,0) width 745: "This sentence should be rather large, but the last word in the sentence should" - text run at (0,26) width 29: "be " + text run at (0,27) width 29: "be " RenderInline {SPAN} at (0,0) size 51x17 - RenderText {#text} at (29,33) size 51x17 - text run at (29,33) width 51: "medium" - RenderText {#text} at (80,26) size 6x26 - text run at (80,26) width 6: "." - RenderBlock {P} at (0,722) size 769x73 - RenderText {#text} at (0,0) size 752x72 + RenderText {#text} at (29,34) size 51x17 + text run at (29,34) width 51: "medium" + RenderText {#text} at (80,27) size 6x26 + text run at (80,27) width 6: "." + RenderBlock {P} at (0,732) size 769x75 + RenderText {#text} at (0,0) size 752x73 text run at (0,0) width 752: "This sentence should be very large, but the last word in the" - text run at (0,36) width 248: "sentence should be " + text run at (0,37) width 248: "sentence should be " RenderInline {SPAN} at (0,0) size 51x17 - RenderText {#text} at (248,51) size 51x17 - text run at (248,51) width 51: "medium" - RenderText {#text} at (299,36) size 8x36 - text run at (299,36) width 8: "." - RenderBlock {P} at (0,842) size 769x107 - RenderText {#text} at (0,0) size 695x106 - text run at (0,0) width 695: "This sentence should be half an inch" - text run at (0,53) width 72: "tall." - RenderBlock {P} at (0,996) size 769x43 - RenderText {#text} at (0,0) size 676x42 - text run at (0,0) width 676: "This sentence should be one centimeter tall." - RenderBlock {P} at (0,1076) size 769x43 - RenderText {#text} at (0,0) size 682x42 - text run at (0,0) width 682: "This sentence should be ten millimeters tall." - RenderBlock {P} at (0,1156) size 769x27 + RenderText {#text} at (248,52) size 51x17 + text run at (248,52) width 51: "medium" + RenderText {#text} at (299,37) size 8x36 + text run at (299,37) width 8: "." + RenderBlock {P} at (0,854) size 769x111 + RenderText {#text} at (0,1) size 695x108 + text run at (0,1) width 695: "This sentence should be half an inch" + text run at (0,56) width 72: "tall." + RenderBlock {P} at (0,1012) size 769x45 + RenderText {#text} at (0,1) size 676x42 + text run at (0,1) width 676: "This sentence should be one centimeter tall." + RenderBlock {P} at (0,1094) size 769x45 + RenderText {#text} at (0,1) size 682x42 + text run at (0,1) width 682: "This sentence should be ten millimeters tall." + RenderBlock {P} at (0,1176) size 769x28 RenderText {#text} at (0,0) size 430x26 text run at (0,0) width 430: "This sentence should be eighteen points tall." - RenderBlock {P} at (0,1206) size 769x27 + RenderBlock {P} at (0,1227) size 769x28 RenderText {#text} at (0,0) size 499x26 text run at (0,0) width 499: "This sentence should be one and one half picas tall." - RenderBlock {P} at (0,1264) size 769x37 + RenderBlock {P} at (0,1286) size 769x38 RenderText {#text} at (0,0) size 465x36 text run at (0,0) width 465: "This sentence should be two em tall." - RenderBlock {P} at (0,1332) size 769x27 + RenderBlock {P} at (0,1355) size 769x28 RenderText {#text} at (0,0) size 360x26 text run at (0,0) width 360: "This sentence should be three ex tall." - RenderBlock {P} at (0,1383) size 769x28 + RenderBlock {P} at (0,1407) size 769x29 RenderText {#text} at (0,0) size 476x27 text run at (0,0) width 476: "This sentence should be twenty-five pixels tall." - RenderBlock {P} at (0,1442) size 769x37 + RenderBlock {P} at (0,1467) size 769x38 RenderText {#text} at (0,0) size 546x36 text run at (0,0) width 546: "This sentence should be twice normal size." - RenderBlock {P} at (0,1510) size 769x18 + RenderBlock {P} at (0,1536) size 769x19 RenderText {#text} at (0,0) size 673x17 text run at (0,0) width 673: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." - RenderTable {TABLE} at (0,1543) size 769x1199 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1197 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,1570) size 769x1226 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1224 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1172 - RenderTableCell {TD} at (0,598) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 4x18 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1172 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableRow {TR} at (0,26) size 767x1198 + RenderTableCell {TD} at (0,611) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x1198 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 688x17 text run at (0,0) width 688: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - RenderBlock {P} at (4,37) size 747x18 + RenderBlock {P} at (4,38) size 747x18 RenderText {#text} at (0,0) size 186x17 text run at (0,0) width 186: "This sentence has been set to " RenderInline {CODE} at (0,0) size 48x15 @@ -150,13 +150,13 @@ layer at (0,0) size 785x2758 text run at (186,3) width 48: "medium" RenderText {#text} at (234,0) size 361x17 text run at (234,0) width 361: ", which may or may not be the same size as unstyled text." - RenderBlock {P} at (4,74) size 747x22 + RenderBlock {P} at (4,75) size 747x23 RenderText {#text} at (0,0) size 377x21 text run at (0,0) width 377: "This sentence should be larger than unstyled text." - RenderBlock {P} at (4,114) size 747x16 + RenderBlock {P} at (4,116) size 747x17 RenderText {#text} at (0,0) size 276x15 text run at (0,0) width 276: "This sentence should be smaller than unstyled text." - RenderBlock {P} at (4,142) size 747x18 + RenderBlock {P} at (4,145) size 747x19 RenderText {#text} at (0,6) size 305x10 text run at (0,6) width 305: "This sentence should be very small, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -164,7 +164,7 @@ layer at (0,0) size 785x2758 text run at (305,0) width 51: "medium" RenderText {#text} at (356,6) size 2x10 text run at (356,6) width 2: "." - RenderBlock {P} at (4,169) size 747x18 + RenderBlock {P} at (4,173) size 747x19 RenderText {#text} at (0,5) size 327x11 text run at (0,5) width 327: "This sentence should be rather small, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -172,7 +172,7 @@ layer at (0,0) size 785x2758 text run at (327,0) width 51: "medium" RenderText {#text} at (378,5) size 3x11 text run at (378,5) width 3: "." - RenderBlock {P} at (4,199) size 747x18 + RenderBlock {P} at (4,204) size 747x19 RenderText {#text} at (0,2) size 401x15 text run at (0,2) width 401: "This sentence should be small, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -180,7 +180,7 @@ layer at (0,0) size 785x2758 text run at (401,0) width 51: "medium" RenderText {#text} at (452,2) size 3x15 text run at (452,2) width 3: "." - RenderBlock {P} at (4,234) size 747x21 + RenderBlock {P} at (4,240) size 747x22 RenderText {#text} at (0,0) size 540x20 text run at (0,0) width 540: "This sentence should be large, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 @@ -188,52 +188,52 @@ layer at (0,0) size 785x2758 text run at (540,2) width 51: "medium" RenderText {#text} at (591,0) size 5x20 text run at (591,0) width 5: "." - RenderBlock {P} at (4,278) size 747x53 - RenderText {#text} at (0,0) size 745x52 + RenderBlock {P} at (4,285) size 747x55 + RenderText {#text} at (0,0) size 745x53 text run at (0,0) width 745: "This sentence should be rather large, but the last word in the sentence should" - text run at (0,26) width 29: "be " + text run at (0,27) width 29: "be " RenderInline {SPAN} at (0,0) size 51x17 - RenderText {#text} at (29,33) size 51x17 - text run at (29,33) width 51: "medium" - RenderText {#text} at (80,26) size 6x26 - text run at (80,26) width 6: "." - RenderBlock {P} at (4,362) size 747x73 - RenderText {#text} at (0,0) size 705x72 + RenderText {#text} at (29,34) size 51x17 + text run at (29,34) width 51: "medium" + RenderText {#text} at (80,27) size 6x26 + text run at (80,27) width 6: "." + RenderBlock {P} at (4,371) size 747x75 + RenderText {#text} at (0,0) size 705x73 text run at (0,0) width 705: "This sentence should be very large, but the last word in" - text run at (0,36) width 295: "the sentence should be " + text run at (0,37) width 295: "the sentence should be " RenderInline {SPAN} at (0,0) size 51x17 - RenderText {#text} at (295,51) size 51x17 - text run at (295,51) width 51: "medium" - RenderText {#text} at (346,36) size 8x36 - text run at (346,36) width 8: "." - RenderBlock {P} at (4,482) size 747x107 - RenderText {#text} at (0,0) size 695x106 - text run at (0,0) width 695: "This sentence should be half an inch" - text run at (0,53) width 72: "tall." - RenderBlock {P} at (4,636) size 747x43 - RenderText {#text} at (0,0) size 676x42 - text run at (0,0) width 676: "This sentence should be one centimeter tall." - RenderBlock {P} at (4,716) size 747x43 - RenderText {#text} at (0,0) size 682x42 - text run at (0,0) width 682: "This sentence should be ten millimeters tall." - RenderBlock {P} at (4,796) size 747x27 + RenderText {#text} at (295,52) size 51x17 + text run at (295,52) width 51: "medium" + RenderText {#text} at (346,37) size 8x36 + text run at (346,37) width 8: "." + RenderBlock {P} at (4,493) size 747x111 + RenderText {#text} at (0,1) size 695x108 + text run at (0,1) width 695: "This sentence should be half an inch" + text run at (0,56) width 72: "tall." + RenderBlock {P} at (4,651) size 747x45 + RenderText {#text} at (0,1) size 676x42 + text run at (0,1) width 676: "This sentence should be one centimeter tall." + RenderBlock {P} at (4,733) size 747x45 + RenderText {#text} at (0,1) size 682x42 + text run at (0,1) width 682: "This sentence should be ten millimeters tall." + RenderBlock {P} at (4,815) size 747x28 RenderText {#text} at (0,0) size 430x26 text run at (0,0) width 430: "This sentence should be eighteen points tall." - RenderBlock {P} at (4,846) size 747x27 + RenderBlock {P} at (4,866) size 747x28 RenderText {#text} at (0,0) size 499x26 text run at (0,0) width 499: "This sentence should be one and one half picas tall." - RenderBlock {P} at (4,904) size 747x37 + RenderBlock {P} at (4,925) size 747x38 RenderText {#text} at (0,0) size 465x36 text run at (0,0) width 465: "This sentence should be two em tall." - RenderBlock {P} at (4,972) size 747x27 + RenderBlock {P} at (4,994) size 747x28 RenderText {#text} at (0,0) size 360x26 text run at (0,0) width 360: "This sentence should be three ex tall." - RenderBlock {P} at (4,1023) size 747x28 + RenderBlock {P} at (4,1046) size 747x29 RenderText {#text} at (0,0) size 476x27 text run at (0,0) width 476: "This sentence should be twenty-five pixels tall." - RenderBlock {P} at (4,1082) size 747x37 + RenderBlock {P} at (4,1106) size 747x38 RenderText {#text} at (0,0) size 546x36 text run at (0,0) width 546: "This sentence should be twice normal size." - RenderBlock {P} at (4,1150) size 747x18 + RenderBlock {P} at (4,1175) size 747x19 RenderText {#text} at (0,0) size 673x17 text run at (0,0) width 673: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.png b/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.png index d2915d334c87..617df6b24812 100644 Binary files a/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.png and b/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.txt b/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.txt index 971933584374..b186be4d4284 100644 --- a/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.txt +++ b/LayoutTests/platform/gtk/css1/font_properties/font_style-expected.txt @@ -3,17 +3,17 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 248x60 text run at (0,0) width 208: ".one {font-style: italic;}" text run at (0,15) width 216: ".two {font-style: oblique;}" text run at (0,30) width 248: ".three, I {font-style: normal;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x17 + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x18 RenderText {#text} at (0,0) size 501x17 text run at (0,0) width 501: "This paragraph should be in italics, but the last word of the sentence should be " RenderInline {SPAN} at (0,0) size 44x17 @@ -21,27 +21,27 @@ layer at (0,0) size 800x600 text run at (501,0) width 44: "normal" RenderText {#text} at (545,0) size 4x17 text run at (545,0) width 4: "." - RenderBlock {P} at (0,157) size 784x17 + RenderBlock {P} at (0,159) size 784x18 RenderText {#text} at (0,0) size 219x17 text run at (0,0) width 219: "This paragraph should be oblique." - RenderBlock {P} at (0,190) size 784x17 + RenderBlock {P} at (0,193) size 784x18 RenderInline {I} at (0,0) size 212x17 RenderText {#text} at (0,0) size 212x17 text run at (0,0) width 212: "This paragraph should be normal." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,223) size 571x118 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 569x116 - RenderTableRow {TR} at (0,0) size 569x25 - RenderTableCell {TD} at (0,0) size 569x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,227) size 571x122 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 569x120 + RenderTableRow {TR} at (0,0) size 569x26 + RenderTableCell {TD} at (0,0) size 569x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 569x91 - RenderTableCell {TD} at (0,58) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 569x94 + RenderTableCell {TD} at (0,60) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 557x91 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 549x17 + RenderTableCell {TD} at (12,26) size 557x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 549x18 RenderText {#text} at (0,0) size 501x17 text run at (0,0) width 501: "This paragraph should be in italics, but the last word of the sentence should be " RenderInline {SPAN} at (0,0) size 44x17 @@ -49,10 +49,10 @@ layer at (0,0) size 800x600 text run at (501,0) width 44: "normal" RenderText {#text} at (545,0) size 4x17 text run at (545,0) width 4: "." - RenderBlock {P} at (4,37) size 549x17 + RenderBlock {P} at (4,38) size 549x18 RenderText {#text} at (0,0) size 219x17 text run at (0,0) width 219: "This paragraph should be oblique." - RenderBlock {P} at (4,70) size 549x17 + RenderBlock {P} at (4,72) size 549x18 RenderInline {I} at (0,0) size 212x17 RenderText {#text} at (0,0) size 212x17 text run at (0,0) width 212: "This paragraph should be normal." diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.png b/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.png index 7180b154d990..70d3355676f4 100644 Binary files a/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.png and b/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.txt b/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.txt index 4e78fe790372..f3785c1267ce 100644 --- a/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.txt +++ b/LayoutTests/platform/gtk/css1/font_properties/font_variant-expected.txt @@ -3,19 +3,19 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x45 + RenderBlock {PRE} at (0,34) size 784x45 RenderText {#text} at (0,0) size 256x45 text run at (0,0) width 256: ".one {font-variant: small-caps;}" text run at (0,15) width 224: ".two {font-variant: normal;}" text run at (0,30) width 0: " " - RenderBlock {HR} at (0,91) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,109) size 784x17 + RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,110) size 784x18 RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "This Paragraph should be in Small Caps." - RenderBlock {P} at (0,142) size 784x17 + RenderBlock {P} at (0,144) size 784x18 RenderText {#text} at (0,0) size 574x17 text run at (0,0) width 574: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " RenderInline {SPAN} at (0,0) size 48x17 @@ -23,22 +23,22 @@ layer at (0,0) size 800x600 text run at (574,0) width 48: "Normal" RenderText {#text} at (622,0) size 4x17 text run at (622,0) width 4: "." - RenderTable {TABLE} at (0,175) size 648x85 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 646x83 - RenderTableRow {TR} at (0,0) size 646x25 - RenderTableCell {TD} at (0,0) size 646x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,178) size 648x88 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 646x86 + RenderTableRow {TR} at (0,0) size 646x26 + RenderTableCell {TD} at (0,0) size 646x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 646x58 - RenderTableCell {TD} at (0,41) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 634x58 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 626x17 + RenderTableRow {TR} at (0,26) size 646x60 + RenderTableCell {TD} at (0,43) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 634x60 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 626x18 RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "This Paragraph should be in Small Caps." - RenderBlock {P} at (4,37) size 626x17 + RenderBlock {P} at (4,38) size 626x18 RenderText {#text} at (0,0) size 574x17 text run at (0,0) width 574: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " RenderInline {SPAN} at (0,0) size 48x17 diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.png b/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.png index d7a542acc69f..76d0b8fc57b3 100644 Binary files a/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.png and b/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.txt b/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.txt index 4c8f7dad7670..f7a97d3fec38 100644 --- a/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.txt +++ b/LayoutTests/platform/gtk/css1/font_properties/font_weight-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1022 +layer at (0,0) size 785x1046 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1022 - RenderBlock {HTML} at (0,0) size 785x1022 - RenderBody {BODY} at (8,8) size 769x1006 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1046 + RenderBlock {HTML} at (0,0) size 785x1046 + RenderBody {BODY} at (8,8) size 769x1030 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x165 + RenderBlock {PRE} at (0,34) size 769x165 RenderText {#text} at (0,0) size 240x165 text run at (0,0) width 200: ".one {font-weight: bold;}" text run at (0,15) width 216: ".two {font-weight: bolder;}" @@ -19,40 +19,40 @@ layer at (0,0) size 785x1022 text run at (0,120) width 224: ".nine {font-weight: normal;}" text run at (0,135) width 200: "B {font-weight: lighter;}" text run at (0,150) width 0: " " - RenderBlock {HR} at (0,211) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,229) size 769x17 + RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,230) size 769x18 RenderText {#text} at (0,0) size 198x17 text run at (0,0) width 198: "This sentence should be bold." - RenderBlock {P} at (0,262) size 769x17 + RenderBlock {P} at (0,264) size 769x18 RenderText {#text} at (0,0) size 300x17 text run at (0,0) width 300: "This sentence should be bolder than normal." - RenderBlock {H4} at (0,300) size 769x18 + RenderBlock {H4} at (0,303) size 769x19 RenderText {#text} at (0,0) size 131x17 text run at (0,0) width 131: "This is a heading-4." - RenderBlock {H4} at (0,338) size 769x18 + RenderBlock {H4} at (0,342) size 769x19 RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "This is a bolder heading-4." - RenderBlock {P} at (0,376) size 769x18 + RenderBlock {P} at (0,381) size 769x19 RenderInline {B} at (0,0) size 353x17 RenderText {#text} at (0,0) size 353x17 text run at (0,0) width 353: "This sentence should be normal (boldface made lighter)." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,409) size 769x18 + RenderBlock {P} at (0,415) size 769x19 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "This sentence should be weight 100." - RenderBlock {P} at (0,442) size 769x18 + RenderBlock {P} at (0,449) size 769x19 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "This sentence should be weight 300." - RenderBlock {P} at (0,475) size 769x18 + RenderBlock {P} at (0,483) size 769x19 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "This sentence should be weight 500." - RenderBlock {P} at (0,508) size 769x18 + RenderBlock {P} at (0,517) size 769x19 RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This sentence should be weight 700." - RenderBlock {P} at (0,541) size 769x18 + RenderBlock {P} at (0,551) size 769x19 RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This sentence should be weight 900." - RenderBlock {P} at (0,574) size 769x18 + RenderBlock {P} at (0,585) size 769x19 RenderText {#text} at (0,0) size 493x17 text run at (0,0) width 493: "This sentence should be bold, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 44x17 @@ -60,51 +60,51 @@ layer at (0,0) size 785x1022 text run at (493,0) width 44: "normal" RenderText {#text} at (537,0) size 4x17 text run at (537,0) width 4: "." - RenderTable {TABLE} at (0,607) size 563x399 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 561x396 - RenderTableRow {TR} at (0,0) size 561x25 - RenderTableCell {TD} at (0,0) size 561x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,619) size 563x411 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 561x408 + RenderTableRow {TR} at (0,0) size 561x26 + RenderTableCell {TD} at (0,0) size 561x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 561x371 - RenderTableCell {TD} at (0,197) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 561x382 + RenderTableCell {TD} at (0,203) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 549x371 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 541x17 + RenderTableCell {TD} at (12,26) size 549x382 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 541x18 RenderText {#text} at (0,0) size 198x17 text run at (0,0) width 198: "This sentence should be bold." - RenderBlock {P} at (4,37) size 541x17 + RenderBlock {P} at (4,38) size 541x18 RenderText {#text} at (0,0) size 300x17 text run at (0,0) width 300: "This sentence should be bolder than normal." - RenderBlock {H4} at (4,75) size 541x18 + RenderBlock {H4} at (4,77) size 541x19 RenderText {#text} at (0,0) size 131x17 text run at (0,0) width 131: "This is a heading-4." - RenderBlock {H4} at (4,113) size 541x18 + RenderBlock {H4} at (4,116) size 541x19 RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "This is a bolder heading-4." - RenderBlock {P} at (4,151) size 541x18 + RenderBlock {P} at (4,155) size 541x19 RenderInline {B} at (0,0) size 353x17 RenderText {#text} at (0,0) size 353x17 text run at (0,0) width 353: "This sentence should be normal (boldface made lighter)." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,184) size 541x18 + RenderBlock {P} at (4,189) size 541x19 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "This sentence should be weight 100." - RenderBlock {P} at (4,217) size 541x18 + RenderBlock {P} at (4,223) size 541x19 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "This sentence should be weight 300." - RenderBlock {P} at (4,250) size 541x18 + RenderBlock {P} at (4,257) size 541x19 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "This sentence should be weight 500." - RenderBlock {P} at (4,283) size 541x18 + RenderBlock {P} at (4,291) size 541x19 RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This sentence should be weight 700." - RenderBlock {P} at (4,316) size 541x18 + RenderBlock {P} at (4,325) size 541x19 RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This sentence should be weight 900." - RenderBlock {P} at (4,349) size 541x18 + RenderBlock {P} at (4,359) size 541x19 RenderText {#text} at (0,0) size 493x17 text run at (0,0) width 493: "This sentence should be bold, but the last word in the sentence should be " RenderInline {SPAN} at (0,0) size 44x17 diff --git a/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.png index be6fb2e08a0d..913a8b7c4454 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.txt index 814993afe2d7..fd987a8ce65c 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/canvas-expected.txt @@ -3,37 +3,37 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 [bgcolor=#00FFFF] RenderBody {BODY} at (25,25) size 750x550 [bgcolor=#008000] - RenderBlock {P} at (0,0) size 750x17 + RenderBlock {P} at (0,0) size 750x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 750x30 + RenderBlock {PRE} at (0,34) size 750x30 RenderText {#text} at (0,0) size 552x30 text run at (0,0) width 240: "HTML {background-color: aqua;}" text run at (0,15) width 552: "BODY {background-color: green; background-image: none; margin: 25px;}" - RenderBlock {HR} at (0,76) size 750x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,94) size 750x51 - RenderText {#text} at (0,0) size 739x51 + RenderBlock {HR} at (0,77) size 750x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,95) size 750x54 + RenderText {#text} at (0,0) size 739x53 text run at (0,0) width 387: "The body of this document should have a green background. " text run at (387,0) width 308: "It also has a margin of 25 pixels, so the light blue" - text run at (0,17) width 432: "background set for the HTML element should surround the BODY. " - text run at (432,17) width 307: "If the BODY content is significantly shorter than" - text run at (0,34) width 519: "the browser's window height, then the bottom border may be larger than 25 pixels." - RenderTable {TABLE} at (0,161) size 750x86 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 748x84 - RenderTableRow {TR} at (0,0) size 748x25 - RenderTableCell {TD} at (0,0) size 748x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 432: "background set for the HTML element should surround the BODY. " + text run at (432,18) width 307: "If the BODY content is significantly shorter than" + text run at (0,36) width 519: "the browser's window height, then the bottom border may be larger than 25 pixels." + RenderTable {TABLE} at (0,165) size 750x90 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 748x88 + RenderTableRow {TR} at (0,0) size 748x26 + RenderTableCell {TD} at (0,0) size 748x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 748x59 - RenderTableCell {TD} at (0,42) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 748x62 + RenderTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 736x59 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 728x51 - RenderText {#text} at (0,0) size 708x51 + RenderTableCell {TD} at (12,26) size 736x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 728x54 + RenderText {#text} at (0,0) size 708x53 text run at (0,0) width 387: "The body of this document should have a green background. " text run at (387,0) width 308: "It also has a margin of 25 pixels, so the light blue" - text run at (0,17) width 432: "background set for the HTML element should surround the BODY. " - text run at (432,17) width 276: "If the BODY content is significantly shorter" - text run at (0,34) width 550: "than the browser's window height, then the bottom border may be larger than 25 pixels." + text run at (0,18) width 432: "background set for the HTML element should surround the BODY. " + text run at (432,18) width 276: "If the BODY content is significantly shorter" + text run at (0,36) width 550: "than the browser's window height, then the bottom border may be larger than 25 pixels." diff --git a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png index fcfa8e7bde1c..efb0175b89f8 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt index 4947c0c92058..98c3b5a977b7 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/floating_elements-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x6082 +layer at (0,0) size 785x6281 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x6082 - RenderBlock {HTML} at (0,0) size 785x6082 - RenderBody {BODY} at (8,8) size 769x6066 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x6281 + RenderBlock {HTML} at (0,0) size 785x6281 + RenderBody {BODY} at (8,8) size 769x6265 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x135 + RenderBlock {PRE} at (0,34) size 769x135 RenderText {#text} at (0,0) size 480x135 text run at (0,0) width 272: "HR.minor {clear: both; width: 5%;}" text run at (0,15) width 400: "HR.major {clear: both; width: 75%; margin: 1.5em;}" @@ -17,701 +17,694 @@ layer at (0,0) size 785x6082 text run at (0,90) width 160: ".left {float: left;}" text run at (0,105) width 176: ".right {float: right;}" text run at (0,120) width 0: " " - RenderBlock {HR} at (0,181) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,199) size 769x34 - RenderText {#text} at (0,0) size 751x34 + RenderBlock {HR} at (0,182) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,200) size 769x36 + RenderText {#text} at (0,0) size 751x35 text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " text run at (681,0) width 67: "Other than" - text run at (0,17) width 751: "the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." - RenderBlock {HR} at (24,257) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,283) size 765x95 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (0,18) width 751: "the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." + RenderBlock {HR} at (24,260) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,286) size 765x100 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderBlock (floating) {P} at (566,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderBlock (floating) {P} at (566,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,5) size 363x85 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,5) size 363x89 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 180: "The floating elements within" - text run at (199,22) width 363: "this DIV should not go beyond the left or right inner edge" - text run at (199,39) width 356: "of this DIV, which means that the borders of the floating" - text run at (199,56) width 360: "elements should not overlap the top or side borders of the" - text run at (199,73) width 33: "DIV." - RenderBlock {HR} at (364,386) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,396) size 765x61 [border: (5px solid #800080)] + text run at (199,23) width 363: "this DIV should not go beyond the left or right inner edge" + text run at (199,41) width 356: "of this DIV, which means that the borders of the floating" + text run at (199,59) width 360: "elements should not overlap the top or side borders of the" + text run at (199,77) width 33: "DIV." + RenderBlock {HR} at (364,394) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,404) size 765x64 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 713x51 + RenderText {#text} at (20,5) size 728x53 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 536: "The floating images within this DIV should not go beyond the left or right inner edge" - text run at (20,22) width 709: "of this DIV, which means that the borders of the floating images should not overlap the top or side borders of the" - text run at (20,39) width 33: "DIV." - RenderBlock {HR} at (24,481) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,507) size 442x214 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x68 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 122x34 + text run at (20,23) width 709: "of this DIV, which means that the borders of the floating images should not overlap the top or side borders of the" + text run at (5,41) width 33: "DIV." + RenderBlock {HR} at (24,492) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,518) size 442x226 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 122x35 text run at (17,17) width 122: "This is the first left-" - text run at (17,34) width 119: "floating paragraph." - RenderBlock (floating) {P} at (199,5) size 194x68 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 142x34 + text run at (17,35) width 119: "floating paragraph." + RenderBlock (floating) {P} at (199,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 142x35 text run at (17,17) width 142: "This is the second left-" - text run at (17,34) width 119: "floating paragraph." - RenderBlock (floating) {P} at (5,73) size 194x68 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 127x34 + text run at (17,35) width 119: "floating paragraph." + RenderBlock (floating) {P} at (5,75) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 127x35 text run at (17,17) width 127: "This is the third left-" - text run at (17,34) width 119: "floating paragraph." - RenderText {#text} at (393,5) size 430x204 + text run at (17,35) width 119: "floating paragraph." + RenderText {#text} at (393,5) size 430x215 text run at (393,5) width 42: "This is" - text run at (393,22) width 23: "text" - text run at (393,39) width 40: "within" - text run at (393,56) width 19: "the" - text run at (199,73) width 37: "DIV. " - text run at (236,73) width 180: "The floating elements within" - text run at (199,90) width 219: "this DIV should not go beyond the" - text run at (199,107) width 220: "left or right inner edge of this DIV," - text run at (199,124) width 224: "which means that the borders of the" - text run at (5,141) width 412: "floating elements should not overlap the top or side borders of the" - text run at (5,158) width 111: "DIV in any way. " - text run at (116,158) width 297: "In addition, they should not overlap each other." - text run at (5,175) width 425: "The first two should be side by side, whereas the third should be on" - text run at (5,192) width 95: "the next \"line.\"" - RenderBlock {HR} at (364,729) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,739) size 360x199 [border: (5px solid #800080)] + text run at (393,23) width 23: "text" + text run at (393,41) width 40: "within" + text run at (393,59) width 19: "the" + text run at (199,77) width 37: "DIV. " + text run at (236,77) width 180: "The floating elements within" + text run at (199,95) width 219: "this DIV should not go beyond the" + text run at (199,113) width 220: "left or right inner edge of this DIV," + text run at (199,131) width 224: "which means that the borders of the" + text run at (5,149) width 412: "floating elements should not overlap the top or side borders of the" + text run at (5,167) width 111: "DIV in any way. " + text run at (116,167) width 297: "In addition, they should not overlap each other." + text run at (5,185) width 425: "The first two should be side by side, whereas the third should be on" + text run at (5,203) width 95: "the next \"line.\"" + RenderBlock {HR} at (364,752) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,762) size 360x190 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - RenderText {#text} at (317,5) size 350x189 + RenderText {#text} at (317,5) size 350x179 text run at (317,5) width 28: "This" - text run at (317,22) width 37: "is text" + text run at (317,23) width 37: "is text" text run at (161,41) width 104: "within the DIV. " text run at (265,41) width 77: "The floating" - text run at (161,58) width 193: "images within this DIV should" - text run at (161,75) width 188: "not go beyond the left or right" - text run at (5,92) width 334: "inner edge of this DIV, which means that the borders" - text run at (5,109) width 350: "of the floating images should not overlap the top or side" - text run at (5,126) width 202: "borders of the DIV in any way. " - text run at (207,126) width 103: "In addition, they" - text run at (5,143) width 194: "should not overlap each other. " - text run at (199,143) width 146: "The first two should be" - text run at (5,160) width 329: "side by side, whereas the third should be on the next" - text run at (5,177) width 41: "\"line.\"" - RenderBlock {HR} at (24,962) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,988) size 314x333 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (161,59) width 193: "images within this DIV should" + text run at (5,77) width 338: "not go beyond the left or right inner edge of this DIV," + text run at (5,95) width 324: "which means that the borders of the floating images" + text run at (5,113) width 350: "should not overlap the top or side borders of the DIV in" + text run at (5,131) width 62: "any way. " + text run at (67,131) width 257: "In addition, they should not overlap each" + text run at (5,149) width 40: "other. " + text run at (45,149) width 307: "The first two should be side by side, whereas the" + text run at (5,167) width 213: "third should be on the next \"line.\"" + RenderBlock {HR} at (24,976) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,1002) size 314x350 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderBlock (floating) {P} at (115,90) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderBlock (floating) {P} at (115,93) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,5) size 295x323 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,5) size 304x339 text run at (199,5) width 69: "This is text" - text run at (199,22) width 100: "within the DIV." - text run at (199,39) width 77: "The floating" - text run at (199,56) width 99: "elements within" - text run at (199,73) width 101: "this DIV should" - text run at (5,90) width 91: "not go beyond" - text run at (5,107) width 93: "the left or right" - text run at (5,124) width 109: "inner edge of this" - text run at (5,141) width 76: "DIV, which" - text run at (5,158) width 90: "means that the" - text run at (5,175) width 268: "borders of the floating elements should not" - text run at (5,192) width 280: "overlap the top or side borders of the DIV in" - text run at (5,209) width 62: "any way. " - text run at (67,209) width 224: "In addition, they should not overlap" - text run at (5,226) width 284: "each other in any way, nor should the floated" - text run at (5,243) width 261: "elements be overwritten by the DIV text. " - text run at (266,243) width 13: "In" - text run at (5,260) width 273: "addition, the floated elements should not be" - text run at (5,277) width 268: "side-by-side, but instead the first should be" - text run at (5,294) width 288: "floated left, and the second floated to the right" - text run at (5,311) width 94: "below the first." - RenderBlock {HR} at (364,1329) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,1339) size 410x216 [border: (5px solid #800080)] + text run at (199,23) width 100: "within the DIV." + text run at (199,41) width 77: "The floating" + text run at (199,59) width 99: "elements within" + text run at (5,93) width 101: "this DIV should" + text run at (5,111) width 91: "not go beyond" + text run at (5,129) width 93: "the left or right" + text run at (5,147) width 109: "inner edge of this" + text run at (5,165) width 76: "DIV, which" + text run at (5,183) width 292: "means that the borders of the floating elements" + text run at (5,201) width 301: "should not overlap the top or side borders of the" + text run at (5,219) width 111: "DIV in any way. " + text run at (116,219) width 173: "In addition, they should not" + text run at (5,237) width 288: "overlap each other in any way, nor should the" + text run at (5,255) width 304: "floated elements be overwritten by the DIV text." + text run at (5,273) width 290: "In addition, the floated elements should not be" + text run at (5,291) width 268: "side-by-side, but instead the first should be" + text run at (5,309) width 288: "floated left, and the second floated to the right" + text run at (5,327) width 94: "below the first." + RenderBlock {HR} at (364,1360) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,1370) size 410x226 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - RenderText {#text} at (261,5) size 392x206 + RenderText {#text} at (261,5) size 392x215 text run at (261,5) width 136: "This is text within the" - text run at (261,22) width 37: "DIV. " - text run at (298,22) width 77: "The floating" + text run at (261,23) width 37: "DIV. " + text run at (298,23) width 77: "The floating" text run at (5,41) width 114: "images within this" - text run at (5,58) width 119: "DIV should not go" - text run at (5,75) width 144: "beyond the left or right" - text run at (5,92) width 374: "inner edge of this DIV, which means that the borders of the" - text run at (5,109) width 378: "floating images should not overlap the top or side borders of" - text run at (5,126) width 134: "the DIV in any way. " - text run at (139,126) width 257: "In addition, they should not overlap each" - text run at (5,143) width 329: "other in any way, nor should the floated elements be" - text run at (5,160) width 183: "overwritten by the DIV text. " - text run at (188,160) width 190: "In addition, the floated images" - text run at (5,177) width 357: "should not be side-by-side, but instead the first should be" - text run at (5,194) width 386: "floated left, and the second floated to the right below the first." - RenderBlock {HR} at (24,1579) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,1605) size 765x112 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (566,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (5,59) width 119: "DIV should not go" + text run at (5,77) width 381: "beyond the left or right inner edge of this DIV, which means" + text run at (5,95) width 381: "that the borders of the floating images should not overlap the" + text run at (5,113) width 272: "top or side borders of the DIV in any way. " + text run at (277,113) width 103: "In addition, they" + text run at (5,131) width 358: "should not overlap each other in any way, nor should the" + text run at (5,149) width 308: "floated elements be overwritten by the DIV text. " + text run at (313,149) width 72: "In addition," + text run at (5,167) width 382: "the floated images should not be side-by-side, but instead the" + text run at (5,185) width 381: "first should be floated left, and the second floated to the right" + text run at (5,203) width 94: "below the first." + RenderBlock {HR} at (24,1620) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,1646) size 765x118 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (566,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 132x51 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 132x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,5) size 551x102 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,5) size 551x107 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 180: "The floating elements within" - text run at (199,22) width 352: "this DIV should not go beyond the top side of this DIV," - text run at (199,39) width 335: "which means that the borders of the floating elements" - text run at (199,56) width 350: "should not overlap the top or side borders of the DIV in" - text run at (199,73) width 62: "any way. " - text run at (261,73) width 264: "In addition, the top of the left-floating box" - text run at (5,90) width 365: "should not be higher than the top of the right-floating box." - RenderBlock {HR} at (364,1725) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,1735) size 765x61 [border: (5px solid #800080)] + text run at (199,23) width 352: "this DIV should not go beyond the top side of this DIV," + text run at (199,41) width 335: "which means that the borders of the floating elements" + text run at (199,59) width 350: "should not overlap the top or side borders of the DIV in" + text run at (199,77) width 62: "any way. " + text run at (261,77) width 264: "In addition, the top of the left-floating box" + text run at (5,95) width 365: "should not be higher than the top of the right-floating box." + RenderBlock {HR} at (364,1772) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,1782) size 765x64 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 705x51 + RenderText {#text} at (20,5) size 720x53 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 525: "The floating images within this DIV should not go beyond the top side of this DIV," - text run at (20,22) width 705: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in any" - text run at (20,39) width 35: "way. " - text run at (55,39) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." - RenderBlock {HR} at (24,1820) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,1846) size 765x129 [border: (5px solid #800080)] + text run at (20,23) width 705: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in any" + text run at (5,41) width 35: "way. " + text run at (40,41) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." + RenderBlock {HR} at (24,1870) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,1896) size 765x136 [border: (5px solid #800080)] RenderText {#text} at (199,5) size 185x17 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (384,5) size 545x34 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (384,5) size 545x35 text run at (384,5) width 360: " The floating elements within this DIV should not go any" - text run at (199,22) width 477: "higher than the line-box containing the inline content which precedes them. " - text run at (676,22) width 12: "* " - RenderBlock (floating) {P} at (566,39) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (199,23) width 477: "higher than the line-box containing the inline content which precedes them. " + text run at (676,23) width 12: "* " + RenderBlock (floating) {P} at (566,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (688,22) size 755x102 - text run at (688,22) width 72: "This means" - text run at (199,39) width 349: "that the top side of each float can be, at most, as high as" - text run at (199,56) width 352: "the top edge of the inline element containing the content" - text run at (199,73) width 331: "just before the floating elements occur in the source. " - text run at (530,73) width 13: "In" - text run at (5,90) width 545: "order to mark these points clearly, an asterisk has been inserted just before each floated" - text run at (5,107) width 53: "element." - RenderBlock {HR} at (364,1983) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,1993) size 765x78 [border: (5px solid #800080)] + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (688,23) size 755x107 + text run at (688,23) width 72: "This means" + text run at (199,41) width 349: "that the top side of each float can be, at most, as high as" + text run at (199,59) width 352: "the top edge of the inline element containing the content" + text run at (199,77) width 331: "just before the floating elements occur in the source. " + text run at (530,77) width 13: "In" + text run at (5,95) width 545: "order to mark these points clearly, an asterisk has been inserted just before each floated" + text run at (5,113) width 53: "element." + RenderBlock {HR} at (364,2040) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,2050) size 765x82 [border: (5px solid #800080)] RenderText {#text} at (20,5) size 185x17 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (205,5) size 688x34 + RenderText {#text} at (205,5) size 688x35 text run at (205,5) width 503: " The floating images within this DIV should not go any higher than the line-box" - text run at (20,22) width 323: "containing the inline content which precedes them. " - text run at (343,22) width 12: "* " - RenderImage {IMG} at (745,22) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (355,22) size 736x51 - text run at (355,22) width 376: "This means that the top side of each float can be, at most, as" - text run at (20,39) width 721: "high as the top edge of the inline element containing the content just before the floating images occur in the source." - text run at (5,56) width 608: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." - RenderBlock {HR} at (24,2095) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,2121) size 765x248 [border: (5px solid #800080)] + text run at (20,23) width 323: "containing the inline content which precedes them. " + text run at (343,23) width 12: "* " + RenderImage {IMG} at (745,23) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (355,23) size 738x53 + text run at (355,23) width 376: "This means that the top side of each float can be, at most, as" + text run at (5,41) width 725: "high as the top edge of the inline element containing the content just before the floating images occur in the source. " + text run at (730,41) width 13: "In" + text run at (5,59) width 591: "order to mark these points clearly, an asterisk has been inserted just before each floated image." + RenderBlock {HR} at (24,2156) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,2182) size 765x262 [border: (5px solid #800080)] RenderText {#text} at (199,5) size 185x17 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (384,5) size 545x34 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (384,5) size 545x35 text run at (384,5) width 360: " The floating elements within this DIV should not go any" - text run at (199,22) width 477: "higher than the line-box containing the inline content which precedes them. " - text run at (676,22) width 12: "* " - RenderBlock (floating) {P} at (566,39) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (199,23) width 477: "higher than the line-box containing the inline content which precedes them. " + text run at (676,23) width 12: "* " + RenderBlock (floating) {P} at (566,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (688,22) size 561x34 - text run at (688,22) width 72: "This means" - text run at (199,39) width 238: "that the top side of each float can be,*" - RenderBlock (floating) {P} at (199,56) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (688,23) size 561x35 + text run at (688,23) width 72: "This means" + text run at (199,41) width 238: "that the top side of each float can be,*" + RenderBlock (floating) {P} at (199,59) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 117: "paragraph (third in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (437,39) size 274x102 - text run at (437,39) width 119: " at most, as high as" - text run at (393,56) width 156: "the top edge of the inline" - text run at (393,73) width 142: "element containing the" - text run at (393,90) width 139: "content just before the" - text run at (393,107) width 162: "floating elements occur in" - text run at (587,124) width 72: "the source. " - text run at (659,124) width 8: "*" - RenderBlock (floating) {P} at (393,124) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (17,35) width 117: "paragraph (third in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (437,41) size 274x107 + text run at (437,41) width 119: " at most, as high as" + text run at (393,59) width 156: "the top edge of the inline" + text run at (393,77) width 142: "element containing the" + text run at (393,95) width 139: "content just before the" + text run at (393,113) width 162: "floating elements occur in" + text run at (587,131) width 72: "the source. " + text run at (659,131) width 8: "*" + RenderBlock (floating) {P} at (393,131) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 126: "paragraph (fourth in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (667,124) size 742x119 - text run at (667,124) width 70: " In order to" - text run at (587,141) width 160: "mark these points clearly," - text run at (587,158) width 125: "an asterisk has been" - text run at (587,175) width 152: "inserted just before each" - text run at (587,192) width 104: "floated element. " - text run at (691,192) width 48: "If a line" - text run at (5,209) width 722: "has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" - text run at (5,226) width 173: "which the asterisk appears. " - text run at (178,226) width 402: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {HR} at (364,2377) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,2387) size 765x112 [border: (5px solid #800080)] + text run at (17,35) width 126: "paragraph (fourth in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (667,131) size 742x125 + text run at (667,131) width 70: " In order to" + text run at (587,149) width 160: "mark these points clearly," + text run at (587,167) width 125: "an asterisk has been" + text run at (587,185) width 152: "inserted just before each" + text run at (587,203) width 104: "floated element. " + text run at (691,203) width 48: "If a line" + text run at (5,221) width 722: "has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" + text run at (5,239) width 173: "which the asterisk appears. " + text run at (178,239) width 402: "Otherwise, its top should align with the top of the next line-box." + RenderBlock {HR} at (364,2452) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,2462) size 765x118 [border: (5px solid #800080)] RenderText {#text} at (20,5) size 185x17 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (205,5) size 673x34 + RenderText {#text} at (205,5) size 673x35 text run at (205,5) width 503: " The floating images within this DIV should not go any higher than the line-box" - text run at (35,22) width 323: "containing the inline content which precedes them. " - text run at (358,22) width 12: "* " - RenderImage {IMG} at (745,22) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (370,22) size 318x17 - text run at (370,22) width 310: "This means that the top side of each float can be, " - text run at (680,22) width 8: "*" - RenderImage {IMG} at (20,22) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (688,22) size 706x51 - text run at (688,22) width 53: " at most," - text run at (35,39) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" - text run at (50,56) width 49: "source. " - text run at (99,56) width 8: "*" - RenderImage {IMG} at (35,56) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (107,56) size 694x51 - text run at (107,56) width 616: " In order to mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (723,56) width 21: "If a" - text run at (50,73) width 687: "line has room for a floated image, then the image should float so that its top is aligned with the top of the line-" - text run at (50,90) width 217: "box in which the asterisk appears. " - text run at (267,90) width 402: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {HR} at (24,2523) size 579x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,2549) size 490x282 [border: (5px solid #800080)] + text run at (35,23) width 323: "containing the inline content which precedes them. " + text run at (358,23) width 12: "* " + RenderImage {IMG} at (745,23) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (370,23) size 318x17 + text run at (370,23) width 310: "This means that the top side of each float can be, " + text run at (680,23) width 8: "*" + RenderImage {IMG} at (20,23) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (688,23) size 721x53 + text run at (688,23) width 53: " at most," + text run at (35,41) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" + text run at (20,59) width 49: "source. " + text run at (69,59) width 8: "*" + RenderImage {IMG} at (5,59) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (77,59) size 736x53 + text run at (77,59) width 616: " In order to mark these points clearly, an asterisk has been inserted just before each floated image. " + text run at (693,59) width 48: "If a line" + text run at (20,77) width 700: "has room for a floated image, then the image should float so that its top is aligned with the top of the line-box in" + text run at (5,95) width 173: "which the asterisk appears. " + text run at (178,95) width 402: "Otherwise, its top should align with the top of the next line-box." + RenderBlock {HR} at (24,2604) size 579x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,2630) size 490x298 [border: (5px solid #800080)] RenderText {#text} at (199,5) size 54x17 text run at (199,5) width 54: "This is *" - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." RenderText {#text} at (253,5) size 12x17 text run at (253,5) width 12: " *" - RenderBlock (floating) {P} at (291,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + RenderBlock (floating) {P} at (291,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,22) size 477x255 - text run at (199,22) width 90: "text within the" - text run at (199,39) width 37: "DIV. " - text run at (236,39) width 40: "Under" - text run at (199,56) width 88: "CSS1, the left" - text run at (199,73) width 48: "floating" - text run at (5,90) width 477: "element should be placed in the upper left corner of the DIV, and the purple" - text run at (5,107) width 447: "border of the DIV should abut the green border of the floating element." - text run at (5,124) width 444: "Similarly, the right floating element should be placed in the upper right" - text run at (5,141) width 468: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,158) width 451: "border of the floating element. The text of the DIV element should flow" - text run at (5,175) width 461: "between and under the two floating elements. The two asterisk characters" - text run at (5,192) width 468: "mark the insertion points of the floating elements. It is expected that, under" - text run at (5,209) width 470: "future specifications, it may be acceptable for the top of floated elements to" - text run at (5,226) width 475: "align with the top of the line-box following the insertion point of the floated" - text run at (5,243) width 466: "element to avoid floating elements appearing before text which precedes it" - text run at (5,260) width 150: "in the source document." - RenderBlock {HR} at (364,2839) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (2,2849) size 490x214 [border: (5px solid #800080)] + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,23) size 477x269 + text run at (199,23) width 90: "text within the" + text run at (199,41) width 37: "DIV. " + text run at (236,41) width 40: "Under" + text run at (199,59) width 88: "CSS1, the left" + text run at (199,77) width 48: "floating" + text run at (5,95) width 477: "element should be placed in the upper left corner of the DIV, and the purple" + text run at (5,113) width 447: "border of the DIV should abut the green border of the floating element." + text run at (5,131) width 444: "Similarly, the right floating element should be placed in the upper right" + text run at (5,149) width 468: "corner of the DIV, and the purple border of the DIV should abut the green" + text run at (5,167) width 451: "border of the floating element. The text of the DIV element should flow" + text run at (5,185) width 461: "between and under the two floating elements. The two asterisk characters" + text run at (5,203) width 468: "mark the insertion points of the floating elements. It is expected that, under" + text run at (5,221) width 470: "future specifications, it may be acceptable for the top of floated elements to" + text run at (5,239) width 475: "align with the top of the line-box following the insertion point of the floated" + text run at (5,257) width 466: "element to avoid floating elements appearing before text which precedes it" + text run at (5,275) width 150: "in the source document." + RenderBlock {HR} at (364,2936) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (2,2946) size 490x226 [border: (5px solid #800080)] RenderText {#text} at (20,5) size 54x17 text run at (20,5) width 54: "This is *" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderText {#text} at (74,5) size 12x17 text run at (74,5) width 12: " *" RenderImage {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (86,5) size 480x204 + RenderText {#text} at (86,5) size 480x215 text run at (86,5) width 135: " text within the DIV. " text run at (221,5) width 226: "Under CSS1, the left floating image" - text run at (20,22) width 424: "should be placed in the upper left corner of the DIV, and the purple" - text run at (20,39) width 436: "border of the DIV should abut the green border of the floating image." - text run at (5,56) width 477: "Similarly, the right floating image should be placed in the upper right corner" - text run at (5,73) width 469: "of the DIV, and the purple border of the DIV should abut the green border" - text run at (5,90) width 479: "of the floating image. The text of the DIV element should flow between and" - text run at (5,107) width 477: "under the two floating image. The two asterisk characters mark the insertion" - text run at (5,124) width 180: "points of the floating image. " - text run at (185,124) width 300: "It is expected that, under future specifications, it" - text run at (5,141) width 478: "may be acceptable for the top of floated elements to align with the top of the" - text run at (5,158) width 429: "line-box following the insertion point of the floated element to avoid" - text run at (5,175) width 442: "floating elements appearing before text which precedes it in the source" - text run at (5,192) width 66: "document." - RenderBlock {HR} at (24,3087) size 579x2 [border: (1px inset #000000)] - RenderTable {TABLE} at (0,3113) size 769x2953 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x2951 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (20,23) width 424: "should be placed in the upper left corner of the DIV, and the purple" + text run at (5,41) width 436: "border of the DIV should abut the green border of the floating image." + text run at (5,59) width 477: "Similarly, the right floating image should be placed in the upper right corner" + text run at (5,77) width 469: "of the DIV, and the purple border of the DIV should abut the green border" + text run at (5,95) width 479: "of the floating image. The text of the DIV element should flow between and" + text run at (5,113) width 477: "under the two floating image. The two asterisk characters mark the insertion" + text run at (5,131) width 180: "points of the floating image. " + text run at (185,131) width 300: "It is expected that, under future specifications, it" + text run at (5,149) width 478: "may be acceptable for the top of floated elements to align with the top of the" + text run at (5,167) width 429: "line-box following the insertion point of the floated element to avoid" + text run at (5,185) width 442: "floating elements appearing before text which precedes it in the source" + text run at (5,203) width 66: "document." + RenderBlock {HR} at (24,3196) size 579x2 [border: (1px inset #000000)] + RenderTable {TABLE} at (0,3222) size 769x3043 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x3041 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x2926 - RenderTableCell {TD} at (0,1475) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x3015 + RenderTableCell {TD} at (0,1520) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x2926 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x51 - RenderText {#text} at (0,0) size 740x51 + RenderTableCell {TD} at (12,26) size 755x3015 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x54 + RenderText {#text} at (0,0) size 740x53 text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " text run at (681,0) width 36: "Other" - text run at (0,17) width 740: "than the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the" - text run at (0,34) width 38: "floats." - RenderBlock {HR} at (28,79) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,105) size 743x95 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (0,18) width 740: "than the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the" + text run at (0,36) width 38: "floats." + RenderBlock {HR} at (28,82) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,108) size 743x100 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderBlock (floating) {P} at (544,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderBlock (floating) {P} at (544,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,5) size 337x85 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,5) size 337x89 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 136: "The floating elements" - text run at (199,22) width 337: "within this DIV should not go beyond the left or right" - text run at (199,39) width 334: "inner edge of this DIV, which means that the borders" - text run at (199,56) width 332: "of the floating elements should not overlap the top or" - text run at (199,73) width 153: "side borders of the DIV." - RenderBlock {HR} at (357,208) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,218) size 743x61 [border: (5px solid #800080)] + text run at (199,23) width 337: "within this DIV should not go beyond the left or right" + text run at (199,41) width 334: "inner edge of this DIV, which means that the borders" + text run at (199,59) width 332: "of the floating elements should not overlap the top or" + text run at (199,77) width 153: "side borders of the DIV." + RenderBlock {HR} at (357,216) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,226) size 743x64 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 703x51 + RenderText {#text} at (20,5) size 718x53 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 502: "The floating images within this DIV should not go beyond the left or right inner" - text run at (20,22) width 703: "edge of this DIV, which means that the borders of the floating images should not overlap the top or side borders" - text run at (20,39) width 73: "of the DIV." - RenderBlock {HR} at (28,303) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,329) size 442x214 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x68 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 122x34 + text run at (20,23) width 703: "edge of this DIV, which means that the borders of the floating images should not overlap the top or side borders" + text run at (5,41) width 73: "of the DIV." + RenderBlock {HR} at (28,314) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,340) size 442x226 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 122x35 text run at (17,17) width 122: "This is the first left-" - text run at (17,34) width 119: "floating paragraph." - RenderBlock (floating) {P} at (199,5) size 194x68 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 142x34 + text run at (17,35) width 119: "floating paragraph." + RenderBlock (floating) {P} at (199,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 142x35 text run at (17,17) width 142: "This is the second left-" - text run at (17,34) width 119: "floating paragraph." - RenderBlock (floating) {P} at (5,73) size 194x68 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 127x34 + text run at (17,35) width 119: "floating paragraph." + RenderBlock (floating) {P} at (5,75) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 127x35 text run at (17,17) width 127: "This is the third left-" - text run at (17,34) width 119: "floating paragraph." - RenderText {#text} at (393,5) size 430x204 + text run at (17,35) width 119: "floating paragraph." + RenderText {#text} at (393,5) size 430x215 text run at (393,5) width 42: "This is" - text run at (393,22) width 23: "text" - text run at (393,39) width 40: "within" - text run at (393,56) width 19: "the" - text run at (199,73) width 37: "DIV. " - text run at (236,73) width 180: "The floating elements within" - text run at (199,90) width 219: "this DIV should not go beyond the" - text run at (199,107) width 220: "left or right inner edge of this DIV," - text run at (199,124) width 224: "which means that the borders of the" - text run at (5,141) width 412: "floating elements should not overlap the top or side borders of the" - text run at (5,158) width 111: "DIV in any way. " - text run at (116,158) width 297: "In addition, they should not overlap each other." - text run at (5,175) width 425: "The first two should be side by side, whereas the third should be on" - text run at (5,192) width 95: "the next \"line.\"" - RenderBlock {HR} at (357,551) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,561) size 360x199 [border: (5px solid #800080)] + text run at (393,23) width 23: "text" + text run at (393,41) width 40: "within" + text run at (393,59) width 19: "the" + text run at (199,77) width 37: "DIV. " + text run at (236,77) width 180: "The floating elements within" + text run at (199,95) width 219: "this DIV should not go beyond the" + text run at (199,113) width 220: "left or right inner edge of this DIV," + text run at (199,131) width 224: "which means that the borders of the" + text run at (5,149) width 412: "floating elements should not overlap the top or side borders of the" + text run at (5,167) width 111: "DIV in any way. " + text run at (116,167) width 297: "In addition, they should not overlap each other." + text run at (5,185) width 425: "The first two should be side by side, whereas the third should be on" + text run at (5,203) width 95: "the next \"line.\"" + RenderBlock {HR} at (357,574) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,584) size 360x190 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - RenderText {#text} at (317,5) size 350x189 + RenderText {#text} at (317,5) size 350x179 text run at (317,5) width 28: "This" - text run at (317,22) width 37: "is text" + text run at (317,23) width 37: "is text" text run at (161,41) width 104: "within the DIV. " text run at (265,41) width 77: "The floating" - text run at (161,58) width 193: "images within this DIV should" - text run at (161,75) width 188: "not go beyond the left or right" - text run at (5,92) width 334: "inner edge of this DIV, which means that the borders" - text run at (5,109) width 350: "of the floating images should not overlap the top or side" - text run at (5,126) width 202: "borders of the DIV in any way. " - text run at (207,126) width 103: "In addition, they" - text run at (5,143) width 194: "should not overlap each other. " - text run at (199,143) width 146: "The first two should be" - text run at (5,160) width 329: "side by side, whereas the third should be on the next" - text run at (5,177) width 41: "\"line.\"" - RenderBlock {HR} at (28,784) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,810) size 314x333 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (161,59) width 193: "images within this DIV should" + text run at (5,77) width 338: "not go beyond the left or right inner edge of this DIV," + text run at (5,95) width 324: "which means that the borders of the floating images" + text run at (5,113) width 350: "should not overlap the top or side borders of the DIV in" + text run at (5,131) width 62: "any way. " + text run at (67,131) width 257: "In addition, they should not overlap each" + text run at (5,149) width 40: "other. " + text run at (45,149) width 307: "The first two should be side by side, whereas the" + text run at (5,167) width 213: "third should be on the next \"line.\"" + RenderBlock {HR} at (28,798) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,824) size 314x350 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderBlock (floating) {P} at (115,90) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderBlock (floating) {P} at (115,93) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,5) size 295x323 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,5) size 304x339 text run at (199,5) width 69: "This is text" - text run at (199,22) width 100: "within the DIV." - text run at (199,39) width 77: "The floating" - text run at (199,56) width 99: "elements within" - text run at (199,73) width 101: "this DIV should" - text run at (5,90) width 91: "not go beyond" - text run at (5,107) width 93: "the left or right" - text run at (5,124) width 109: "inner edge of this" - text run at (5,141) width 76: "DIV, which" - text run at (5,158) width 90: "means that the" - text run at (5,175) width 268: "borders of the floating elements should not" - text run at (5,192) width 280: "overlap the top or side borders of the DIV in" - text run at (5,209) width 62: "any way. " - text run at (67,209) width 224: "In addition, they should not overlap" - text run at (5,226) width 284: "each other in any way, nor should the floated" - text run at (5,243) width 261: "elements be overwritten by the DIV text. " - text run at (266,243) width 13: "In" - text run at (5,260) width 273: "addition, the floated elements should not be" - text run at (5,277) width 268: "side-by-side, but instead the first should be" - text run at (5,294) width 288: "floated left, and the second floated to the right" - text run at (5,311) width 94: "below the first." - RenderBlock {HR} at (357,1151) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,1161) size 410x216 [border: (5px solid #800080)] + text run at (199,23) width 100: "within the DIV." + text run at (199,41) width 77: "The floating" + text run at (199,59) width 99: "elements within" + text run at (5,93) width 101: "this DIV should" + text run at (5,111) width 91: "not go beyond" + text run at (5,129) width 93: "the left or right" + text run at (5,147) width 109: "inner edge of this" + text run at (5,165) width 76: "DIV, which" + text run at (5,183) width 292: "means that the borders of the floating elements" + text run at (5,201) width 301: "should not overlap the top or side borders of the" + text run at (5,219) width 111: "DIV in any way. " + text run at (116,219) width 173: "In addition, they should not" + text run at (5,237) width 288: "overlap each other in any way, nor should the" + text run at (5,255) width 304: "floated elements be overwritten by the DIV text." + text run at (5,273) width 290: "In addition, the floated elements should not be" + text run at (5,291) width 268: "side-by-side, but instead the first should be" + text run at (5,309) width 288: "floated left, and the second floated to the right" + text run at (5,327) width 94: "below the first." + RenderBlock {HR} at (357,1182) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,1192) size 410x226 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - RenderText {#text} at (261,5) size 392x206 + RenderText {#text} at (261,5) size 392x215 text run at (261,5) width 136: "This is text within the" - text run at (261,22) width 37: "DIV. " - text run at (298,22) width 77: "The floating" + text run at (261,23) width 37: "DIV. " + text run at (298,23) width 77: "The floating" text run at (5,41) width 114: "images within this" - text run at (5,58) width 119: "DIV should not go" - text run at (5,75) width 144: "beyond the left or right" - text run at (5,92) width 374: "inner edge of this DIV, which means that the borders of the" - text run at (5,109) width 378: "floating images should not overlap the top or side borders of" - text run at (5,126) width 134: "the DIV in any way. " - text run at (139,126) width 257: "In addition, they should not overlap each" - text run at (5,143) width 329: "other in any way, nor should the floated elements be" - text run at (5,160) width 183: "overwritten by the DIV text. " - text run at (188,160) width 190: "In addition, the floated images" - text run at (5,177) width 357: "should not be side-by-side, but instead the first should be" - text run at (5,194) width 386: "floated left, and the second floated to the right below the first." - RenderBlock {HR} at (28,1401) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,1427) size 743x112 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (544,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (5,59) width 119: "DIV should not go" + text run at (5,77) width 381: "beyond the left or right inner edge of this DIV, which means" + text run at (5,95) width 381: "that the borders of the floating images should not overlap the" + text run at (5,113) width 272: "top or side borders of the DIV in any way. " + text run at (277,113) width 103: "In addition, they" + text run at (5,131) width 358: "should not overlap each other in any way, nor should the" + text run at (5,149) width 308: "floated elements be overwritten by the DIV text. " + text run at (313,149) width 72: "In addition," + text run at (5,167) width 382: "the floated images should not be side-by-side, but instead the" + text run at (5,185) width 381: "first should be floated left, and the second floated to the right" + text run at (5,203) width 94: "below the first." + RenderBlock {HR} at (28,1442) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,1468) size 743x118 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (544,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 132x51 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 132x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,5) size 533x102 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,5) size 533x107 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 136: "The floating elements" - text run at (199,22) width 333: "within this DIV should not go beyond the top side of" - text run at (199,39) width 339: "this DIV, which means that the borders of the floating" - text run at (199,56) width 337: "elements should not overlap the top or side borders of" - text run at (199,73) width 134: "the DIV in any way. " - text run at (333,73) width 188: "In addition, the top of the left-" - text run at (5,90) width 445: "floating box should not be higher than the top of the right-floating box." - RenderBlock {HR} at (357,1547) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,1557) size 743x78 [border: (5px solid #800080)] + text run at (199,23) width 333: "within this DIV should not go beyond the top side of" + text run at (199,41) width 339: "this DIV, which means that the borders of the floating" + text run at (199,59) width 337: "elements should not overlap the top or side borders of" + text run at (199,77) width 134: "the DIV in any way. " + text run at (333,77) width 188: "In addition, the top of the left-" + text run at (5,95) width 445: "floating box should not be higher than the top of the right-floating box." + RenderBlock {HR} at (357,1594) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,1604) size 743x64 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 717x68 + RenderText {#text} at (20,5) size 723x53 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 525: "The floating images within this DIV should not go beyond the top side of this DIV," - text run at (20,22) width 678: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in" - text run at (20,39) width 62: "any way. " - text run at (82,39) width 615: "In addition, the top of the left-floating image should not be higher than the top of the right-floating" - text run at (5,56) width 42: "image." - RenderBlock {HR} at (28,1659) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,1685) size 743x129 [border: (5px solid #800080)] + text run at (20,23) width 678: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in" + text run at (5,41) width 62: "any way. " + text run at (67,41) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." + RenderBlock {HR} at (28,1692) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,1718) size 743x136 [border: (5px solid #800080)] RenderText {#text} at (199,5) size 185x17 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (384,5) size 518x34 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (384,5) size 518x35 text run at (384,5) width 333: " The floating elements within this DIV should not go" - text run at (199,22) width 504: "any higher than the line-box containing the inline content which precedes them. " - text run at (703,22) width 8: "*" - RenderBlock (floating) {P} at (544,39) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (199,23) width 504: "any higher than the line-box containing the inline content which precedes them. " + text run at (703,23) width 8: "*" + RenderBlock (floating) {P} at (544,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,39) size 539x85 - text run at (199,39) width 321: "This means that the top side of each float can be, at" - text run at (199,56) width 313: "most, as high as the top edge of the inline element" - text run at (199,73) width 343: "containing the content just before the floating elements" - text run at (5,90) width 127: "occur in the source. " - text run at (132,90) width 412: "In order to mark these points clearly, an asterisk has been inserted" - text run at (5,107) width 203: "just before each floated element." - RenderBlock {HR} at (357,1822) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,1832) size 743x78 [border: (5px solid #800080)] + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,41) size 539x89 + text run at (199,41) width 321: "This means that the top side of each float can be, at" + text run at (199,59) width 313: "most, as high as the top edge of the inline element" + text run at (199,77) width 343: "containing the content just before the floating elements" + text run at (5,95) width 127: "occur in the source. " + text run at (132,95) width 412: "In order to mark these points clearly, an asterisk has been inserted" + text run at (5,113) width 203: "just before each floated element." + RenderBlock {HR} at (357,1862) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,1872) size 743x82 [border: (5px solid #800080)] RenderText {#text} at (20,5) size 185x17 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (205,5) size 688x34 + RenderText {#text} at (205,5) size 688x35 text run at (205,5) width 503: " The floating images within this DIV should not go any higher than the line-box" - text run at (20,22) width 323: "containing the inline content which precedes them. " - text run at (343,22) width 12: "* " - RenderImage {IMG} at (723,22) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (355,22) size 709x51 - text run at (355,22) width 359: "This means that the top side of each float can be, at most," - text run at (20,39) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" - text run at (5,56) width 49: "source. " - text run at (54,56) width 608: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." - RenderBlock {HR} at (28,1934) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,1960) size 743x214 [border: (5px solid #800080)] + text run at (20,23) width 323: "containing the inline content which precedes them. " + text run at (343,23) width 12: "* " + RenderImage {IMG} at (723,23) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (355,23) size 709x53 + text run at (355,23) width 359: "This means that the top side of each float can be, at most," + text run at (5,41) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" + text run at (5,59) width 49: "source. " + text run at (54,59) width 608: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." + RenderBlock {HR} at (28,1978) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,2004) size 743x226 [border: (5px solid #800080)] RenderText {#text} at (199,5) size 185x17 text run at (199,5) width 177: "This is text within the DIV. " text run at (376,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (384,5) size 518x34 + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (384,5) size 518x35 text run at (384,5) width 333: " The floating elements within this DIV should not go" - text run at (199,22) width 504: "any higher than the line-box containing the inline content which precedes them. " - text run at (703,22) width 8: "*" - RenderBlock (floating) {P} at (544,39) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + text run at (199,23) width 504: "any higher than the line-box containing the inline content which precedes them. " + text run at (703,23) width 8: "*" + RenderBlock (floating) {P} at (544,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,39) size 314x17 - text run at (199,39) width 314: "This means that the top side of each float can be,*" - RenderBlock (floating) {P} at (199,56) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,41) size 314x17 + text run at (199,41) width 314: "This means that the top side of each float can be,*" + RenderBlock (floating) {P} at (199,59) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 117: "paragraph (third in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (513,39) size 246x102 - text run at (513,39) width 15: " at" - text run at (393,56) width 147: "most, as high as the top" - text run at (393,73) width 109: "edge of the inline" - text run at (393,90) width 142: "element containing the" - text run at (393,107) width 139: "content just before the" - text run at (393,124) width 238: "floating elements occur in the source. " - text run at (631,124) width 8: "*" - RenderBlock (floating) {P} at (5,141) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + text run at (17,35) width 117: "paragraph (third in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (513,41) size 246x107 + text run at (513,41) width 15: " at" + text run at (393,59) width 147: "most, as high as the top" + text run at (393,77) width 109: "edge of the inline" + text run at (393,95) width 142: "element containing the" + text run at (393,113) width 139: "content just before the" + text run at (393,131) width 238: "floating elements occur in the source. " + text run at (631,131) width 8: "*" + RenderBlock (floating) {P} at (5,149) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 126: "paragraph (fourth in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (639,124) size 539x85 - text run at (639,124) width 70: " In order to" - text run at (199,141) width 492: "mark these points clearly, an asterisk has been inserted just before each floated" - text run at (199,158) width 57: "element. " - text run at (256,158) width 477: "If a line has room for a floated element, then the element should float so that" - text run at (199,175) width 470: "its top is aligned with the top of the line-box in which the asterisk appears. " - text run at (669,175) width 69: "Otherwise," - text run at (199,192) width 329: "its top should align with the top of the next line-box." - RenderBlock {HR} at (357,2186) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,2196) size 743x112 [border: (5px solid #800080)] + text run at (17,35) width 126: "paragraph (fourth in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (639,131) size 539x89 + text run at (639,131) width 70: " In order to" + text run at (199,149) width 492: "mark these points clearly, an asterisk has been inserted just before each floated" + text run at (199,167) width 57: "element. " + text run at (256,167) width 477: "If a line has room for a floated element, then the element should float so that" + text run at (199,185) width 470: "its top is aligned with the top of the line-box in which the asterisk appears. " + text run at (669,185) width 69: "Otherwise," + text run at (199,203) width 329: "its top should align with the top of the next line-box." + RenderBlock {HR} at (357,2241) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,2251) size 743x118 [border: (5px solid #800080)] RenderText {#text} at (20,5) size 185x17 text run at (20,5) width 177: "This is text within the DIV. " text run at (197,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (205,5) size 673x34 + RenderText {#text} at (205,5) size 673x35 text run at (205,5) width 503: " The floating images within this DIV should not go any higher than the line-box" - text run at (35,22) width 323: "containing the inline content which precedes them. " - text run at (358,22) width 12: "* " - RenderImage {IMG} at (723,22) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (370,22) size 318x17 - text run at (370,22) width 310: "This means that the top side of each float can be, " - text run at (680,22) width 8: "*" - RenderImage {IMG} at (20,22) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (688,22) size 688x51 - text run at (688,22) width 15: " at" - text run at (35,39) width 688: "most, as high as the top edge of the inline element containing the content just before the floating images occur" - text run at (50,56) width 88: "in the source. " - text run at (138,56) width 8: "*" - RenderImage {IMG} at (35,56) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (146,56) size 687x51 - text run at (146,56) width 566: " In order to mark these points clearly, an asterisk has been inserted just before each floated" - text run at (50,73) width 46: "image. " - text run at (96,73) width 640: "If a line has room for a floated image, then the image should float so that its top is aligned with the top" - text run at (50,90) width 285: "of the line-box in which the asterisk appears. " - text run at (335,90) width 402: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {HR} at (28,2332) size 563x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,2358) size 490x282 [border: (5px solid #800080)] + text run at (35,23) width 323: "containing the inline content which precedes them. " + text run at (358,23) width 12: "* " + RenderImage {IMG} at (723,23) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (370,23) size 318x17 + text run at (370,23) width 310: "This means that the top side of each float can be, " + text run at (680,23) width 8: "*" + RenderImage {IMG} at (20,23) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (688,23) size 703x53 + text run at (688,23) width 15: " at" + text run at (35,41) width 688: "most, as high as the top edge of the inline element containing the content just before the floating images occur" + text run at (20,59) width 88: "in the source. " + text run at (108,59) width 8: "*" + RenderImage {IMG} at (5,59) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (116,59) size 727x53 + text run at (116,59) width 612: " In order to mark these points clearly, an asterisk has been inserted just before each floated image." + text run at (20,77) width 712: "If a line has room for a floated image, then the image should float so that its top is aligned with the top of the line-" + text run at (5,95) width 217: "box in which the asterisk appears. " + text run at (222,95) width 402: "Otherwise, its top should align with the top of the next line-box." + RenderBlock {HR} at (28,2393) size 563x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,2419) size 490x298 [border: (5px solid #800080)] RenderText {#text} at (199,5) size 54x17 text run at (199,5) width 54: "This is *" - RenderBlock (floating) {P} at (5,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 130x51 + RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x53 text run at (17,17) width 130: "This is a left-floating" - text run at (17,34) width 112: "paragraph (first in" - text run at (17,51) width 50: "source)." + text run at (17,35) width 112: "paragraph (first in" + text run at (17,53) width 50: "source)." RenderText {#text} at (253,5) size 12x17 text run at (253,5) width 12: " *" - RenderBlock (floating) {P} at (291,5) size 194x85 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 139x51 + RenderBlock (floating) {P} at (291,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x53 text run at (17,17) width 139: "This is a right-floating" - text run at (17,34) width 132: "paragraph (second in" - text run at (17,51) width 50: "source)." - RenderText {#text} at (199,22) size 477x255 - text run at (199,22) width 90: "text within the" - text run at (199,39) width 37: "DIV. " - text run at (236,39) width 40: "Under" - text run at (199,56) width 88: "CSS1, the left" - text run at (199,73) width 48: "floating" - text run at (5,90) width 477: "element should be placed in the upper left corner of the DIV, and the purple" - text run at (5,107) width 447: "border of the DIV should abut the green border of the floating element." - text run at (5,124) width 444: "Similarly, the right floating element should be placed in the upper right" - text run at (5,141) width 468: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,158) width 451: "border of the floating element. The text of the DIV element should flow" - text run at (5,175) width 461: "between and under the two floating elements. The two asterisk characters" - text run at (5,192) width 468: "mark the insertion points of the floating elements. It is expected that, under" - text run at (5,209) width 470: "future specifications, it may be acceptable for the top of floated elements to" - text run at (5,226) width 475: "align with the top of the line-box following the insertion point of the floated" - text run at (5,243) width 466: "element to avoid floating elements appearing before text which precedes it" - text run at (5,260) width 150: "in the source document." - RenderBlock {HR} at (357,2648) size 41x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (6,2658) size 490x214 [border: (5px solid #800080)] + text run at (17,35) width 132: "paragraph (second in" + text run at (17,53) width 50: "source)." + RenderText {#text} at (199,23) size 477x269 + text run at (199,23) width 90: "text within the" + text run at (199,41) width 37: "DIV. " + text run at (236,41) width 40: "Under" + text run at (199,59) width 88: "CSS1, the left" + text run at (199,77) width 48: "floating" + text run at (5,95) width 477: "element should be placed in the upper left corner of the DIV, and the purple" + text run at (5,113) width 447: "border of the DIV should abut the green border of the floating element." + text run at (5,131) width 444: "Similarly, the right floating element should be placed in the upper right" + text run at (5,149) width 468: "corner of the DIV, and the purple border of the DIV should abut the green" + text run at (5,167) width 451: "border of the floating element. The text of the DIV element should flow" + text run at (5,185) width 461: "between and under the two floating elements. The two asterisk characters" + text run at (5,203) width 468: "mark the insertion points of the floating elements. It is expected that, under" + text run at (5,221) width 470: "future specifications, it may be acceptable for the top of floated elements to" + text run at (5,239) width 475: "align with the top of the line-box following the insertion point of the floated" + text run at (5,257) width 466: "element to avoid floating elements appearing before text which precedes it" + text run at (5,275) width 150: "in the source document." + RenderBlock {HR} at (357,2725) size 41x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (6,2735) size 490x226 [border: (5px solid #800080)] RenderText {#text} at (20,5) size 54x17 text run at (20,5) width 54: "This is *" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderText {#text} at (74,5) size 12x17 text run at (74,5) width 12: " *" RenderImage {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (86,5) size 480x204 + RenderText {#text} at (86,5) size 480x215 text run at (86,5) width 135: " text within the DIV. " text run at (221,5) width 226: "Under CSS1, the left floating image" - text run at (20,22) width 424: "should be placed in the upper left corner of the DIV, and the purple" - text run at (20,39) width 436: "border of the DIV should abut the green border of the floating image." - text run at (5,56) width 477: "Similarly, the right floating image should be placed in the upper right corner" - text run at (5,73) width 469: "of the DIV, and the purple border of the DIV should abut the green border" - text run at (5,90) width 479: "of the floating image. The text of the DIV element should flow between and" - text run at (5,107) width 477: "under the two floating image. The two asterisk characters mark the insertion" - text run at (5,124) width 180: "points of the floating image. " - text run at (185,124) width 300: "It is expected that, under future specifications, it" - text run at (5,141) width 478: "may be acceptable for the top of floated elements to align with the top of the" - text run at (5,158) width 429: "line-box following the insertion point of the floated element to avoid" - text run at (5,175) width 442: "floating elements appearing before text which precedes it in the source" - text run at (5,192) width 66: "document." - RenderBlock {HR} at (28,2896) size 563x2 [border: (1px inset #000000)] + text run at (20,23) width 424: "should be placed in the upper left corner of the DIV, and the purple" + text run at (5,41) width 436: "border of the DIV should abut the green border of the floating image." + text run at (5,59) width 477: "Similarly, the right floating image should be placed in the upper right corner" + text run at (5,77) width 469: "of the DIV, and the purple border of the DIV should abut the green border" + text run at (5,95) width 479: "of the floating image. The text of the DIV element should flow between and" + text run at (5,113) width 477: "under the two floating image. The two asterisk characters mark the insertion" + text run at (5,131) width 180: "points of the floating image. " + text run at (185,131) width 300: "It is expected that, under future specifications, it" + text run at (5,149) width 478: "may be acceptable for the top of floated elements to align with the top of the" + text run at (5,167) width 429: "line-box following the insertion point of the floated element to avoid" + text run at (5,185) width 442: "floating elements appearing before text which precedes it in the source" + text run at (5,203) width 66: "document." + RenderBlock {HR} at (28,2985) size 563x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.png index 6ed28911f943..c8063999d4b5 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.txt index 7271552cc269..3b05fe0394f9 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/height_of_lines-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x2325 +layer at (0,0) size 785x2327 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2325 - RenderBlock {HTML} at (0,0) size 785x2325 - RenderBody {BODY} at (8,8) size 769x2309 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2327 + RenderBlock {HTML} at (0,0) size 785x2327 + RenderBody {BODY} at (8,8) size 769x2311 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x270 + RenderBlock {PRE} at (0,34) size 769x270 RenderText {#text} at (0,0) size 536x270 text run at (0,0) width 344: "P.one {font-size: 14px; line-height: 20px;}" text run at (0,15) width 304: "IMG.onea {vertical-align: text-bottom;" @@ -26,8 +26,8 @@ layer at (0,0) size 785x2325 text run at (0,225) width 312: " padding: 5px; border-style: solid;" text run at (0,240) width 320: " border-width: 10px; margin: -10px;}" text run at (0,255) width 0: " " - RenderBlock {HR} at (0,316) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,332) size 769x465 + RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,333) size 769x465 RenderText {#text} at (0,2) size 767x238 text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " text run at (420,2) width 347: "This means that the lines of text within it should be separated" @@ -43,7 +43,7 @@ layer at (0,0) size 785x2325 text run at (732,225) width 25: "This" text run at (0,427) width 744: "is additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" text run at (0,447) width 45: "aligned." - RenderBlock {P} at (0,811) size 769x485 + RenderBlock {P} at (0,812) size 769x485 RenderText {#text} at (0,2) size 767x198 text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " text run at (420,2) width 347: "This means that the lines of text within it should be separated" @@ -66,18 +66,18 @@ layer at (0,0) size 785x2325 text run at (235,426) width 8: ". " text run at (243,426) width 512: "The last image in this paragraph has -10px margins set on it, so that should pull the text in" text run at (0,467) width 443: "toward the image in the vertical direction, and also in the horizontal direction." - RenderTable {TABLE} at (0,1310) size 769x999 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x997 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,1311) size 769x1000 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x998 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x972 - RenderTableCell {TD} at (0,498) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x972 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x972 + RenderTableCell {TD} at (0,499) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x972 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x465 RenderText {#text} at (0,2) size 729x238 text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " diff --git a/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.png index fce0b198cd03..a7477f183103 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.txt index febd5e5aa2fe..4c604f012b89 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/horizontal_formatting-expected.txt @@ -1,65 +1,65 @@ -layer at (0,0) size 785x696 +layer at (0,0) size 785x726 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x696 - RenderBlock {HTML} at (0,0) size 785x696 - RenderBody {BODY} at (8,8) size 769x672 [bgcolor=#CCCCCC] - RenderBlock {P} at (10,0) size 759x17 +layer at (0,0) size 785x726 + RenderBlock {HTML} at (0,0) size 785x726 + RenderBody {BODY} at (8,8) size 769x702 [bgcolor=#CCCCCC] + RenderBlock {P} at (10,0) size 759x18 RenderText {#text} at (0,0) size 286x17 text run at (0,0) width 286: "This paragraph should be indented ten pixels." - RenderBlock {DIV} at (10,33) size 759x17 - RenderBlock {P} at (10,0) size 749x17 + RenderBlock {DIV} at (10,34) size 759x18 + RenderBlock {P} at (10,0) size 749x18 RenderText {#text} at (0,0) size 570x17 text run at (0,0) width 570: "This paragraph should be indented twenty pixels, since horizontal margins do not collapse." - RenderBlock {P} at (0,66) size 385x102 [bgcolor=#808080] - RenderText {#text} at (0,0) size 375x102 + RenderBlock {P} at (0,68) size 385x108 [bgcolor=#808080] + RenderText {#text} at (0,0) size 375x107 text run at (0,0) width 362: "This element has a width of 50%, and due to 'auto' values" - text run at (0,17) width 335: "applied to the right margin, the element should be left" - text run at (0,34) width 163: "justified within its parent. " - text run at (163,34) width 164: "The gray rectangle should" - text run at (0,51) width 358: "therefore appear on the left edge of the viewport (e.g. the" - text run at (0,68) width 375: "browser window). The text inside the gray rectangle should" - text run at (0,85) width 100: "not be centered." - RenderBlock {P} at (192,184) size 385x102 [bgcolor=#808080] - RenderText {#text} at (0,0) size 375x102 + text run at (0,18) width 335: "applied to the right margin, the element should be left" + text run at (0,36) width 163: "justified within its parent. " + text run at (163,36) width 164: "The gray rectangle should" + text run at (0,54) width 358: "therefore appear on the left edge of the viewport (e.g. the" + text run at (0,72) width 375: "browser window). The text inside the gray rectangle should" + text run at (0,90) width 100: "not be centered." + RenderBlock {P} at (192,192) size 385x108 [bgcolor=#808080] + RenderText {#text} at (0,0) size 375x107 text run at (0,0) width 362: "This element has a width of 50%, and due to 'auto' values" - text run at (0,17) width 368: "applied to the left and right margins, the element should be" - text run at (0,34) width 166: "centered within its parent. " - text run at (166,34) width 164: "The gray rectangle should" - text run at (0,51) width 343: "therefore appear in the middle of the viewport (e.g. the" - text run at (0,68) width 375: "browser window). The text inside the gray rectangle should" - text run at (0,85) width 100: "not be centered." - RenderBlock {P} at (384,302) size 385x102 [bgcolor=#808080] - RenderText {#text} at (0,0) size 375x102 + text run at (0,18) width 368: "applied to the left and right margins, the element should be" + text run at (0,36) width 166: "centered within its parent. " + text run at (166,36) width 164: "The gray rectangle should" + text run at (0,54) width 343: "therefore appear in the middle of the viewport (e.g. the" + text run at (0,72) width 375: "browser window). The text inside the gray rectangle should" + text run at (0,90) width 100: "not be centered." + RenderBlock {P} at (384,316) size 385x108 [bgcolor=#808080] + RenderText {#text} at (0,0) size 375x107 text run at (0,0) width 362: "This element has a width of 50%, and due to 'auto' values" - text run at (0,17) width 335: "applied to the left margin, the element should be right" - text run at (0,34) width 163: "justified within its parent. " - text run at (163,34) width 164: "The gray rectangle should" - text run at (0,51) width 367: "therefore appear on the right edge of the viewport (e.g. the" - text run at (0,68) width 375: "browser window). The text inside the gray rectangle should" - text run at (0,85) width 100: "not be centered." - RenderBlock {P} at (0,420) size 769x34 [bgcolor=#808080] - RenderText {#text} at (0,0) size 762x34 + text run at (0,18) width 335: "applied to the left margin, the element should be right" + text run at (0,36) width 163: "justified within its parent. " + text run at (163,36) width 164: "The gray rectangle should" + text run at (0,54) width 367: "therefore appear on the right edge of the viewport (e.g. the" + text run at (0,72) width 375: "browser window). The text inside the gray rectangle should" + text run at (0,90) width 100: "not be centered." + RenderBlock {P} at (0,440) size 769x36 [bgcolor=#808080] + RenderText {#text} at (0,0) size 762x35 text run at (0,0) width 762: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and" - text run at (0,17) width 193: "the text should be left justified." - RenderBlock {P} at (0,470) size 769x34 [bgcolor=#808080] - RenderText {#text} at (0,0) size 762x34 + text run at (0,18) width 193: "the text should be left justified." + RenderBlock {P} at (0,492) size 769x36 [bgcolor=#808080] + RenderText {#text} at (0,0) size 762x35 text run at (0,0) width 762: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and" - text run at (0,17) width 193: "the text should be left justified." - RenderBlock {P} at (0,520) size 769x34 [bgcolor=#808080] - RenderText {#text} at (0,0) size 762x34 + text run at (0,18) width 193: "the text should be left justified." + RenderBlock {P} at (0,544) size 769x36 [bgcolor=#808080] + RenderText {#text} at (0,0) size 762x35 text run at (0,0) width 762: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and" - text run at (0,17) width 193: "the text should be left justified." - RenderBlock {P} at (0,570) size 385x69 [bgcolor=#808080] - RenderText {#text} at (0,0) size 370x34 + text run at (0,18) width 193: "the text should be left justified." + RenderBlock {P} at (0,596) size 385x72 [bgcolor=#808080] + RenderText {#text} at (0,0) size 370x35 text run at (0,0) width 370: "Since auto is an invalid value for padding, the right-margin" - text run at (0,17) width 224: "of this paragraph should be reset to " + text run at (0,18) width 224: "of this paragraph should be reset to " RenderInline {CODE} at (0,0) size 32x15 - RenderText {#text} at (224,20) size 32x15 - text run at (224,20) width 32: "auto" - RenderText {#text} at (256,17) size 369x52 - text run at (256,17) width 76: " and thus be" - text run at (0,35) width 369: "expanded to 50% and it should only occupy the left half of" - text run at (0,52) width 83: "the viewport." - RenderBlock {P} at (0,655) size 769x17 [bgcolor=#808080] + RenderText {#text} at (224,21) size 32x15 + text run at (224,21) width 32: "auto" + RenderText {#text} at (256,18) size 369x53 + text run at (256,18) width 76: " and thus be" + text run at (0,36) width 369: "expanded to 50% and it should only occupy the left half of" + text run at (0,54) width 83: "the viewport." + RenderBlock {P} at (0,684) size 769x18 [bgcolor=#808080] RenderText {#text} at (0,0) size 632x17 text run at (0,0) width 632: "Because this paragraph has width 100%, the auto margins become zero, so it should not be centered." diff --git a/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.png index 58ecdd0de496..52a6593565d5 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.txt index 88416ad1cd75..c67cbc64325d 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/inline_elements-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x778 +layer at (0,0) size 785x780 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x777 - RenderBlock {HTML} at (0,0) size 785x778 - RenderBody {BODY} at (8,8) size 769x762 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x779 + RenderBlock {HTML} at (0,0) size 785x780 + RenderBody {BODY} at (8,8) size 769x764 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x105 + RenderBlock {PRE} at (0,34) size 769x105 RenderText {#text} at (0,0) size 560x105 text run at (0,0) width 208: "P.one {line-height: 200%;}" text run at (0,15) width 552: "SPAN.two {border-style: solid; border-width: 10px; border-color: red;" @@ -15,8 +15,8 @@ layer at (0,0) size 785x777 text run at (0,60) width 560: "SPAN.four {border-style: solid; border-width: 12px; border-color: red;" text run at (0,75) width 192: " padding: 2pt;}" text run at (0,90) width 0: " " - RenderBlock {HR} at (0,151) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,169) size 769x192 + RenderBlock {HR} at (0,152) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,170) size 769x192 RenderText {#text} at (0,7) size 187x17 text run at (0,7) width 187: "This is a paragraph that has a " RenderInline {SPAN} at (0,0) size 762x171 [border: (10px solid #FF0000)] @@ -33,7 +33,7 @@ layer at (0,0) size 785x777 text run at (637,135) width 5: " " text run at (641,135) width 121: "The line spacing in" text run at (0,167) width 336: "the whole paragraph should be 200% of the font size." - RenderBlock {P} at (0,377) size 769x64 + RenderBlock {P} at (0,378) size 769x64 RenderText {#text} at (0,0) size 159x15 text run at (0,0) width 159: "This is a paragraph that has a " RenderInline {SPAN} at (0,0) size 764x93 [border: (12px solid #FF0000)] @@ -46,18 +46,18 @@ layer at (0,0) size 785x777 RenderText {#text} at (83,48) size 416x15 text run at (83,48) width 4: " " text run at (86,48) width 413: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." - RenderTable {TABLE} at (0,454) size 769x308 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x305 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,455) size 769x309 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x306 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x280 - RenderTableCell {TD} at (0,152) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x280 + RenderTableCell {TD} at (0,153) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x192 RenderText {#text} at (0,7) size 187x17 text run at (0,7) width 187: "This is a paragraph that has a " diff --git a/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.png index ae75b2c9c19e..908134afb55f 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt index a6c6c1367ecc..8e78230966aa 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/replaced_elements-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x2325 +layer at (0,0) size 785x2341 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2325 - RenderBlock {HTML} at (0,0) size 785x2325 - RenderBody {BODY} at (8,8) size 769x2309 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2341 + RenderBlock {HTML} at (0,0) size 785x2341 + RenderBody {BODY} at (8,8) size 769x2325 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x120 + RenderBlock {PRE} at (0,34) size 769x120 RenderText {#text} at (0,0) size 504x120 text run at (0,0) width 208: "IMG.one {display: inline;}" text run at (0,15) width 200: "IMG.two {display: block;}" @@ -16,64 +16,64 @@ layer at (0,0) size 785x2325 text run at (0,75) width 488: " margin-right: auto; margin-left: auto; width: 50%;}" text run at (0,90) width 200: "IMG.five {display: block;" text run at (0,105) width 464: " margin-right: 0; margin-left: auto; width: 50%;}" - RenderBlock {HR} at (0,166) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,184) size 769x18 + RenderBlock {HR} at (0,167) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,185) size 769x19 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (15,1) size 434x17 text run at (15,1) width 434: "The image at the beginning of this sentence should be a 15px square." - RenderImage {IMG} at (0,218) size 15x15 - RenderBlock {P} at (0,249) size 769x17 + RenderImage {IMG} at (0,220) size 15x15 + RenderBlock {P} at (0,251) size 769x18 RenderText {#text} at (0,0) size 489x17 text run at (0,0) width 489: "The above image should be a 15px square with the same left edge as this text." - RenderImage {IMG} at (377,282) size 15x15 - RenderBlock {P} at (0,313) size 769x17 + RenderImage {IMG} at (377,285) size 15x15 + RenderBlock {P} at (0,316) size 769x18 RenderText {#text} at (0,0) size 400x17 text run at (0,0) width 400: "The above image should be a 15px square aligned at the center." - RenderImage {IMG} at (192,346) size 385x385 - RenderBlock {P} at (0,747) size 769x34 - RenderText {#text} at (0,0) size 766x34 + RenderImage {IMG} at (192,350) size 385x385 + RenderBlock {P} at (0,751) size 769x36 + RenderText {#text} at (0,0) size 766x35 text run at (0,0) width 766: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within" - text run at (0,17) width 123: "the parent element: " - text run at (123,17) width 395: "the document body in the first half, and the table in the second." - RenderImage {IMG} at (384,797) size 385x385 - RenderBlock {P} at (0,1198) size 769x34 - RenderText {#text} at (0,0) size 758x34 + text run at (0,18) width 123: "the parent element: " + text run at (123,18) width 395: "the document body in the first half, and the table in the second." + RenderImage {IMG} at (384,803) size 385x385 + RenderBlock {P} at (0,1204) size 769x36 + RenderText {#text} at (0,0) size 758x35 text run at (0,0) width 758: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the" - text run at (0,17) width 100: "parent element: " - text run at (100,17) width 395: "the document body in the first half, and the table in the second." - RenderTable {TABLE} at (0,1248) size 769x1061 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1059 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 100: "parent element: " + text run at (100,18) width 395: "the document body in the first half, and the table in the second." + RenderTable {TABLE} at (0,1256) size 769x1069 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1067 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1034 - RenderTableCell {TD} at (0,529) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x1041 + RenderTableCell {TD} at (0,533) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1034 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x18 + RenderTableCell {TD} at (12,26) size 755x1041 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x19 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (15,1) size 434x17 text run at (15,1) width 434: "The image at the beginning of this sentence should be a 15px square." - RenderImage {IMG} at (4,38) size 15x15 - RenderBlock {P} at (4,69) size 747x17 + RenderImage {IMG} at (4,39) size 15x15 + RenderBlock {P} at (4,70) size 747x18 RenderText {#text} at (0,0) size 489x17 text run at (0,0) width 489: "The above image should be a 15px square with the same left edge as this text." - RenderImage {IMG} at (370,102) size 15x15 - RenderBlock {P} at (4,133) size 747x17 + RenderImage {IMG} at (370,104) size 15x15 + RenderBlock {P} at (4,135) size 747x18 RenderText {#text} at (0,0) size 400x17 text run at (0,0) width 400: "The above image should be a 15px square aligned at the center." - RenderImage {IMG} at (190,166) size 375x374 - RenderBlock {P} at (4,556) size 747x34 - RenderText {#text} at (0,0) size 722x34 + RenderImage {IMG} at (190,169) size 375x374 + RenderBlock {P} at (4,559) size 747x36 + RenderText {#text} at (0,0) size 722x35 text run at (0,0) width 722: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally" - text run at (0,17) width 167: "within the parent element: " - text run at (167,17) width 395: "the document body in the first half, and the table in the second." - RenderImage {IMG} at (377,606) size 374x374 - RenderBlock {P} at (4,996) size 747x34 - RenderText {#text} at (0,0) size 735x34 + text run at (0,18) width 167: "within the parent element: " + text run at (167,18) width 395: "the document body in the first half, and the table in the second." + RenderImage {IMG} at (377,611) size 374x374 + RenderBlock {P} at (4,1001) size 747x36 + RenderText {#text} at (0,0) size 735x35 text run at (0,0) width 735: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of" - text run at (0,17) width 123: "the parent element: " - text run at (123,17) width 395: "the document body in the first half, and the table in the second." + text run at (0,18) width 123: "the parent element: " + text run at (123,18) width 395: "the document body in the first half, and the table in the second." diff --git a/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.png b/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.png index 3f38aecad2ec..2e16f5751545 100644 Binary files a/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.png and b/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.txt b/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.txt index 86f7f9f05877..d53038383fb3 100644 --- a/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.txt +++ b/LayoutTests/platform/gtk/css1/formatting_model/vertical_formatting-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x2441 +layer at (0,0) size 785x2487 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2441 - RenderBlock {HTML} at (0,0) size 785x2441 - RenderBody {BODY} at (8,8) size 769x2425 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2487 + RenderBlock {HTML} at (0,0) size 785x2487 + RenderBody {BODY} at (8,8) size 769x2471 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x300 + RenderBlock {PRE} at (0,34) size 769x300 RenderText {#text} at (0,0) size 496x300 text run at (0,0) width 368: "P.one {margin-bottom: 2cm; padding-bottom: 0;}" text run at (0,15) width 320: "P.two {margin-top: 2cm; padding-top: 0;}" @@ -28,126 +28,126 @@ layer at (0,0) size 785x2441 text run at (0,255) width 360: "P.thirteen {margin-top: 0; padding-top: 1cm;}" text run at (0,270) width 160: "TABLE {clear: both;}" text run at (0,285) width 0: " " - RenderBlock {HR} at (0,346) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,364) size 769x34 - RenderText {#text} at (0,0) size 754x34 + RenderBlock {HR} at (0,347) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,365) size 769x36 + RenderText {#text} at (0,0) size 754x35 text run at (0,0) width 754: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,17) width 255: "collapse to the maximum of the margins." - RenderBlock {P} at (0,473) size 769x18 + text run at (0,18) width 255: "collapse to the maximum of the margins." + RenderBlock {P} at (0,476) size 769x19 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This is another paragraph." - RenderBlock {P} at (0,506) size 769x18 + RenderBlock {P} at (0,510) size 769x19 RenderText {#text} at (0,0) size 494x17 text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next." - RenderBlock {P} at (0,599) size 769x18 + RenderBlock {P} at (0,604) size 769x19 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This is another paragraph." - RenderBlock {P} at (0,632) size 769x35 - RenderText {#text} at (0,0) size 719x34 + RenderBlock {P} at (0,638) size 769x37 + RenderText {#text} at (0,0) size 719x35 text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" - text run at (0,17) width 465: "margin, the two margins should be added (the minus sign should be kept)." - RenderBlock {P} at (0,703) size 769x18 + text run at (0,18) width 465: "margin, the two margins should be added (the minus sign should be kept)." + RenderBlock {P} at (0,711) size 769x19 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This is another paragraph." - RenderBlock {DIV} at (0,758) size 769x128 - RenderBlock {P} at (0,75) size 769x52 - RenderText {#text} at (0,0) size 760x51 + RenderBlock {DIV} at (0,767) size 769x131 + RenderBlock {P} at (0,75) size 769x55 + RenderText {#text} at (0,0) size 760x53 text run at (0,0) width 757: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the" - text run at (0,17) width 760: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the" - text run at (0,34) width 54: "margins." - RenderBlock {P} at (0,923) size 769x18 + text run at (0,18) width 760: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the" + text run at (0,36) width 54: "margins." + RenderBlock {P} at (0,935) size 769x19 RenderText {#text} at (0,0) size 109x17 text run at (0,0) width 109: "This is more text." - RenderBlock {P} at (0,956) size 769x110 - RenderText {#text} at (0,0) size 726x34 + RenderBlock {P} at (0,969) size 769x112 + RenderText {#text} at (0,0) size 726x35 text run at (0,0) width 726: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,17) width 456: "negative margin with the largest absolute value of the margins collapsed." - RenderBlock {P} at (0,1027) size 769x73 - RenderText {#text} at (0,38) size 765x34 + text run at (0,18) width 456: "negative margin with the largest absolute value of the margins collapsed." + RenderBlock {P} at (0,1042) size 769x75 + RenderText {#text} at (0,38) size 765x35 text run at (0,38) width 765: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the" - text run at (0,55) width 181: "one below it and to the right." - RenderBlock (floating) {P} at (0,1175) size 385x52 - RenderText {#text} at (0,0) size 382x51 + text run at (0,56) width 181: "one below it and to the right." + RenderBlock (floating) {P} at (0,1192) size 385x55 + RenderText {#text} at (0,0) size 382x53 text run at (0,0) width 382: "There should be two centimeters between this paragraph and" - text run at (0,17) width 365: "the one above it, since margins do not collapse on floating" - text run at (0,34) width 59: "elements." - RenderBlock {P} at (0,1137) size 769x52 - RenderText {#text} at (384,0) size 376x51 + text run at (0,18) width 365: "the one above it, since margins do not collapse on floating" + text run at (0,36) width 59: "elements." + RenderBlock {P} at (0,1154) size 769x55 + RenderText {#text} at (384,0) size 376x53 text run at (384,0) width 376: "There should be one centimeter between this paragraph and" - text run at (384,17) width 357: "the (non-floating) one above it, since the float should not" - text run at (384,34) width 182: "effect the paragraph spacing." - RenderBlock {P} at (0,1242) size 769x72 - RenderText {#text} at (0,0) size 750x34 + text run at (384,18) width 357: "the (non-floating) one above it, since the float should not" + text run at (384,36) width 182: "effect the paragraph spacing." + RenderBlock {P} at (0,1262) size 769x74 + RenderText {#text} at (0,0) size 750x35 text run at (0,0) width 555: "There should be two centimeters of padding between this paragraph and the one below. " text run at (555,0) width 195: "Padding does not collapse, and" - text run at (0,17) width 234: "there is 1cm of padding on each side." - RenderBlock {P} at (0,1314) size 769x55 + text run at (0,18) width 234: "there is 1cm of padding on each side." + RenderBlock {P} at (0,1336) size 769x56 RenderText {#text} at (0,38) size 167x17 text run at (0,38) width 167: "This is the next paragraph." - RenderTable {TABLE} at (0,1384) size 769x1041 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1038 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,1407) size 769x1064 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1061 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1013 - RenderTableCell {TD} at (0,518) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1013 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 708x34 + RenderTableRow {TR} at (0,26) size 767x1035 + RenderTableCell {TD} at (0,530) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 4x18 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x1035 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 708x35 text run at (0,0) width 708: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins" - text run at (0,17) width 301: "should collapse to the maximum of the margins." - RenderBlock {P} at (4,113) size 747x18 + text run at (0,18) width 301: "should collapse to the maximum of the margins." + RenderBlock {P} at (4,115) size 747x19 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This is another paragraph." - RenderBlock {P} at (4,146) size 747x18 + RenderBlock {P} at (4,149) size 747x19 RenderText {#text} at (0,0) size 494x17 text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next." - RenderBlock {P} at (4,239) size 747x18 + RenderBlock {P} at (4,243) size 747x19 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This is another paragraph." - RenderBlock {P} at (4,272) size 747x35 - RenderText {#text} at (0,0) size 719x34 + RenderBlock {P} at (4,277) size 747x37 + RenderText {#text} at (0,0) size 719x35 text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" - text run at (0,17) width 465: "margin, the two margins should be added (the minus sign should be kept)." - RenderBlock {P} at (4,343) size 747x18 + text run at (0,18) width 465: "margin, the two margins should be added (the minus sign should be kept)." + RenderBlock {P} at (4,350) size 747x19 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This is another paragraph." - RenderBlock {DIV} at (4,398) size 747x128 - RenderBlock {P} at (0,75) size 747x52 - RenderText {#text} at (0,0) size 734x51 + RenderBlock {DIV} at (4,406) size 747x131 + RenderBlock {P} at (0,75) size 747x55 + RenderText {#text} at (0,0) size 734x53 text run at (0,0) width 734: "There should be three centimeters between this text and the text above, but only one centimeter between this text and" - text run at (0,17) width 703: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding" - text run at (0,34) width 134: "between the margins." - RenderBlock {P} at (4,563) size 747x18 + text run at (0,18) width 703: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding" + text run at (0,36) width 134: "between the margins." + RenderBlock {P} at (4,574) size 747x19 RenderText {#text} at (0,0) size 109x17 text run at (0,0) width 109: "This is more text." - RenderBlock {P} at (4,596) size 747x110 - RenderText {#text} at (0,0) size 726x34 + RenderBlock {P} at (4,608) size 747x112 + RenderText {#text} at (0,0) size 726x35 text run at (0,0) width 726: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,17) width 456: "negative margin with the largest absolute value of the margins collapsed." - RenderBlock {P} at (4,667) size 747x73 - RenderText {#text} at (0,38) size 742x34 + text run at (0,18) width 456: "negative margin with the largest absolute value of the margins collapsed." + RenderBlock {P} at (4,681) size 747x75 + RenderText {#text} at (0,38) size 742x35 text run at (0,38) width 742: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and" - text run at (0,55) width 204: "the one below it and to the right." - RenderBlock (floating) {P} at (4,815) size 374x52 - RenderText {#text} at (0,0) size 355x51 + text run at (0,56) width 204: "the one below it and to the right." + RenderBlock (floating) {P} at (4,831) size 374x55 + RenderText {#text} at (0,0) size 355x53 text run at (0,0) width 355: "There should be two centimeters between this paragraph" - text run at (0,17) width 340: "and the one above it, since margins do not collapse on" - text run at (0,34) width 111: "floating elements." - RenderBlock {P} at (4,777) size 747x52 - RenderText {#text} at (373,0) size 360x51 + text run at (0,18) width 340: "and the one above it, since margins do not collapse on" + text run at (0,36) width 111: "floating elements." + RenderBlock {P} at (4,793) size 747x55 + RenderText {#text} at (373,0) size 360x53 text run at (373,0) width 349: "There should be one centimeter between this paragraph" - text run at (373,17) width 360: "and the (non-floating) one above it, since the float should" - text run at (373,34) width 206: "not effect the paragraph spacing." - RenderBlock {P} at (4,882) size 747x72 - RenderText {#text} at (0,0) size 723x34 + text run at (373,18) width 360: "and the (non-floating) one above it, since the float should" + text run at (373,36) width 206: "not effect the paragraph spacing." + RenderBlock {P} at (4,901) size 747x74 + RenderText {#text} at (0,0) size 723x35 text run at (0,0) width 555: "There should be two centimeters of padding between this paragraph and the one below. " text run at (555,0) width 168: "Padding does not collapse," - text run at (0,17) width 261: "and there is 1cm of padding on each side." - RenderBlock {P} at (4,954) size 747x55 + text run at (0,18) width 261: "and there is 1cm of padding on each side." + RenderBlock {P} at (4,975) size 747x56 RenderText {#text} at (0,38) size 167x17 text run at (0,38) width 167: "This is the next paragraph." diff --git a/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.png b/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.png index 0a71c5a8f44b..fc95552e72b1 100644 Binary files a/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.png and b/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.txt b/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.txt index 6efe8b7f8bb9..b87a5e0ff06b 100644 --- a/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.txt +++ b/LayoutTests/platform/gtk/css1/pseudo/anchor-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x659 +layer at (0,0) size 785x683 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x659 - RenderBlock {HTML} at (0,0) size 785x659 - RenderBody {BODY} at (8,8) size 769x643 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x683 + RenderBlock {HTML} at (0,0) size 785x683 + RenderBody {BODY} at (8,8) size 769x667 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x90 + RenderBlock {PRE} at (0,34) size 769x90 RenderText {#text} at (0,0) size 200x90 text run at (0,0) width 136: "A {color: green;}" text run at (0,15) width 184: "A:link {color: purple;}" @@ -14,144 +14,144 @@ layer at (0,0) size 785x659 text run at (0,45) width 200: "A:active {color: maroon;}" text run at (0,60) width 176: "#one {color: #006600;}" text run at (0,75) width 0: " " - RenderBlock {HR} at (0,136) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,154) size 769x17 + RenderBlock {HR} at (0,137) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,155) size 769x18 RenderText {#text} at (0,0) size 500x17 text run at (0,0) width 500: "The following anchors should appear as described; none of them should be red." - RenderBlock {UL} at (0,187) size 769x136 - RenderListItem {LI} at (40,0) size 729x102 - RenderBlock (anonymous) at (0,0) size 729x17 + RenderBlock {UL} at (0,189) size 769x144 + RenderListItem {LI} at (40,0) size 729x108 + RenderBlock (anonymous) at (0,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 567x17 text run at (0,0) width 567: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - RenderBlock {UL} at (0,17) size 729x85 - RenderListItem {LI} at (40,0) size 689x17 + RenderBlock {UL} at (0,18) size 729x90 + RenderListItem {LI} at (40,0) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 110x17 [color=#800080] RenderText {#text} at (0,0) size 110x17 text run at (0,0) width 110: "W3C Web server" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,17) size 689x17 + RenderListItem {LI} at (40,18) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 112x17 [color=#800080] RenderText {#text} at (0,0) size 112x17 text run at (0,0) width 112: "NIST Web server" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,34) size 689x17 + RenderListItem {LI} at (40,36) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 125x17 [color=#800080] RenderText {#text} at (0,0) size 125x17 text run at (0,0) width 125: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,51) size 689x17 + RenderListItem {LI} at (40,54) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 48x17 [color=#800080] RenderText {#text} at (0,0) size 48x17 text run at (0,0) width 48: "Yahoo!" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,68) size 689x17 + RenderListItem {LI} at (40,72) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 58x17 [color=#800080] RenderText {#text} at (0,0) size 58x17 text run at (0,0) width 58: "Erewhon" RenderText {#text} at (58,0) size 219x17 text run at (58,0) width 219: " (don't click on it, it goes nowhere)" - RenderListItem {LI} at (40,102) size 729x34 - RenderBlock (anonymous) at (0,0) size 729x17 + RenderListItem {LI} at (40,108) size 729x36 + RenderBlock (anonymous) at (0,0) size 729x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 204x17 text run at (0,0) width 204: "Dark green in any circumstance:" - RenderBlock {UL} at (0,17) size 729x17 - RenderListItem {LI} at (40,0) size 689x17 + RenderBlock {UL} at (0,18) size 729x18 + RenderListItem {LI} at (40,0) size 689x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 125x17 [color=#006600] RenderText {#text} at (0,0) size 125x17 text run at (0,0) width 125: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,339) size 769x34 + RenderBlock {P} at (0,349) size 769x36 RenderText {#text} at (0,0) size 120x17 text run at (0,0) width 120: "The quoted word \"" RenderInline {A} at (0,0) size 43x17 [color=#008000] RenderText {#text} at (120,0) size 43x17 text run at (120,0) width 43: "anchor" - RenderText {#text} at (163,0) size 732x34 + RenderText {#text} at (163,0) size 732x35 text run at (163,0) width 377: "\" should be green, NOT purple, since it's part of an anchor. " text run at (540,0) width 192: "It's a named anchor, and styles" - text run at (0,17) width 350: "declared for the A tag are applied to them under CSS1. " - text run at (350,17) width 326: "It also should NOT turn orange when clicked upon." - RenderTable {TABLE} at (0,389) size 769x254 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x252 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 350: "declared for the A tag are applied to them under CSS1. " + text run at (350,18) width 326: "It also should NOT turn orange when clicked upon." + RenderTable {TABLE} at (0,401) size 769x266 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x264 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x227 - RenderTableCell {TD} at (0,126) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x238 + RenderTableCell {TD} at (0,132) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x227 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableCell {TD} at (12,26) size 755x238 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 500x17 text run at (0,0) width 500: "The following anchors should appear as described; none of them should be red." - RenderBlock {UL} at (4,37) size 747x136 - RenderListItem {LI} at (40,0) size 707x102 - RenderBlock (anonymous) at (0,0) size 707x17 + RenderBlock {UL} at (4,38) size 747x144 + RenderListItem {LI} at (40,0) size 707x108 + RenderBlock (anonymous) at (0,0) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 567x17 text run at (0,0) width 567: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - RenderBlock {UL} at (0,17) size 707x85 - RenderListItem {LI} at (40,0) size 667x17 + RenderBlock {UL} at (0,18) size 707x90 + RenderListItem {LI} at (40,0) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 110x17 [color=#800080] RenderText {#text} at (0,0) size 110x17 text run at (0,0) width 110: "W3C Web server" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,17) size 667x17 + RenderListItem {LI} at (40,18) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 112x17 [color=#800080] RenderText {#text} at (0,0) size 112x17 text run at (0,0) width 112: "NIST Web server" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,34) size 667x17 + RenderListItem {LI} at (40,36) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 125x17 [color=#800080] RenderText {#text} at (0,0) size 125x17 text run at (0,0) width 125: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,51) size 667x17 + RenderListItem {LI} at (40,54) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 48x17 [color=#800080] RenderText {#text} at (0,0) size 48x17 text run at (0,0) width 48: "Yahoo!" RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (40,68) size 667x17 + RenderListItem {LI} at (40,72) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 58x17 [color=#800080] RenderText {#text} at (0,0) size 58x17 text run at (0,0) width 58: "Erewhon" RenderText {#text} at (58,0) size 219x17 text run at (58,0) width 219: " (don't click on it, it goes nowhere)" - RenderListItem {LI} at (40,102) size 707x34 - RenderBlock (anonymous) at (0,0) size 707x17 + RenderListItem {LI} at (40,108) size 707x36 + RenderBlock (anonymous) at (0,0) size 707x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 204x17 text run at (0,0) width 204: "Dark green in any circumstance:" - RenderBlock {UL} at (0,17) size 707x17 - RenderListItem {LI} at (40,0) size 667x17 + RenderBlock {UL} at (0,18) size 707x18 + RenderListItem {LI} at (40,0) size 667x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderInline {A} at (0,0) size 125x17 [color=#006600] RenderText {#text} at (0,0) size 125x17 text run at (0,0) width 125: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,189) size 747x34 + RenderBlock {P} at (4,198) size 747x36 RenderText {#text} at (0,0) size 120x17 text run at (0,0) width 120: "The quoted word \"" RenderInline {A} at (0,0) size 43x17 [color=#008000] RenderText {#text} at (120,0) size 43x17 text run at (120,0) width 43: "anchor" - RenderText {#text} at (163,0) size 732x34 + RenderText {#text} at (163,0) size 732x35 text run at (163,0) width 377: "\" should be green, NOT purple, since it's part of an anchor. " text run at (540,0) width 192: "It's a named anchor, and styles" - text run at (0,17) width 350: "declared for the A tag are applied to them under CSS1. " - text run at (350,17) width 326: "It also should NOT turn orange when clicked upon." + text run at (0,18) width 350: "declared for the A tag are applied to them under CSS1. " + text run at (350,18) width 326: "It also should NOT turn orange when clicked upon." diff --git a/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.png b/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.png index d8811c1ac2ce..a3a6ba1061f4 100644 Binary files a/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.png and b/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.txt b/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.txt index c957b7f0fb7c..91a0e09303a6 100644 --- a/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.txt +++ b/LayoutTests/platform/gtk/css1/pseudo/firstletter-expected.txt @@ -1,90 +1,90 @@ -layer at (0,0) size 785x689 +layer at (0,0) size 785x711 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x689 - RenderBlock {HTML} at (0,0) size 785x689 - RenderBody {BODY} at (8,8) size 769x673 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x711 + RenderBlock {HTML} at (0,0) size 785x711 + RenderBody {BODY} at (8,8) size 769x695 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderInline (generated) at (0,0) size 10x17 [color=#800000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" RenderText {#text} at (10,0) size 345x17 text run at (10,0) width 345: "he style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 312x60 text run at (0,0) width 248: "P:first-letter {color: maroon;}" text run at (0,15) width 288: ".two:first-letter {font-size: 200%;}" text run at (0,30) width 312: "P.three:first-letter {font-size: 350%;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 769x51 + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 769x54 RenderInline (generated) at (0,0) size 10x17 [color=#800000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" - RenderText {#text} at (10,0) size 764x51 + RenderText {#text} at (10,0) size 764x53 text run at (10,0) width 434: "he first letter of this paragraph, and only that one, should be maroon. " text run at (444,0) width 320: "If this precise combination does not occur, then the" - text run at (0,17) width 187: "user agent has failed this test. " - text run at (187,17) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" - text run at (0,34) width 85: "than one line." - RenderBlock {P} at (0,191) size 769x70 + text run at (0,18) width 187: "user agent has failed this test. " + text run at (187,18) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" + text run at (0,36) width 85: "than one line." + RenderBlock {P} at (0,195) size 769x73 RenderInline (generated) at (0,0) size 20x36 [color=#800000] RenderText {#text} at (0,0) size 20x36 text run at (0,0) width 20: "T" - RenderText {#text} at (20,15) size 757x55 + RenderText {#text} at (20,15) size 757x57 text run at (20,15) width 611: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " text run at (631,15) width 84: "If this precise" - text run at (0,36) width 423: "combination does not occur, then the user agent has failed this test. " - text run at (423,36) width 334: "Remember that in order to ensure a complete test, the" - text run at (0,53) width 325: "paragraph must be displayed on more than one line." - RenderBlock {P} at (0,277) size 769x96 + text run at (0,37) width 423: "combination does not occur, then the user agent has failed this test. " + text run at (423,37) width 334: "Remember that in order to ensure a complete test, the" + text run at (0,55) width 325: "paragraph must be displayed on more than one line." + RenderBlock {P} at (0,284) size 769x100 RenderInline (generated) at (0,0) size 76x62 [color=#800000] - RenderText {#text} at (0,0) size 76x62 - text run at (0,0) width 76: "\"W" - RenderText {#text} at (76,36) size 760x60 - text run at (76,36) width 319: "e should check for quotation support,\" it was said. " - text run at (395,36) width 365: "The first two characters in this paragraph-- a double-quote" - text run at (0,62) width 578: "mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (578,62) width 178: "Note that this is not required" - text run at (0,79) width 228: "under CSS1, but it is recommended." - RenderTable {TABLE} at (0,389) size 769x284 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x282 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (0,1) size 76x62 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,37) size 760x62 + text run at (76,37) width 319: "e should check for quotation support,\" it was said. " + text run at (395,37) width 365: "The first two characters in this paragraph-- a double-quote" + text run at (0,64) width 578: "mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " + text run at (578,64) width 178: "Note that this is not required" + text run at (0,82) width 228: "under CSS1, but it is recommended." + RenderTable {TABLE} at (0,400) size 769x295 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x293 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x257 - RenderTableCell {TD} at (0,141) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x257 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x51 + RenderTableRow {TR} at (0,26) size 767x267 + RenderTableCell {TD} at (0,146) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x267 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x54 RenderInline (generated) at (0,0) size 10x17 [color=#800000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" - RenderText {#text} at (10,0) size 741x51 + RenderText {#text} at (10,0) size 741x53 text run at (10,0) width 434: "he first letter of this paragraph, and only that one, should be maroon. " text run at (444,0) width 297: "If this precise combination does not occur, then" - text run at (0,17) width 210: "the user agent has failed this test. " - text run at (210,17) width 518: "Remember that in order to ensure a complete test, the paragraph must be displayed" - text run at (0,34) width 141: "on more than one line." - RenderBlock {P} at (4,71) size 747x70 + text run at (0,18) width 210: "the user agent has failed this test. " + text run at (210,18) width 518: "Remember that in order to ensure a complete test, the paragraph must be displayed" + text run at (0,36) width 141: "on more than one line." + RenderBlock {P} at (4,74) size 747x73 RenderInline (generated) at (0,0) size 20x36 [color=#800000] RenderText {#text} at (0,0) size 20x36 text run at (0,0) width 20: "T" - RenderText {#text} at (20,15) size 734x55 + RenderText {#text} at (20,15) size 734x57 text run at (20,15) width 611: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " text run at (631,15) width 84: "If this precise" - text run at (0,36) width 423: "combination does not occur, then the user agent has failed this test. " - text run at (423,36) width 311: "Remember that in order to ensure a complete test," - text run at (0,53) width 348: "the paragraph must be displayed on more than one line." - RenderBlock {P} at (4,157) size 747x96 + text run at (0,37) width 423: "combination does not occur, then the user agent has failed this test. " + text run at (423,37) width 311: "Remember that in order to ensure a complete test," + text run at (0,55) width 348: "the paragraph must be displayed on more than one line." + RenderBlock {P} at (4,163) size 747x100 RenderInline (generated) at (0,0) size 76x62 [color=#800000] - RenderText {#text} at (0,0) size 76x62 - text run at (0,0) width 76: "\"W" - RenderText {#text} at (76,36) size 739x60 - text run at (76,36) width 319: "e should check for quotation support,\" it was said. " - text run at (395,36) width 330: "The first two characters in this paragraph-- a double-" - text run at (0,62) width 617: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (617,62) width 122: "Note that this is not" - text run at (0,79) width 284: "required under CSS1, but it is recommended." + RenderText {#text} at (0,1) size 76x62 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,37) size 739x62 + text run at (76,37) width 319: "e should check for quotation support,\" it was said. " + text run at (395,37) width 330: "The first two characters in this paragraph-- a double-" + text run at (0,64) width 617: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " + text run at (617,64) width 122: "Note that this is not" + text run at (0,82) width 284: "required under CSS1, but it is recommended." diff --git a/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.png b/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.png index e95f27645eba..fceaa39d9f55 100644 Binary files a/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.png and b/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.txt b/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.txt index 81a944a4bf8e..05c5df62c1e7 100644 --- a/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.txt +++ b/LayoutTests/platform/gtk/css1/pseudo/firstline-expected.txt @@ -1,79 +1,79 @@ -layer at (0,0) size 785x635 +layer at (0,0) size 785x655 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x635 - RenderBlock {HTML} at (0,0) size 785x635 - RenderBody {BODY} at (8,8) size 769x619 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x655 + RenderBlock {HTML} at (0,0) size 785x655 + RenderBody {BODY} at (8,8) size 769x639 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x60 + RenderBlock {PRE} at (0,34) size 769x60 RenderText {#text} at (0,0) size 360x60 text run at (0,0) width 224: "P:first-line {color: green;}" text run at (0,15) width 272: ".two:first-line {font-size: 200%;}" text run at (0,30) width 360: ".three:first-line {font-variant: small-caps;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 769x51 - RenderText {#text} at (0,0) size 761x51 + RenderBlock {HR} at (0,107) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 769x54 + RenderText {#text} at (0,0) size 761x53 text run at (0,0) width 423: "The first line of this paragraph, and only that one, should be green. " text run at (423,0) width 320: "If this precise combination does not occur, then the" - text run at (0,17) width 187: "user agent has failed this test. " - text run at (187,17) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" - text run at (0,34) width 85: "than one line." - RenderBlock {P} at (0,191) size 769x70 - RenderText {#text} at (0,0) size 767x70 + text run at (0,18) width 187: "user agent has failed this test. " + text run at (187,18) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" + text run at (0,36) width 85: "than one line." + RenderBlock {P} at (0,195) size 769x73 + RenderText {#text} at (0,0) size 767x72 text run at (0,0) width 767: "The first line of this paragraph, and only that one, should be" - text run at (0,36) width 216: "a larger font size as well as green. " - text run at (216,36) width 507: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,53) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (0,277) size 769x69 - RenderText {#text} at (0,0) size 762x51 + text run at (0,37) width 216: "a larger font size as well as green. " + text run at (216,37) width 507: "If this precise combination does not occur, then the user agent has failed this test." + text run at (0,55) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." + RenderBlock {P} at (0,284) size 769x72 + RenderText {#text} at (0,0) size 762x53 text run at (0,0) width 608: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " text run at (608,0) width 154: "Thus, if the first line is" - text run at (0,17) width 762: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although" - text run at (0,34) width 165: "the problem might be that " + text run at (0,18) width 762: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although" + text run at (0,36) width 165: "the problem might be that " RenderInline {CODE} at (0,0) size 80x15 - RenderText {#text} at (165,37) size 80x15 - text run at (165,37) width 80: "small-caps" - RenderText {#text} at (245,34) size 754x35 - text run at (245,34) width 225: " is not supported by your browser). " - text run at (470,34) width 284: "This is extra text included for the purposes of" - text run at (0,52) width 395: "making the paragraph long enough to have more than one line." - RenderTable {TABLE} at (0,362) size 769x257 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x255 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (165,39) size 80x15 + text run at (165,39) width 80: "small-caps" + RenderText {#text} at (245,36) size 754x35 + text run at (245,36) width 225: " is not supported by your browser). " + text run at (470,36) width 284: "This is extra text included for the purposes of" + text run at (0,54) width 395: "making the paragraph long enough to have more than one line." + RenderTable {TABLE} at (0,372) size 769x267 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x265 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x230 - RenderTableCell {TD} at (0,127) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x239 + RenderTableCell {TD} at (0,132) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x230 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x51 - RenderText {#text} at (0,0) size 743x51 + RenderTableCell {TD} at (12,26) size 755x239 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x54 + RenderText {#text} at (0,0) size 743x53 text run at (0,0) width 423: "The first line of this paragraph, and only that one, should be green. " text run at (423,0) width 320: "If this precise combination does not occur, then the" - text run at (0,17) width 187: "user agent has failed this test. " - text run at (187,17) width 538: "Remember that in order to ensure a complete test, the paragraph must be displayed on" - text run at (0,34) width 121: "more than one line." - RenderBlock {P} at (4,71) size 747x70 - RenderText {#text} at (0,0) size 742x70 + text run at (0,18) width 187: "user agent has failed this test. " + text run at (187,18) width 538: "Remember that in order to ensure a complete test, the paragraph must be displayed on" + text run at (0,36) width 121: "more than one line." + RenderBlock {P} at (4,74) size 747x73 + RenderText {#text} at (0,0) size 742x72 text run at (0,0) width 729: "The first line of this paragraph, and only that one, should" - text run at (0,36) width 235: "be a larger font size as well as green. " - text run at (235,36) width 507: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,53) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (4,157) size 747x69 - RenderText {#text} at (0,0) size 739x51 + text run at (0,37) width 235: "be a larger font size as well as green. " + text run at (235,37) width 507: "If this precise combination does not occur, then the user agent has failed this test." + text run at (0,55) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." + RenderBlock {P} at (4,163) size 747x72 + RenderText {#text} at (0,0) size 739x53 text run at (0,0) width 608: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " text run at (608,0) width 110: "Thus, if the first" - text run at (0,17) width 739: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" - text run at (0,34) width 229: "(although the problem might be that " + text run at (0,18) width 739: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" + text run at (0,36) width 229: "(although the problem might be that " RenderInline {CODE} at (0,0) size 80x15 - RenderText {#text} at (229,37) size 80x15 - text run at (229,37) width 80: "small-caps" - RenderText {#text} at (309,34) size 741x35 - text run at (309,34) width 225: " is not supported by your browser). " - text run at (534,34) width 207: "This is extra text included for the" - text run at (0,52) width 472: "purposes of making the paragraph long enough to have more than one line." + RenderText {#text} at (229,39) size 80x15 + text run at (229,39) width 80: "small-caps" + RenderText {#text} at (309,36) size 741x35 + text run at (309,36) width 225: " is not supported by your browser). " + text run at (534,36) width 207: "This is extra text included for the" + text run at (0,54) width 472: "purposes of making the paragraph long enough to have more than one line." diff --git a/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.png b/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.png index 1965019b4f8c..3311f8b7701d 100644 Binary files a/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.png and b/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.txt b/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.txt index 24c70c2da1c7..84f7edb7a290 100644 --- a/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.txt +++ b/LayoutTests/platform/gtk/css1/pseudo/multiple_pseudo_elements-expected.txt @@ -1,15 +1,15 @@ -layer at (0,0) size 785x995 +layer at (0,0) size 785x1030 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x995 - RenderBlock {HTML} at (0,0) size 785x995 - RenderBody {BODY} at (8,8) size 769x979 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1030 + RenderBlock {HTML} at (0,0) size 785x1030 + RenderBody {BODY} at (8,8) size 769x1014 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderInline (generated) at (0,0) size 10x17 [color=#800000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" RenderText {#text} at (10,0) size 345x17 text run at (10,0) width 345: "he style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x105 + RenderBlock {PRE} at (0,34) size 769x105 RenderText {#text} at (0,0) size 368x105 text run at (0,0) width 224: "P:first-line {color: green;}" text run at (0,15) width 248: "P:first-letter {color: maroon;}" @@ -18,81 +18,81 @@ layer at (0,0) size 785x995 text run at (0,60) width 312: "P.three:first-letter {font-size: 350%;}" text run at (0,75) width 368: "P.three:first-line {font-variant: small-caps;}" text run at (0,90) width 0: " " - RenderBlock {HR} at (0,151) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,169) size 769x51 + RenderBlock {HR} at (0,152) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,170) size 769x54 RenderInline (generated) at (0,0) size 10x17 [color=#800000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" - RenderText {#text} at (10,0) size 764x51 + RenderText {#text} at (10,0) size 764x53 text run at (10,0) width 717: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" - text run at (0,17) width 43: "green. " - text run at (43,17) width 511: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (554,17) width 210: "Remember that in order to ensure" - text run at (0,34) width 449: "a complete test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (0,236) size 769x175 + text run at (0,18) width 43: "green. " + text run at (43,18) width 511: "If this precise combination does not occur, then the user agent has failed this test. " + text run at (554,18) width 210: "Remember that in order to ensure" + text run at (0,36) width 449: "a complete test, the paragraph must be displayed on more than one line." + RenderBlock {P} at (0,240) size 769x183 RenderInline (generated) at (0,0) size 68x124 [color=#800000] - RenderText {#text} at (0,0) size 68x124 - text run at (0,0) width 68: "T" - RenderText {#text} at (68,71) size 751x104 - text run at (68,71) width 634: "he first letter of this paragraph, and only that one," - text run at (0,124) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" - text run at (0,141) width 299: "should be 200% bigger than normal and green. " - text run at (299,141) width 452: "If this precise combination does not occur, then the user agent has failed" - text run at (0,158) width 55: "this test. " - text run at (55,158) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (0,427) size 769x113 + RenderText {#text} at (0,2) size 68x124 + text run at (0,2) width 68: "T" + RenderText {#text} at (68,73) size 751x109 + text run at (68,73) width 634: "he first letter of this paragraph, and only that one," + text run at (0,129) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" + text run at (0,147) width 299: "should be 200% bigger than normal and green. " + text run at (299,147) width 452: "If this precise combination does not occur, then the user agent has failed" + text run at (0,165) width 55: "this test. " + text run at (55,165) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." + RenderBlock {P} at (0,439) size 769x118 RenderInline (generated) at (0,0) size 76x62 [color=#800000] - RenderText {#text} at (0,0) size 76x62 - text run at (0,0) width 76: "\"W" - RenderText {#text} at (76,36) size 767x77 - text run at (76,36) width 336: "e should check for quotation support,\" it was said. " - text run at (412,36) width 355: "The first two characters in this paragraph-- a double-" - text run at (0,62) width 683: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (683,62) width 81: "Note that the" - text run at (0,79) width 765: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended." - text run at (0,96) width 450: "In addition, the entire first line should be in a small-caps font and green." - RenderTable {TABLE} at (0,556) size 769x423 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x421 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (0,1) size 76x62 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,37) size 767x80 + text run at (76,37) width 336: "e should check for quotation support,\" it was said. " + text run at (412,37) width 355: "The first two characters in this paragraph-- a double-" + text run at (0,64) width 683: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " + text run at (683,64) width 81: "Note that the" + text run at (0,82) width 765: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended." + text run at (0,100) width 450: "In addition, the entire first line should be in a small-caps font and green." + RenderTable {TABLE} at (0,573) size 769x441 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x439 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x396 - RenderTableCell {TD} at (0,210) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x413 + RenderTableCell {TD} at (0,219) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x396 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x51 + RenderTableCell {TD} at (12,26) size 755x413 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x54 RenderInline (generated) at (0,0) size 10x17 [color=#800000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" - RenderText {#text} at (10,0) size 727x51 + RenderText {#text} at (10,0) size 727x53 text run at (10,0) width 717: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" - text run at (0,17) width 43: "green. " - text run at (43,17) width 511: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (554,17) width 165: "Remember that in order to" - text run at (0,34) width 494: "ensure a complete test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (4,71) size 747x192 + text run at (0,18) width 43: "green. " + text run at (43,18) width 511: "If this precise combination does not occur, then the user agent has failed this test. " + text run at (554,18) width 165: "Remember that in order to" + text run at (0,36) width 494: "ensure a complete test, the paragraph must be displayed on more than one line." + RenderBlock {P} at (4,74) size 747x201 RenderInline (generated) at (0,0) size 68x124 [color=#800000] - RenderText {#text} at (0,0) size 68x124 - text run at (0,0) width 68: "T" - RenderText {#text} at (68,71) size 736x121 - text run at (68,71) width 634: "he first letter of this paragraph, and only that one," - text run at (0,124) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" - text run at (0,141) width 299: "should be 200% bigger than normal and green. " - text run at (299,141) width 413: "If this precise combination does not occur, then the user agent has" - text run at (0,158) width 94: "failed this test. " - text run at (94,158) width 632: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,175) width 27: "line." - RenderBlock {P} at (4,279) size 747x113 + RenderText {#text} at (0,2) size 68x124 + text run at (0,2) width 68: "T" + RenderText {#text} at (68,73) size 736x127 + text run at (68,73) width 634: "he first letter of this paragraph, and only that one," + text run at (0,129) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" + text run at (0,147) width 299: "should be 200% bigger than normal and green. " + text run at (299,147) width 413: "If this precise combination does not occur, then the user agent has" + text run at (0,165) width 94: "failed this test. " + text run at (94,165) width 632: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" + text run at (0,183) width 27: "line." + RenderBlock {P} at (4,291) size 747x118 RenderInline (generated) at (0,0) size 76x62 [color=#800000] - RenderText {#text} at (0,0) size 76x62 - text run at (0,0) width 76: "\"W" - RenderText {#text} at (76,36) size 739x77 - text run at (76,36) width 336: "e should check for quotation support,\" it was said. " - text run at (412,36) width 301: "The first two characters in this paragraph-- a" - text run at (0,62) width 727: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red)." - text run at (0,79) width 739: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it" - text run at (0,96) width 111: "is recommended. " - text run at (111,96) width 450: "In addition, the entire first line should be in a small-caps font and green." + RenderText {#text} at (0,1) size 76x62 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,37) size 739x80 + text run at (76,37) width 336: "e should check for quotation support,\" it was said. " + text run at (412,37) width 301: "The first two characters in this paragraph-- a" + text run at (0,64) width 727: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red)." + text run at (0,82) width 739: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it" + text run at (0,100) width 111: "is recommended. " + text run at (111,100) width 450: "In addition, the entire first line should be in a small-caps font and green." diff --git a/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.png b/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.png index a7b00f5778d8..939f015aed4d 100644 Binary files a/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.png and b/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.txt b/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.txt index 863fc5923ef5..0c328040331a 100644 --- a/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.txt +++ b/LayoutTests/platform/gtk/css1/pseudo/pseudo_elements_in_selectors-expected.txt @@ -3,71 +3,71 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 264x60 text run at (0,0) width 264: "P:first-line {font-weight: bold;}" text run at (0,15) width 256: "P.two:first-line {color: green;}" text run at (0,30) width 256: "P:first-line.three {color: red;}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x34 - RenderText {#text} at (0,0) size 784x34 + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x36 + RenderText {#text} at (0,0) size 784x35 text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " text run at (339,0) width 445: "This test is included simply to establish a baseline for the following" - text run at (0,17) width 571: "tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - RenderBlock {P} at (0,174) size 784x35 - RenderText {#text} at (0,0) size 755x34 + text run at (0,18) width 571: "tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." + RenderBlock {P} at (0,177) size 784x36 + RenderText {#text} at (0,0) size 755x35 text run at (0,0) width 556: "The first line of this sentence should be boldfaced and green, thanks to its selector. " text run at (556,0) width 199: "If this is not the case, then the" - text run at (0,17) width 565: "user agent may have failed to properly parse the selector, or it may simply not support the " + text run at (0,18) width 565: "user agent may have failed to properly parse the selector, or it may simply not support the " RenderInline {TT} at (0,0) size 88x15 - RenderText {#text} at (565,20) size 88x15 - text run at (565,20) width 88: ":first-line" - RenderText {#text} at (653,17) size 107x17 - text run at (653,17) width 107: " pseudo-element." - RenderBlock {P} at (0,225) size 784x68 - RenderText {#text} at (0,0) size 766x68 + RenderText {#text} at (565,21) size 88x15 + text run at (565,21) width 88: ":first-line" + RenderText {#text} at (653,18) size 107x17 + text run at (653,18) width 107: " pseudo-element." + RenderBlock {P} at (0,229) size 784x72 + RenderText {#text} at (0,0) size 766x71 text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " text run at (339,0) width 415: "If it is red, then the user agent has violated the specification in" - text run at (0,17) width 431: "allowing pseudo-elements at a point other than the end of a selector. " - text run at (431,17) width 335: "If neither is the case, then the user agent has correctly" - text run at (0,34) width 750: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" - text run at (0,51) width 87: "failed the test." - RenderTable {TABLE} at (0,309) size 784x204 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x202 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 431: "allowing pseudo-elements at a point other than the end of a selector. " + text run at (431,18) width 335: "If neither is the case, then the user agent has correctly" + text run at (0,36) width 750: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" + text run at (0,54) width 87: "failed the test." + RenderTable {TABLE} at (0,317) size 784x212 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x210 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x177 - RenderTableCell {TD} at (0,101) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x184 + RenderTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x177 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x34 - RenderText {#text} at (0,0) size 718x34 + RenderTableCell {TD} at (12,26) size 770x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x36 + RenderText {#text} at (0,0) size 718x35 text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " text run at (339,0) width 379: "This test is included simply to establish a baseline for the" - text run at (0,17) width 636: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - RenderBlock {P} at (4,54) size 762x35 - RenderText {#text} at (0,0) size 755x34 + text run at (0,18) width 636: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." + RenderBlock {P} at (4,56) size 762x36 + RenderText {#text} at (0,0) size 755x35 text run at (0,0) width 556: "The first line of this sentence should be boldfaced and green, thanks to its selector. " text run at (556,0) width 199: "If this is not the case, then the" - text run at (0,17) width 565: "user agent may have failed to properly parse the selector, or it may simply not support the " + text run at (0,18) width 565: "user agent may have failed to properly parse the selector, or it may simply not support the " RenderInline {TT} at (0,0) size 88x15 - RenderText {#text} at (565,20) size 88x15 - text run at (565,20) width 88: ":first-line" - RenderText {#text} at (653,17) size 107x17 - text run at (653,17) width 107: " pseudo-element." - RenderBlock {P} at (4,105) size 762x68 - RenderText {#text} at (0,0) size 759x68 + RenderText {#text} at (565,21) size 88x15 + text run at (565,21) width 88: ":first-line" + RenderText {#text} at (653,18) size 107x17 + text run at (653,18) width 107: " pseudo-element." + RenderBlock {P} at (4,108) size 762x72 + RenderText {#text} at (0,0) size 759x71 text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " text run at (339,0) width 415: "If it is red, then the user agent has violated the specification in" - text run at (0,17) width 431: "allowing pseudo-elements at a point other than the end of a selector. " - text run at (431,17) width 276: "If neither is the case, then the user agent has" - text run at (0,34) width 759: "correctly ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered" - text run at (0,51) width 137: "to have failed the test." + text run at (0,18) width 431: "allowing pseudo-elements at a point other than the end of a selector. " + text run at (431,18) width 276: "If neither is the case, then the user agent has" + text run at (0,36) width 759: "correctly ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered" + text run at (0,54) width 137: "to have failed the test." diff --git a/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.png b/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.png index bbcc945ed493..2b0f93fa99ab 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.txt index e6a156afa2f0..57fac5726bfa 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/letter_spacing-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1332 +layer at (0,0) size 785x1378 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1332 - RenderBlock {HTML} at (0,0) size 785x1332 - RenderBody {BODY} at (8,8) size 769x1316 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1378 + RenderBlock {HTML} at (0,0) size 785x1378 + RenderBody {BODY} at (8,8) size 769x1362 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x165 + RenderBlock {PRE} at (0,34) size 769x165 RenderText {#text} at (0,0) size 264x165 text run at (0,0) width 232: ".one {letter-spacing: 0.3in;}" text run at (0,15) width 232: ".two {letter-spacing: 0.5cm;}" @@ -19,110 +19,110 @@ layer at (0,0) size 785x1332 text run at (0,120) width 248: ".nine {letter-spacing: normal;}" text run at (0,135) width 224: ".ten {letter-spacing: 300%;}" text run at (0,150) width 264: ".eleven {letter-spacing: -0.1em;}" - RenderBlock {HR} at (0,211) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,229) size 769x68 - RenderText {#text} at (0,0) size 710x68 + RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,230) size 769x72 + RenderText {#text} at (0,0) size 710x71 text run at (0,0) width 687: "This letters in this" - text run at (0,17) width 710: "sentence should have" - text run at (0,34) width 675: "extra space between" - text run at (0,51) width 179: "them." - RenderBlock {P} at (0,313) size 769x51 - RenderText {#text} at (0,0) size 718x51 + text run at (0,18) width 710: "sentence should have" + text run at (0,36) width 675: "extra space between" + text run at (0,54) width 179: "them." + RenderBlock {P} at (0,318) size 769x54 + RenderText {#text} at (0,0) size 718x53 text run at (0,0) width 718: "This letters in this sentence" - text run at (0,17) width 585: "should have extra space" - text run at (0,34) width 338: "between them." - RenderBlock {P} at (0,380) size 769x51 - RenderText {#text} at (0,0) size 718x51 + text run at (0,18) width 585: "should have extra space" + text run at (0,36) width 338: "between them." + RenderBlock {P} at (0,388) size 769x54 + RenderText {#text} at (0,0) size 718x53 text run at (0,0) width 718: "This letters in this sentence" - text run at (0,17) width 585: "should have extra space" - text run at (0,34) width 338: "between them." - RenderBlock {P} at (0,447) size 769x17 + text run at (0,18) width 585: "should have extra space" + text run at (0,36) width 338: "between them." + RenderBlock {P} at (0,458) size 769x18 RenderText {#text} at (0,0) size 687x17 text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - RenderBlock {P} at (0,480) size 769x17 + RenderBlock {P} at (0,492) size 769x18 RenderText {#text} at (0,0) size 687x17 text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - RenderBlock {P} at (0,513) size 769x51 - RenderText {#text} at (0,0) size 703x51 + RenderBlock {P} at (0,526) size 769x54 + RenderText {#text} at (0,0) size 703x53 text run at (0,0) width 633: "This letters in this sentence" - text run at (0,17) width 703: "should have extra space between" - text run at (0,34) width 115: "them." - RenderBlock {P} at (0,580) size 769x34 - RenderText {#text} at (0,0) size 747x34 + text run at (0,18) width 703: "should have extra space between" + text run at (0,36) width 115: "them." + RenderBlock {P} at (0,596) size 769x36 + RenderText {#text} at (0,0) size 747x35 text run at (0,0) width 747: "This letters in this sentence should have extra space" - text run at (0,17) width 196: "between them." - RenderBlock {P} at (0,630) size 769x34 - RenderText {#text} at (0,0) size 754x34 + text run at (0,18) width 196: "between them." + RenderBlock {P} at (0,648) size 769x36 + RenderText {#text} at (0,0) size 754x35 text run at (0,0) width 754: "This letters in this sentence should have extra space between them," - text run at (0,17) width 435: "but the last few words in the sentence " + text run at (0,18) width 435: "but the last few words in the sentence " RenderInline {SPAN} at (0,0) size 180x17 - RenderText {#text} at (435,17) size 180x17 - text run at (435,17) width 180: "should show normal spacing" - RenderText {#text} at (615,17) size 9x17 - text run at (615,17) width 9: "." - RenderBlock {P} at (0,680) size 769x34 - RenderText {#text} at (0,0) size 731x34 + RenderText {#text} at (435,18) size 180x17 + text run at (435,18) width 180: "should show normal spacing" + RenderText {#text} at (615,18) size 9x17 + text run at (615,18) width 9: "." + RenderBlock {P} at (0,700) size 769x36 + RenderText {#text} at (0,0) size 731x35 text run at (0,0) width 731: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,17) width 57: "property." - RenderBlock {P} at (0,730) size 769x17 + text run at (0,18) width 57: "property." + RenderBlock {P} at (0,752) size 769x18 RenderText {#text} at (0,0) size 566x17 text run at (0,0) width 566: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." - RenderTable {TABLE} at (0,763) size 769x553 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x551 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,786) size 769x576 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x574 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x526 - RenderTableCell {TD} at (0,275) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x526 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x68 - RenderText {#text} at (0,0) size 710x68 + RenderTableRow {TR} at (0,26) size 767x548 + RenderTableCell {TD} at (0,287) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x548 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x72 + RenderText {#text} at (0,0) size 710x71 text run at (0,0) width 687: "This letters in this" - text run at (0,17) width 710: "sentence should have" - text run at (0,34) width 675: "extra space between" - text run at (0,51) width 179: "them." - RenderBlock {P} at (4,88) size 747x51 - RenderText {#text} at (0,0) size 718x51 + text run at (0,18) width 710: "sentence should have" + text run at (0,36) width 675: "extra space between" + text run at (0,54) width 179: "them." + RenderBlock {P} at (4,92) size 747x54 + RenderText {#text} at (0,0) size 718x53 text run at (0,0) width 718: "This letters in this sentence" - text run at (0,17) width 585: "should have extra space" - text run at (0,34) width 338: "between them." - RenderBlock {P} at (4,155) size 747x51 - RenderText {#text} at (0,0) size 718x51 + text run at (0,18) width 585: "should have extra space" + text run at (0,36) width 338: "between them." + RenderBlock {P} at (4,162) size 747x54 + RenderText {#text} at (0,0) size 718x53 text run at (0,0) width 718: "This letters in this sentence" - text run at (0,17) width 585: "should have extra space" - text run at (0,34) width 338: "between them." - RenderBlock {P} at (4,222) size 747x17 + text run at (0,18) width 585: "should have extra space" + text run at (0,36) width 338: "between them." + RenderBlock {P} at (4,232) size 747x18 RenderText {#text} at (0,0) size 687x17 text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - RenderBlock {P} at (4,255) size 747x17 + RenderBlock {P} at (4,266) size 747x18 RenderText {#text} at (0,0) size 687x17 text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - RenderBlock {P} at (4,288) size 747x51 - RenderText {#text} at (0,0) size 703x51 + RenderBlock {P} at (4,300) size 747x54 + RenderText {#text} at (0,0) size 703x53 text run at (0,0) width 633: "This letters in this sentence" - text run at (0,17) width 703: "should have extra space between" - text run at (0,34) width 115: "them." - RenderBlock {P} at (4,355) size 747x34 - RenderText {#text} at (0,0) size 747x34 + text run at (0,18) width 703: "should have extra space between" + text run at (0,36) width 115: "them." + RenderBlock {P} at (4,370) size 747x36 + RenderText {#text} at (0,0) size 747x35 text run at (0,0) width 747: "This letters in this sentence should have extra space" - text run at (0,17) width 196: "between them." - RenderBlock {P} at (4,405) size 747x34 - RenderText {#text} at (0,0) size 685x34 + text run at (0,18) width 196: "between them." + RenderBlock {P} at (4,422) size 747x36 + RenderText {#text} at (0,0) size 685x35 text run at (0,0) width 685: "This letters in this sentence should have extra space between" - text run at (0,17) width 504: "them, but the last few words in the sentence " + text run at (0,18) width 504: "them, but the last few words in the sentence " RenderInline {SPAN} at (0,0) size 180x17 - RenderText {#text} at (504,17) size 180x17 - text run at (504,17) width 180: "should show normal spacing" - RenderText {#text} at (684,17) size 9x17 - text run at (684,17) width 9: "." - RenderBlock {P} at (4,455) size 747x34 - RenderText {#text} at (0,0) size 731x34 + RenderText {#text} at (504,18) size 180x17 + text run at (504,18) width 180: "should show normal spacing" + RenderText {#text} at (684,18) size 9x17 + text run at (684,18) width 9: "." + RenderBlock {P} at (4,474) size 747x36 + RenderText {#text} at (0,0) size 731x35 text run at (0,0) width 731: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,17) width 57: "property." - RenderBlock {P} at (4,505) size 747x17 + text run at (0,18) width 57: "property." + RenderBlock {P} at (4,526) size 747x18 RenderText {#text} at (0,0) size 566x17 text run at (0,0) width 566: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." diff --git a/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.png b/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.png index a96fa4e25991..a43a51dffa5b 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.txt index fd2e44a54143..401e8a3a9baf 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/line_height-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x2669 +layer at (0,0) size 785x2675 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2669 - RenderBlock {HTML} at (0,0) size 785x2669 - RenderBody {BODY} at (8,8) size 769x2653 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x2675 + RenderBlock {HTML} at (0,0) size 785x2675 + RenderBody {BODY} at (8,8) size 769x2659 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x210 + RenderBlock {PRE} at (0,34) size 769x210 RenderText {#text} at (0,0) size 400x210 text run at (0,0) width 344: ".one {line-height: 0.5in; font-size: 12px;}" text run at (0,15) width 328: ".two {line-height: 2cm; font-size: 12px;}" @@ -22,32 +22,32 @@ layer at (0,0) size 785x2669 text run at (0,165) width 400: "TABLE .ten {line-height: normal; font-size: 12px;}" text run at (0,180) width 248: "DIV {background-color: silver;}" text run at (0,195) width 304: "SPAN.color {background-color: silver;}" - RenderBlock {HR} at (0,256) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,270) size 769x48 + RenderBlock {HR} at (0,257) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,271) size 769x48 RenderText {#text} at (0,17) size 507x14 text run at (0,17) width 507: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - RenderBlock {P} at (0,330) size 769x75 + RenderBlock {P} at (0,331) size 769x75 RenderText {#text} at (0,30) size 526x14 text run at (0,30) width 526: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - RenderBlock {P} at (0,417) size 769x75 + RenderBlock {P} at (0,418) size 769x75 RenderText {#text} at (0,30) size 539x14 text run at (0,30) width 539: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - RenderBlock {P} at (0,504) size 769x32 + RenderBlock {P} at (0,505) size 769x32 RenderText {#text} at (0,9) size 540x14 text run at (0,9) width 540: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - RenderBlock {P} at (0,548) size 769x32 + RenderBlock {P} at (0,549) size 769x32 RenderText {#text} at (0,9) size 497x14 text run at (0,9) width 497: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - RenderBlock {P} at (0,592) size 769x24 + RenderBlock {P} at (0,593) size 769x24 RenderText {#text} at (0,5) size 487x14 text run at (0,5) width 487: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - RenderBlock {P} at (0,628) size 769x18 + RenderBlock {P} at (0,629) size 769x18 RenderText {#text} at (0,2) size 489x14 text run at (0,2) width 489: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - RenderBlock {P} at (0,658) size 769x24 + RenderBlock {P} at (0,659) size 769x24 RenderText {#text} at (0,5) size 537x14 text run at (0,5) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {DIV} at (0,694) size 769x168 [bgcolor=#C0C0C0] + RenderBlock {DIV} at (0,695) size 769x168 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (0,0) size 769x24 RenderText {#text} at (0,5) size 592x14 text run at (0,5) width 592: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." @@ -59,10 +59,10 @@ layer at (0,0) size 785x2669 RenderBlock (anonymous) at (0,144) size 769x24 RenderText {#text} at (0,5) size 606x14 text run at (0,5) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {P} at (0,874) size 769x24 + RenderBlock {P} at (0,875) size 769x24 RenderText {#text} at (0,5) size 537x14 text run at (0,5) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {DIV} at (0,910) size 769x240 [bgcolor=#C0C0C0] + RenderBlock {DIV} at (0,911) size 769x240 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (0,0) size 769x24 RenderText {#text} at (0,5) size 592x14 text run at (0,5) width 592: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." @@ -74,32 +74,32 @@ layer at (0,0) size 785x2669 RenderBlock (anonymous) at (0,216) size 769x24 RenderText {#text} at (0,5) size 606x14 text run at (0,5) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {P} at (0,1162) size 769x100 + RenderBlock {P} at (0,1163) size 769x100 RenderText {#text} at (0,18) size 745x64 text run at (0,18) width 592: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " text run at (592,18) width 153: "In the second section (within the" text run at (0,68) width 181: "table) its line-height should be normal." - RenderBlock {P} at (0,1274) size 769x14 + RenderBlock {P} at (0,1275) size 769x15 RenderText {#text} at (0,0) size 504x14 text run at (0,0) width 504: "This sentence should have a normal line-height, because negative values are not permitted for this property." - RenderBlock {P} at (0,1300) size 769x150 + RenderBlock {P} at (0,1302) size 769x150 RenderInline {SPAN} at (0,0) size 758x89 [bgcolor=#C0C0C0] RenderText {#text} at (0,30) size 758x89 text run at (0,30) width 758: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but no" text run at (0,105) width 663: "padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,1462) size 769x1191 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1189 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,1464) size 769x1195 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1193 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1164 - RenderTableCell {TD} at (0,594) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x1167 + RenderTableCell {TD} at (0,596) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x18 text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,26) size 755x1167 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x48 RenderText {#text} at (0,17) size 507x14 text run at (0,17) width 507: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." @@ -152,15 +152,15 @@ layer at (0,0) size 785x2669 RenderBlock (anonymous) at (0,264) size 747x24 RenderText {#text} at (0,5) size 606x14 text run at (0,5) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {P} at (4,944) size 747x28 - RenderText {#text} at (0,0) size 745x28 + RenderBlock {P} at (4,944) size 747x30 + RenderText {#text} at (0,0) size 745x29 text run at (0,0) width 592: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " text run at (592,0) width 153: "In the second section (within the" - text run at (0,14) width 181: "table) its line-height should be normal." - RenderBlock {P} at (4,984) size 747x14 + text run at (0,15) width 181: "table) its line-height should be normal." + RenderBlock {P} at (4,986) size 747x15 RenderText {#text} at (0,0) size 504x14 text run at (0,0) width 504: "This sentence should have a normal line-height, because negative values are not permitted for this property." - RenderBlock {P} at (4,1010) size 747x150 + RenderBlock {P} at (4,1013) size 747x150 RenderInline {SPAN} at (0,0) size 743x89 [bgcolor=#C0C0C0] RenderText {#text} at (0,30) size 743x89 text run at (0,30) width 743: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but" diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.png b/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.png index 13b51735e598..b526fbdcf0f9 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.txt index 081f14bf7f78..5cb9f1a7114c 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/text_align-expected.txt @@ -3,54 +3,54 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x75 + RenderBlock {PRE} at (0,34) size 784x75 RenderText {#text} at (0,0) size 224x75 text run at (0,0) width 192: ".one {text-align: left;}" text run at (0,15) width 200: ".two {text-align: right;}" text run at (0,30) width 224: ".three {text-align: center;}" text run at (0,45) width 224: ".four {text-align: justify;}" text run at (0,60) width 0: " " - RenderBlock {HR} at (0,121) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,139) size 784x17 + RenderBlock {HR} at (0,122) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,140) size 784x18 RenderText {#text} at (0,0) size 234x17 text run at (0,0) width 234: "This sentence should be left-justified." - RenderBlock {P} at (0,172) size 784x17 + RenderBlock {P} at (0,174) size 784x18 RenderText {#text} at (541,0) size 243x17 text run at (541,0) width 243: "This sentence should be right-justified." - RenderBlock {P} at (0,205) size 784x17 + RenderBlock {P} at (0,208) size 784x18 RenderText {#text} at (286,0) size 212x17 text run at (286,0) width 212: "This sentence should be centered." - RenderBlock {P} at (0,238) size 784x51 - RenderText {#text} at (0,0) size 784x51 + RenderBlock {P} at (0,242) size 784x54 + RenderText {#text} at (0,0) size 784x53 text run at (0,0) width 784: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" - text run at (0,17) width 784: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western" - text run at (0,34) width 67: "languages." - RenderTable {TABLE} at (0,305) size 784x185 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x183 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 784: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western" + text run at (0,36) width 67: "languages." + RenderTable {TABLE} at (0,312) size 784x192 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x190 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x158 - RenderTableCell {TD} at (0,91) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x158 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x17 + RenderTableRow {TR} at (0,26) size 782x164 + RenderTableCell {TD} at (0,95) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x18 RenderText {#text} at (0,0) size 234x17 text run at (0,0) width 234: "This sentence should be left-justified." - RenderBlock {P} at (4,37) size 762x17 + RenderBlock {P} at (4,38) size 762x18 RenderText {#text} at (519,0) size 243x17 text run at (519,0) width 243: "This sentence should be right-justified." - RenderBlock {P} at (4,70) size 762x17 + RenderBlock {P} at (4,72) size 762x18 RenderText {#text} at (275,0) size 212x17 text run at (275,0) width 212: "This sentence should be centered." - RenderBlock {P} at (4,103) size 762x51 - RenderText {#text} at (0,0) size 762x51 + RenderBlock {P} at (4,106) size 762x54 + RenderText {#text} at (0,0) size 762x53 text run at (0,0) width 762: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" - text run at (0,17) width 762: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in" - text run at (0,34) width 123: "Western languages." + text run at (0,18) width 762: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in" + text run at (0,36) width 123: "Western languages." diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.png b/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.png index 5eb62157384f..21a8b60a745a 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.txt index 4352cdbd2f26..2ad6467460f2 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/text_decoration-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1117 +layer at (0,0) size 785x1151 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1117 - RenderBlock {HTML} at (0,0) size 785x1117 - RenderBody {BODY} at (8,8) size 769x1101 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1151 + RenderBlock {HTML} at (0,0) size 785x1151 + RenderBody {BODY} at (8,8) size 769x1135 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x120 + RenderBlock {PRE} at (0,34) size 769x120 RenderText {#text} at (0,0) size 464x120 text run at (0,0) width 272: ".one {text-decoration: underline;}" text run at (0,15) width 264: ".two {text-decoration: overline;}" @@ -16,43 +16,43 @@ layer at (0,0) size 785x1117 text run at (0,75) width 344: ".six {text-decoration: underline overline;}" text run at (0,90) width 464: ".seven {text-decoration: underline overline line-through;}" text run at (0,105) width 0: " " - RenderBlock {HR} at (0,166) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,184) size 769x17 + RenderBlock {HR} at (0,167) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,185) size 769x18 RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "This sentence should be underlined." - RenderBlock {P} at (0,217) size 769x17 + RenderBlock {P} at (0,219) size 769x18 RenderText {#text} at (0,0) size 218x17 text run at (0,0) width 218: "This sentence should be overlined." - RenderBlock {P} at (0,250) size 769x17 + RenderBlock {P} at (0,253) size 769x18 RenderText {#text} at (0,0) size 336x17 text run at (0,0) width 336: "This sentence should have stricken text (linethrough)." - RenderBlock {P} at (0,283) size 769x17 + RenderBlock {P} at (0,287) size 769x18 RenderText {#text} at (0,0) size 591x17 text run at (0,0) width 210: "This element should be blinking. " text run at (210,0) width 381: "(It is not required, however, that UAs support this behavior.)" - RenderBlock {P} at (0,316) size 769x34 + RenderBlock {P} at (0,321) size 769x36 RenderText {#text} at (0,0) size 508x17 text run at (0,0) width 291: "The text in this element should be underlined. " text run at (291,0) width 217: "The boldfaced text in this element " RenderInline {B} at (0,0) size 173x17 RenderText {#text} at (508,0) size 173x17 text run at (508,0) width 173: "should also be underlined" - RenderText {#text} at (681,0) size 731x34 + RenderText {#text} at (681,0) size 731x35 text run at (681,0) width 8: ". " text run at (689,0) width 42: "This is" - text run at (0,17) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - RenderBlock {P} at (0,366) size 769x17 + text run at (0,18) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." + RenderBlock {P} at (0,373) size 769x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "This sentence should be underlined and overlined." - RenderBlock {P} at (0,399) size 769x17 + RenderBlock {P} at (0,407) size 769x18 RenderText {#text} at (0,0) size 377x17 text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." - RenderBlock {P} at (0,432) size 769x0 - RenderBlock {P} at (0,432) size 769x34 - RenderText {#text} at (0,0) size 761x34 + RenderBlock {P} at (0,441) size 769x0 + RenderBlock {P} at (0,441) size 769x36 + RenderText {#text} at (0,0) size 761x35 text run at (0,0) width 761: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class" - text run at (0,17) width 62: "of seven)." - RenderBlock {P} at (0,482) size 769x52 + text run at (0,18) width 62: "of seven)." + RenderBlock {P} at (0,493) size 769x55 RenderText {#text} at (0,1) size 634x17 text run at (0,1) width 634: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " RenderInline {EM} at (0,0) size 20x17 @@ -61,11 +61,11 @@ layer at (0,0) size 785x1117 RenderText {#text} at (654,1) size 90x17 text run at (654,1) width 90: " be overlined: " RenderImage {IMG} at (744,0) size 15x15 - RenderText {#text} at (759,1) size 763x51 + RenderText {#text} at (759,1) size 763x53 text run at (759,1) width 4: "." - text run at (0,18) width 729: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" - text run at (0,35) width 59: "elements." - RenderBlock {P} at (0,550) size 769x17 [color=#008000] + text run at (0,19) width 729: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" + text run at (0,37) width 59: "elements." + RenderBlock {P} at (0,564) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "The underlining " RenderInline {SPAN} at (0,0) size 96x17 [color=#0000FF] @@ -78,7 +78,7 @@ layer at (0,0) size 785x1117 text run at (434,0) width 109: "text color may be" RenderText {#text} at (543,0) size 4x17 text run at (543,0) width 4: "." - RenderBlock {P} at (0,583) size 769x34 + RenderBlock {P} at (0,598) size 769x36 RenderText {#text} at (0,0) size 111x17 text run at (0,0) width 111: "The colors of the " RenderInline {SPAN} at (0,0) size 72x17 [color=#800080] @@ -94,57 +94,57 @@ layer at (0,0) size 785x1117 RenderInline {SPAN} at (0,0) size 209x17 [color=#808080] RenderText {#text} at (352,0) size 209x17 text run at (352,0) width 209: "the same as that of the parent text" - RenderText {#text} at (561,0) size 738x34 + RenderText {#text} at (561,0) size 738x35 text run at (561,0) width 177: " (that is, the first word in the" - text run at (0,17) width 213: "sentence, which should be black)." - RenderTable {TABLE} at (0,633) size 769x468 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x466 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 213: "sentence, which should be black)." + RenderTable {TABLE} at (0,650) size 769x485 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x483 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x441 - RenderTableCell {TD} at (0,233) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x17 - text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x441 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableRow {TR} at (0,26) size 767x457 + RenderTableCell {TD} at (0,241) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x18 + text run at (4,5) width 4: " " + RenderTableCell {TD} at (12,26) size 755x457 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "This sentence should be underlined." - RenderBlock {P} at (4,37) size 747x17 + RenderBlock {P} at (4,38) size 747x18 RenderText {#text} at (0,0) size 218x17 text run at (0,0) width 218: "This sentence should be overlined." - RenderBlock {P} at (4,70) size 747x17 + RenderBlock {P} at (4,72) size 747x18 RenderText {#text} at (0,0) size 336x17 text run at (0,0) width 336: "This sentence should have stricken text (linethrough)." - RenderBlock {P} at (4,103) size 747x17 + RenderBlock {P} at (4,106) size 747x18 RenderText {#text} at (0,0) size 591x17 text run at (0,0) width 210: "This element should be blinking. " text run at (210,0) width 381: "(It is not required, however, that UAs support this behavior.)" - RenderBlock {P} at (4,136) size 747x34 + RenderBlock {P} at (4,140) size 747x36 RenderText {#text} at (0,0) size 508x17 text run at (0,0) width 291: "The text in this element should be underlined. " text run at (291,0) width 217: "The boldfaced text in this element " RenderInline {B} at (0,0) size 173x17 RenderText {#text} at (508,0) size 173x17 text run at (508,0) width 173: "should also be underlined" - RenderText {#text} at (681,0) size 731x34 + RenderText {#text} at (681,0) size 731x35 text run at (681,0) width 8: ". " text run at (689,0) width 42: "This is" - text run at (0,17) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - RenderBlock {P} at (4,186) size 747x17 + text run at (0,18) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." + RenderBlock {P} at (4,192) size 747x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "This sentence should be underlined and overlined." - RenderBlock {P} at (4,219) size 747x17 + RenderBlock {P} at (4,226) size 747x18 RenderText {#text} at (0,0) size 377x17 text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." - RenderBlock {P} at (4,252) size 747x0 - RenderBlock {P} at (4,252) size 747x34 - RenderText {#text} at (0,0) size 727x34 + RenderBlock {P} at (4,260) size 747x0 + RenderBlock {P} at (4,260) size 747x36 + RenderText {#text} at (0,0) size 727x35 text run at (0,0) width 727: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with" - text run at (0,17) width 96: "class of seven)." - RenderBlock {P} at (4,302) size 747x52 + text run at (0,18) width 96: "class of seven)." + RenderBlock {P} at (4,312) size 747x55 RenderText {#text} at (0,0) size 634x17 text run at (0,0) width 634: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " RenderInline {EM} at (0,0) size 20x17 @@ -152,12 +152,12 @@ layer at (0,0) size 785x1117 text run at (634,0) width 20: "not" RenderText {#text} at (654,0) size 90x17 text run at (654,0) width 90: " be overlined: " - RenderImage {IMG} at (0,17) size 15x15 - RenderText {#text} at (15,18) size 717x34 - text run at (15,18) width 8: ". " - text run at (23,18) width 694: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans'" - text run at (0,35) width 94: "child elements." - RenderBlock {P} at (4,370) size 747x17 [color=#008000] + RenderImage {IMG} at (0,18) size 15x15 + RenderText {#text} at (15,19) size 717x35 + text run at (15,19) width 8: ". " + text run at (23,19) width 694: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans'" + text run at (0,37) width 94: "child elements." + RenderBlock {P} at (4,383) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "The underlining " RenderInline {SPAN} at (0,0) size 96x17 [color=#0000FF] @@ -170,7 +170,7 @@ layer at (0,0) size 785x1117 text run at (434,0) width 109: "text color may be" RenderText {#text} at (543,0) size 4x17 text run at (543,0) width 4: "." - RenderBlock {P} at (4,403) size 747x34 + RenderBlock {P} at (4,417) size 747x36 RenderText {#text} at (0,0) size 111x17 text run at (0,0) width 111: "The colors of the " RenderInline {SPAN} at (0,0) size 72x17 [color=#800080] @@ -186,6 +186,6 @@ layer at (0,0) size 785x1117 RenderInline {SPAN} at (0,0) size 209x17 [color=#808080] RenderText {#text} at (352,0) size 209x17 text run at (352,0) width 209: "the same as that of the parent text" - RenderText {#text} at (561,0) size 738x34 + RenderText {#text} at (561,0) size 738x35 text run at (561,0) width 177: " (that is, the first word in the" - text run at (0,17) width 213: "sentence, which should be black)." + text run at (0,18) width 213: "sentence, which should be black)." diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.png b/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.png index 33f00a8b417a..cc056ab81d16 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.txt index 18b9083795ec..5ddf6538f4a9 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/text_indent-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1210 +layer at (0,0) size 785x1246 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1210 - RenderBlock {HTML} at (0,0) size 785x1210 - RenderBody {BODY} at (8,8) size 769x1194 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1246 + RenderBlock {HTML} at (0,0) size 785x1246 + RenderBody {BODY} at (8,8) size 769x1230 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x165 + RenderBlock {PRE} at (0,34) size 769x165 RenderText {#text} at (0,0) size 384x165 text run at (0,0) width 352: ".one {text-indent: 0.5in; background: aqua;}" text run at (0,15) width 336: ".two {text-indent: 2cm; background: aqua;}" @@ -19,108 +19,108 @@ layer at (0,0) size 785x1210 text run at (0,120) width 352: ".nine {text-indent: 25px; background: aqua;}" text run at (0,135) width 384: "blockquote {text-indent: 50%; background: aqua;}" text run at (0,150) width 0: " " - RenderBlock {HR} at (0,211) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,229) size 769x17 [bgcolor=#00FFFF] + RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,230) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (48,0) size 386x17 text run at (48,0) width 386: "The first line of this sentence should be indented half an inch." - RenderBlock {P} at (0,262) size 769x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,264) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (75,0) size 412x17 text run at (75,0) width 412: "The first line of this sentence should be indented two centimeters." - RenderBlock {P} at (0,295) size 769x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,298) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (75,0) size 429x17 text run at (75,0) width 429: "The first line of this sentence should be indented twenty millimeters." - RenderBlock {P} at (0,328) size 769x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,332) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (32,0) size 428x17 text run at (32,0) width 428: "The first line of this sentence should be indented twenty-four points." - RenderBlock {P} at (0,361) size 769x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,366) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (32,0) size 372x17 text run at (32,0) width 372: "The first line of this sentence should be indented two picas." - RenderBlock {P} at (0,394) size 769x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,400) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (32,0) size 359x17 text run at (32,0) width 359: "The first line of this sentence should be indented two em." - RenderBlock {P} at (0,427) size 769x17 [bgcolor=#00FFFF] + RenderBlock {P} at (0,434) size 769x18 [bgcolor=#00FFFF] RenderText {#text} at (16,0) size 355x17 text run at (16,0) width 355: "The first line of this sentence should be indented two ex." - RenderBlock {P} at (0,460) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (384,0) size 744x34 + RenderBlock {P} at (0,468) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (384,0) size 744x35 text run at (384,0) width 360: "The first line of this sentence should be indented halfway" - text run at (0,17) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." - RenderBlock {P} at (0,510) size 769x34 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 723x34 + text run at (0,18) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." + RenderBlock {P} at (0,520) size 769x36 [bgcolor=#00FFFF] + RenderText {#text} at (25,0) size 723x35 text run at (25,0) width 698: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" - text run at (0,17) width 122: "margin of the page." - RenderBlock {P} at (0,560) size 769x51 [bgcolor=#00FFFF] + text run at (0,18) width 122: "margin of the page." + RenderBlock {P} at (0,572) size 769x54 [bgcolor=#00FFFF] RenderText {#text} at (48,0) size 416x17 text run at (48,0) width 416: "Only the first line of this sentence should be indented half an inch," RenderBR {BR} at (464,14) size 0x0 - RenderText {#text} at (0,17) size 259x17 - text run at (0,17) width 259: "no matter where the lines might start, and" - RenderBR {BR} at (259,31) size 0x0 + RenderText {#text} at (0,18) size 259x17 + text run at (0,18) width 259: "no matter where the lines might start, and" + RenderBR {BR} at (259,32) size 0x0 RenderInline {EM} at (0,0) size 199x17 - RenderText {#text} at (0,34) size 199x17 - text run at (0,34) width 199: "regardless of any other markup" - RenderText {#text} at (199,34) size 146x17 - text run at (199,34) width 146: " which may be present." - RenderBlock {BLOCKQUOTE} at (40,627) size 689x51 [bgcolor=#00FFFF] - RenderText {#text} at (384,0) size 646x51 + RenderText {#text} at (0,36) size 199x17 + text run at (0,36) width 199: "regardless of any other markup" + RenderText {#text} at (199,36) size 146x17 + text run at (199,36) width 146: " which may be present." + RenderBlock {BLOCKQUOTE} at (40,642) size 689x54 [bgcolor=#00FFFF] + RenderText {#text} at (384,0) size 646x53 text run at (384,0) width 222: "In the first half of the test page, this" - text run at (0,17) width 646: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,34) width 513: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." - RenderTable {TABLE} at (0,694) size 769x500 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x498 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 646: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" + text run at (0,36) width 513: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." + RenderTable {TABLE} at (0,712) size 769x518 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x516 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x473 - RenderTableCell {TD} at (0,249) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x490 + RenderTableCell {TD} at (0,258) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x473 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 [bgcolor=#00FFFF] + RenderTableCell {TD} at (12,26) size 755x490 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (48,0) size 386x17 text run at (48,0) width 386: "The first line of this sentence should be indented half an inch." - RenderBlock {P} at (4,37) size 747x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,38) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (75,0) size 412x17 text run at (75,0) width 412: "The first line of this sentence should be indented two centimeters." - RenderBlock {P} at (4,70) size 747x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,72) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (75,0) size 429x17 text run at (75,0) width 429: "The first line of this sentence should be indented twenty millimeters." - RenderBlock {P} at (4,103) size 747x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,106) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (32,0) size 428x17 text run at (32,0) width 428: "The first line of this sentence should be indented twenty-four points." - RenderBlock {P} at (4,136) size 747x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,140) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (32,0) size 372x17 text run at (32,0) width 372: "The first line of this sentence should be indented two picas." - RenderBlock {P} at (4,169) size 747x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,174) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (32,0) size 359x17 text run at (32,0) width 359: "The first line of this sentence should be indented two em." - RenderBlock {P} at (4,202) size 747x17 [bgcolor=#00FFFF] + RenderBlock {P} at (4,208) size 747x18 [bgcolor=#00FFFF] RenderText {#text} at (16,0) size 355x17 text run at (16,0) width 355: "The first line of this sentence should be indented two ex." - RenderBlock {P} at (4,235) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (373,0) size 733x34 + RenderBlock {P} at (4,242) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (373,0) size 733x35 text run at (373,0) width 360: "The first line of this sentence should be indented halfway" - text run at (0,17) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." - RenderBlock {P} at (4,285) size 747x34 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 723x34 + text run at (0,18) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." + RenderBlock {P} at (4,294) size 747x36 [bgcolor=#00FFFF] + RenderText {#text} at (25,0) size 723x35 text run at (25,0) width 698: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" - text run at (0,17) width 122: "margin of the page." - RenderBlock {P} at (4,335) size 747x51 [bgcolor=#00FFFF] + text run at (0,18) width 122: "margin of the page." + RenderBlock {P} at (4,346) size 747x54 [bgcolor=#00FFFF] RenderText {#text} at (48,0) size 416x17 text run at (48,0) width 416: "Only the first line of this sentence should be indented half an inch," RenderBR {BR} at (464,14) size 0x0 - RenderText {#text} at (0,17) size 259x17 - text run at (0,17) width 259: "no matter where the lines might start, and" - RenderBR {BR} at (259,31) size 0x0 + RenderText {#text} at (0,18) size 259x17 + text run at (0,18) width 259: "no matter where the lines might start, and" + RenderBR {BR} at (259,32) size 0x0 RenderInline {EM} at (0,0) size 199x17 - RenderText {#text} at (0,34) size 199x17 - text run at (0,34) width 199: "regardless of any other markup" - RenderText {#text} at (199,34) size 146x17 - text run at (199,34) width 146: " which may be present." - RenderBlock {BLOCKQUOTE} at (44,402) size 667x51 [bgcolor=#00FFFF] - RenderText {#text} at (373,0) size 646x51 + RenderText {#text} at (0,36) size 199x17 + text run at (0,36) width 199: "regardless of any other markup" + RenderText {#text} at (199,36) size 146x17 + text run at (199,36) width 146: " which may be present." + RenderBlock {BLOCKQUOTE} at (44,416) size 667x54 [bgcolor=#00FFFF] + RenderText {#text} at (373,0) size 646x53 text run at (373,0) width 222: "In the first half of the test page, this" - text run at (0,17) width 646: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,34) width 513: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." + text run at (0,18) width 646: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" + text run at (0,36) width 513: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.png b/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.png index 7866d407d26b..7599b431c75e 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.txt index aac01143d542..5c6857d0018e 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/text_transform-expected.txt @@ -1,102 +1,102 @@ -layer at (0,0) size 785x708 +layer at (0,0) size 785x732 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x708 - RenderBlock {HTML} at (0,0) size 785x708 - RenderBody {BODY} at (8,8) size 769x692 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x732 + RenderBlock {HTML} at (0,0) size 785x732 + RenderBody {BODY} at (8,8) size 769x716 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x75 + RenderBlock {PRE} at (0,34) size 769x75 RenderText {#text} at (0,0) size 272x75 text run at (0,0) width 224: ".ttn {text-transform: none;}" text run at (0,15) width 272: ".cap {text-transform: capitalize;}" text run at (0,30) width 264: ".upp {text-transform: uppercase;}" text run at (0,45) width 264: ".low {text-transform: lowercase;}" text run at (0,60) width 0: " " - RenderBlock {HR} at (0,121) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,139) size 769x34 - RenderText {#text} at (0,0) size 718x34 + RenderBlock {HR} at (0,122) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,140) size 769x36 + RenderText {#text} at (0,0) size 718x35 text run at (0,0) width 718: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" - text run at (0,17) width 48: "normal." - RenderBlock {P} at (0,189) size 769x51 - RenderText {#text} at (0,0) size 750x51 + text run at (0,18) width 48: "normal." + RenderBlock {P} at (0,192) size 769x54 + RenderText {#text} at (0,0) size 750x53 text run at (0,0) width 750: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That" - text run at (0,17) width 718: "Are In Uppercase In The Source (E.g. USA) Should Remain So. There Should Be A Capital Letter After A Non-" - text run at (0,34) width 538: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - RenderBlock {P} at (0,256) size 769x34 - RenderText {#text} at (0,0) size 753x34 + text run at (0,18) width 718: "Are In Uppercase In The Source (E.g. USA) Should Remain So. There Should Be A Capital Letter After A Non-" + text run at (0,36) width 538: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." + RenderBlock {P} at (0,262) size 769x36 + RenderText {#text} at (0,0) size 753x35 text run at (0,0) width 753: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this" - text run at (0,17) width 304: "sentence should have one, and only one, capital " + text run at (0,18) width 304: "sentence should have one, and only one, capital " RenderInline {SPAN} at (0,0) size 37x17 - RenderText {#text} at (304,17) size 17x17 - text run at (304,17) width 17: "Le" + RenderText {#text} at (304,18) size 17x17 + text run at (304,18) width 17: "Le" RenderInline {SPAN} at (0,0) size 8x17 - RenderText {#text} at (321,17) size 8x17 - text run at (321,17) width 8: "tt" - RenderText {#text} at (329,17) size 12x17 - text run at (329,17) width 12: "er" - RenderText {#text} at (341,17) size 4x17 - text run at (341,17) width 4: "." - RenderBlock {P} at (0,306) size 769x51 - RenderText {#text} at (0,0) size 721x34 + RenderText {#text} at (321,18) size 8x17 + text run at (321,18) width 8: "tt" + RenderText {#text} at (329,18) size 12x17 + text run at (329,18) width 12: "er" + RenderText {#text} at (341,18) size 4x17 + text run at (341,18) width 4: "." + RenderBlock {P} at (0,314) size 769x54 + RenderText {#text} at (0,0) size 721x35 text run at (0,0) width 721: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,17) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (359,17) width 284: "IN THE LAST SENTENCE, HOWEVER, " - RenderInline {SPAN} at (0,0) size 765x34 - RenderText {#text} at (643,17) size 765x34 - text run at (643,17) width 122: "the last eight words" - text run at (0,34) width 152: "should not be uppercase" - RenderText {#text} at (152,34) size 4x17 - text run at (152,34) width 4: "." - RenderBlock {P} at (0,373) size 769x17 + text run at (0,18) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " + text run at (359,18) width 284: "IN THE LAST SENTENCE, HOWEVER, " + RenderInline {SPAN} at (0,0) size 765x35 + RenderText {#text} at (643,18) size 765x35 + text run at (643,18) width 122: "the last eight words" + text run at (0,36) width 152: "should not be uppercase" + RenderText {#text} at (152,36) size 4x17 + text run at (152,36) width 4: "." + RenderBlock {P} at (0,384) size 769x18 RenderText {#text} at (0,0) size 726x17 text run at (0,0) width 726: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." - RenderTable {TABLE} at (0,406) size 769x286 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x284 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,418) size 769x298 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x296 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x259 - RenderTableCell {TD} at (0,142) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x270 + RenderTableCell {TD} at (0,148) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x259 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 718x34 + RenderTableCell {TD} at (12,26) size 755x270 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 718x35 text run at (0,0) width 718: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" - text run at (0,17) width 48: "normal." - RenderBlock {P} at (4,54) size 747x51 - RenderText {#text} at (0,0) size 717x51 + text run at (0,18) width 48: "normal." + RenderBlock {P} at (4,56) size 747x54 + RenderText {#text} at (0,0) size 717x53 text run at (0,0) width 717: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words" - text run at (0,17) width 714: "That Are In Uppercase In The Source (E.g. USA) Should Remain So. There Should Be A Capital Letter After A" - text run at (0,34) width 571: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - RenderBlock {P} at (4,121) size 747x34 - RenderText {#text} at (0,0) size 727x34 + text run at (0,18) width 714: "That Are In Uppercase In The Source (E.g. USA) Should Remain So. There Should Be A Capital Letter After A" + text run at (0,36) width 571: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." + RenderBlock {P} at (4,126) size 747x36 + RenderText {#text} at (0,0) size 727x35 text run at (0,0) width 727: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in" - text run at (0,17) width 330: "this sentence should have one, and only one, capital " + text run at (0,18) width 330: "this sentence should have one, and only one, capital " RenderInline {SPAN} at (0,0) size 37x17 - RenderText {#text} at (330,17) size 17x17 - text run at (330,17) width 17: "Le" + RenderText {#text} at (330,18) size 17x17 + text run at (330,18) width 17: "Le" RenderInline {SPAN} at (0,0) size 8x17 - RenderText {#text} at (347,17) size 8x17 - text run at (347,17) width 8: "tt" - RenderText {#text} at (355,17) size 12x17 - text run at (355,17) width 12: "er" - RenderText {#text} at (367,17) size 4x17 - text run at (367,17) width 4: "." - RenderBlock {P} at (4,171) size 747x51 - RenderText {#text} at (0,0) size 721x34 + RenderText {#text} at (347,18) size 8x17 + text run at (347,18) width 8: "tt" + RenderText {#text} at (355,18) size 12x17 + text run at (355,18) width 12: "er" + RenderText {#text} at (367,18) size 4x17 + text run at (367,18) width 4: "." + RenderBlock {P} at (4,178) size 747x54 + RenderText {#text} at (0,0) size 721x35 text run at (0,0) width 721: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,17) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (359,17) width 284: "IN THE LAST SENTENCE, HOWEVER, " - RenderInline {SPAN} at (0,0) size 722x34 - RenderText {#text} at (643,17) size 722x34 - text run at (643,17) width 79: "the last eight" - text run at (0,34) width 195: "words should not be uppercase" - RenderText {#text} at (195,34) size 4x17 - text run at (195,34) width 4: "." - RenderBlock {P} at (4,238) size 747x17 + text run at (0,18) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " + text run at (359,18) width 284: "IN THE LAST SENTENCE, HOWEVER, " + RenderInline {SPAN} at (0,0) size 722x35 + RenderText {#text} at (643,18) size 722x35 + text run at (643,18) width 79: "the last eight" + text run at (0,36) width 195: "words should not be uppercase" + RenderText {#text} at (195,36) size 4x17 + text run at (195,36) width 4: "." + RenderBlock {P} at (4,248) size 747x18 RenderText {#text} at (0,0) size 726x17 text run at (0,0) width 726: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." diff --git a/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.png b/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.png index f02afd8c6a4a..9f42fbbc1eda 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt index 858976c8e6e7..41439a1d2e72 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/vertical_align-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x4340 +layer at (0,0) size 785x4408 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x4340 - RenderBlock {HTML} at (0,0) size 785x4340 - RenderBody {BODY} at (8,8) size 769x4324 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x4408 + RenderBlock {HTML} at (0,0) size 785x4408 + RenderBody {BODY} at (8,8) size 769x4392 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x270 + RenderBlock {PRE} at (0,34) size 769x270 RenderText {#text} at (0,0) size 512x270 text run at (0,0) width 160: "P {font-size: 12pt;}" text run at (0,15) width 216: ".one {vertical-align: sub;}" @@ -26,258 +26,258 @@ layer at (0,0) size 785x4340 text run at (0,225) width 256: ".topalign {vertical-align: top;}" text run at (0,240) width 280: ".midalign {vertical-align: middle;}" text run at (0,255) width 0: " " - RenderBlock {HR} at (0,316) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,334) size 769x74 + RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,335) size 769x76 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (15,40) size 126x17 text run at (15,40) width 126: "The first four words" - RenderText {#text} at (141,36) size 750x38 + RenderText {#text} at (141,36) size 750x39 text run at (141,36) width 284: " in this sentence should be subscript-aligned. " text run at (425,36) width 325: "The font size of the superscripted text should not be" - text run at (0,57) width 254: "different from that of the parent element." - RenderBlock {P} at (0,424) size 769x70 + text run at (0,58) width 254: "different from that of the parent element." + RenderBlock {P} at (0,427) size 769x72 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (15,30) size 126x17 text run at (15,30) width 126: "The first four words" - RenderText {#text} at (141,36) size 750x34 + RenderText {#text} at (141,36) size 750x35 text run at (141,36) width 296: " in this sentence should be superscript-aligned. " text run at (437,36) width 313: "The font size of the subscripted text should not be" - text run at (0,53) width 254: "different from that of the parent element." - RenderBlock {P} at (0,510) size 769x70 + text run at (0,54) width 254: "different from that of the parent element." + RenderBlock {P} at (0,515) size 769x72 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (15,0) size 126x17 text run at (15,0) width 126: "The first four words" - RenderText {#text} at (141,36) size 765x34 + RenderText {#text} at (141,36) size 765x35 text run at (141,36) width 624: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element" - text run at (0,53) width 267: "in the line (probably the orange rectangle)." - RenderBlock {P} at (0,596) size 769x129 + text run at (0,54) width 267: "in the line (probably the orange rectangle)." + RenderBlock {P} at (0,603) size 769x132 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,36) size 4x17 text run at (15,36) width 4: " " - RenderInline {SPAN} at (0,0) size 754x108 + RenderInline {SPAN} at (0,0) size 754x110 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (19,21) size 126x17 text run at (19,21) width 126: "The first four words" - RenderText {#text} at (145,21) size 754x108 + RenderText {#text} at (145,21) size 754x110 text run at (145,21) width 556: " in this sentence should be text-top-aligned," - text run at (0,57) width 754: "which should align their tops with the top of the tallest text" - text run at (0,93) width 136: "in the line." + text run at (0,58) width 754: "which should align their tops with the top of the tallest text" + text run at (0,95) width 136: "in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,741) size 769x67 + RenderBlock {P} at (0,751) size 769x68 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,15) size 739x52 text run at (15,15) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" text run at (0,50) width 310: "defined as the text baseline plus half the x-height." - RenderBlock {P} at (0,824) size 769x122 + RenderBlock {P} at (0,835) size 769x124 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,15) size 4x17 text run at (15,15) width 4: " " - RenderInline {SPAN} at (0,0) size 733x122 + RenderInline {SPAN} at (0,0) size 733x123 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 126x17 - RenderText {#text} at (19,33) size 126x17 - text run at (19,33) width 126: "The first four words" - RenderText {#text} at (145,0) size 733x122 + RenderText {#text} at (19,32) size 126x17 + text run at (19,32) width 126: "The first four words" + RenderText {#text} at (145,0) size 733x123 text run at (145,0) width 544: " in this sentence should be 12pt in size and" text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" - text run at (0,86) width 517: "bottom of the lowest element in the line." + text run at (0,87) width 517: "bottom of the lowest element in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,962) size 769x158 + RenderBlock {P} at (0,975) size 769x161 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,15) size 4x17 text run at (15,15) width 4: " " - RenderInline {SPAN} at (0,0) size 745x158 + RenderInline {SPAN} at (0,0) size 745x160 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 293x17 - RenderText {#text} at (19,19) size 293x17 - text run at (19,19) width 293: "The first eight words (\"eight\" has a descender)" - RenderText {#text} at (312,0) size 745x158 + RenderText {#text} at (19,18) size 293x17 + text run at (19,18) width 293: "The first eight words (\"eight\" has a descender)" + RenderText {#text} at (312,0) size 745x160 text run at (312,0) width 433: " in this sentence should be 12pt in" text run at (0,50) width 692: "size and text-bottom-aligned, which should align their" - text run at (0,86) width 671: "bottom with the bottom of the lowest text (including" - text run at (0,122) width 294: "descenders) in the line." + text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" + text run at (0,124) width 294: "descenders) in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,1136) size 769x129 + RenderBlock {P} at (0,1152) size 769x132 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,36) size 4x17 text run at (15,36) width 4: " " - RenderInline {SPAN} at (0,0) size 759x108 + RenderInline {SPAN} at (0,0) size 759x110 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (19,36) size 126x17 text run at (19,36) width 126: "The first four words" - RenderText {#text} at (145,21) size 759x108 + RenderText {#text} at (145,21) size 759x110 text run at (145,21) width 544: " in this sentence should be 12pt in size and" - text run at (0,57) width 759: "baseline-aligned, which should align their baseline with the" - text run at (0,93) width 522: "baseline of the rest of the text in the line." + text run at (0,58) width 759: "baseline-aligned, which should align their baseline with the" + text run at (0,95) width 522: "baseline of the rest of the text in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,1281) size 769x70 + RenderBlock {P} at (0,1300) size 769x72 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 96x14 RenderText {#text} at (15,31) size 96x14 text run at (15,31) width 96: "The first four words" - RenderText {#text} at (111,36) size 750x34 + RenderText {#text} at (111,36) size 750x35 text run at (111,36) width 639: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," - text run at (0,53) width 376: "which should raise them 8px relative to the natural baseline." - RenderBlock {P} at (0,1367) size 769x34 - RenderText {#text} at (0,0) size 742x34 + text run at (0,54) width 376: "which should raise them 8px relative to the natural baseline." + RenderBlock {P} at (0,1388) size 769x36 + RenderText {#text} at (0,0) size 742x35 text run at (0,0) width 742: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" - text run at (0,17) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." - RenderBlock {P} at (0,1419) size 769x321 - RenderText {#text} at (0,25) size 120x21 - text run at (0,25) width 120: "This paragraph " - RenderImage {IMG} at (120,25) size 9x30 - RenderText {#text} at (129,25) size 5x21 - text run at (129,25) width 5: " " + text run at (0,18) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." + RenderBlock {P} at (0,1442) size 769x324 + RenderText {#text} at (0,26) size 120x21 + text run at (0,26) width 120: "This paragraph " + RenderImage {IMG} at (120,26) size 9x30 + RenderText {#text} at (129,26) size 5x21 + text run at (129,26) width 5: " " RenderInline {SPAN} at (0,0) size 422x52 - RenderText {#text} at (134,0) size 422x52 - text run at (134,0) width 422: "contains many images" - RenderText {#text} at (556,25) size 5x21 - text run at (556,25) width 5: " " - RenderImage {IMG} at (561,25) size 15x50 - RenderText {#text} at (576,25) size 5x21 - text run at (576,25) width 5: " " + RenderText {#text} at (134,1) size 422x52 + text run at (134,1) width 422: "contains many images" + RenderText {#text} at (556,26) size 5x21 + text run at (556,26) width 5: " " + RenderImage {IMG} at (561,26) size 15x50 + RenderText {#text} at (576,26) size 5x21 + text run at (576,26) width 5: " " RenderInline {BIG} at (0,0) size 156x24 - RenderText {#text} at (581,23) size 156x24 - text run at (581,23) width 156: "of varying heights" - RenderText {#text} at (737,25) size 5x21 - text run at (737,25) width 5: " " - RenderImage {IMG} at (742,25) size 3x10 + RenderText {#text} at (581,24) size 156x24 + text run at (581,24) width 156: "of varying heights" + RenderText {#text} at (737,26) size 5x21 + text run at (737,26) width 5: " " + RenderImage {IMG} at (742,26) size 3x10 RenderText {#text} at (0,0) size 0x0 RenderInline {SMALL} at (0,0) size 69x17 - RenderText {#text} at (0,123) size 69x17 - text run at (0,123) width 69: "and widths" - RenderText {#text} at (69,120) size 5x21 - text run at (69,120) width 5: " " - RenderImage {IMG} at (74,120) size 6x20 - RenderText {#text} at (80,120) size 101x21 - text run at (80,120) width 101: " all of which " - RenderImage {IMG} at (181,120) size 20x65 - RenderText {#text} at (201,120) size 5x21 - text run at (201,120) width 5: " " + RenderText {#text} at (0,125) size 69x17 + text run at (0,125) width 69: "and widths" + RenderText {#text} at (69,122) size 5x21 + text run at (69,122) width 5: " " + RenderImage {IMG} at (74,122) size 6x20 + RenderText {#text} at (80,122) size 101x21 + text run at (80,122) width 101: " all of which " + RenderImage {IMG} at (181,122) size 20x65 + RenderText {#text} at (201,122) size 5x21 + text run at (201,122) width 5: " " RenderInline {SPAN} at (0,0) size 262x41 - RenderText {#text} at (206,104) size 262x41 - text run at (206,104) width 262: "should be aligned" - RenderText {#text} at (468,120) size 5x21 - text run at (468,120) width 5: " " - RenderImage {IMG} at (473,120) size 11x35 - RenderText {#text} at (484,120) size 123x21 - text run at (484,120) width 123: " with the top of " - RenderImage {IMG} at (607,120) size 9x30 - RenderText {#text} at (616,120) size 5x21 - text run at (616,120) width 5: " " - RenderInline {SPAN} at (0,0) size 733x141 - RenderText {#text} at (621,112) size 19x31 - text run at (621,112) width 19: "a " - RenderInline {SPAN} at (0,0) size 733x187 - RenderText {#text} at (640,75) size 733x187 - text run at (640,75) width 93: "14-" - text run at (0,185) width 143: "point" - RenderText {#text} at (143,222) size 144x31 - text run at (143,222) width 144: " text element" - RenderText {#text} at (287,230) size 5x21 - text run at (287,230) width 5: " " - RenderImage {IMG} at (292,230) size 15x50 - RenderText {#text} at (307,230) size 5x21 - text run at (307,230) width 5: " " + RenderText {#text} at (206,106) size 262x41 + text run at (206,106) width 262: "should be aligned" + RenderText {#text} at (468,122) size 5x21 + text run at (468,122) width 5: " " + RenderImage {IMG} at (473,122) size 11x35 + RenderText {#text} at (484,122) size 123x21 + text run at (484,122) width 123: " with the top of " + RenderImage {IMG} at (607,122) size 9x30 + RenderText {#text} at (616,122) size 5x21 + text run at (616,122) width 5: " " + RenderInline {SPAN} at (0,0) size 733x142 + RenderText {#text} at (621,114) size 19x31 + text run at (621,114) width 19: "a " + RenderInline {SPAN} at (0,0) size 733x188 + RenderText {#text} at (640,77) size 733x188 + text run at (640,77) width 93: "14-" + text run at (0,188) width 143: "point" + RenderText {#text} at (143,225) size 144x31 + text run at (143,225) width 144: " text element" + RenderText {#text} at (287,233) size 5x21 + text run at (287,233) width 5: " " + RenderImage {IMG} at (292,233) size 15x50 + RenderText {#text} at (307,233) size 5x21 + text run at (307,233) width 5: " " RenderInline {SMALL} at (0,0) size 189x17 - RenderText {#text} at (312,233) size 189x17 - text run at (312,233) width 189: "regardless of the line in which" - RenderText {#text} at (501,230) size 5x21 - text run at (501,230) width 5: " " - RenderImage {IMG} at (506,230) size 5x15 - RenderText {#text} at (511,230) size 5x21 - text run at (511,230) width 5: " " + RenderText {#text} at (312,236) size 189x17 + text run at (312,236) width 189: "regardless of the line in which" + RenderText {#text} at (501,233) size 5x21 + text run at (501,233) width 5: " " + RenderImage {IMG} at (506,233) size 5x15 + RenderText {#text} at (511,233) size 5x21 + text run at (511,233) width 5: " " RenderInline {BIG} at (0,0) size 156x24 - RenderText {#text} at (516,228) size 156x24 - text run at (516,228) width 156: "the images appear." - RenderText {#text} at (672,230) size 5x21 - text run at (672,230) width 5: " " - RenderImage {IMG} at (677,230) size 27x90 + RenderText {#text} at (516,231) size 156x24 + text run at (516,231) width 156: "the images appear." + RenderText {#text} at (672,233) size 5x21 + text run at (672,233) width 5: " " + RenderImage {IMG} at (677,233) size 27x90 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,1758) size 769x35 - RenderText {#text} at (0,0) size 749x34 + RenderBlock {P} at (0,1784) size 769x37 + RenderText {#text} at (0,0) size 749x35 text run at (0,0) width 749: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" - text run at (0,17) width 362: "aligned with the text baseline (which is the default value)." - RenderBlock {P} at (0,1808) size 769x230 - RenderText {#text} at (0,22) size 99x17 - text run at (0,22) width 99: "This paragraph " - RenderImage {IMG} at (99,17) size 9x30 - RenderText {#text} at (108,22) size 4x17 - text run at (108,22) width 4: " " + text run at (0,18) width 362: "aligned with the text baseline (which is the default value)." + RenderBlock {P} at (0,1836) size 769x232 + RenderText {#text} at (0,23) size 99x17 + text run at (0,23) width 99: "This paragraph " + RenderImage {IMG} at (99,18) size 9x30 + RenderText {#text} at (108,23) size 4x17 + text run at (108,23) width 4: " " RenderInline {SPAN} at (0,0) size 357x45 - RenderText {#text} at (112,0) size 357x45 - text run at (112,0) width 357: "contains many images" - RenderText {#text} at (469,22) size 4x17 - text run at (469,22) width 4: " " - RenderImage {IMG} at (473,7) size 15x50 - RenderText {#text} at (488,22) size 122x17 - text run at (488,22) width 122: " of varying heights " - RenderImage {IMG} at (610,27) size 3x10 - RenderText {#text} at (613,22) size 4x17 - text run at (613,22) width 4: " " + RenderText {#text} at (112,1) size 357x45 + text run at (112,1) width 357: "contains many images" + RenderText {#text} at (469,23) size 4x17 + text run at (469,23) width 4: " " + RenderImage {IMG} at (473,8) size 15x50 + RenderText {#text} at (488,23) size 122x17 + text run at (488,23) width 122: " of varying heights " + RenderImage {IMG} at (610,28) size 3x10 + RenderText {#text} at (613,23) size 4x17 + text run at (613,23) width 4: " " RenderInline {SMALL} at (0,0) size 69x17 - RenderText {#text} at (617,22) size 69x17 - text run at (617,22) width 69: "and widths" - RenderText {#text} at (686,22) size 4x17 - text run at (686,22) width 4: " " - RenderImage {IMG} at (690,22) size 6x20 - RenderText {#text} at (696,22) size 732x91 - text run at (696,22) width 36: " all of" - text run at (0,96) width 43: "which " - RenderImage {IMG} at (43,74) size 20x65 - RenderText {#text} at (63,96) size 119x17 - text run at (63,96) width 119: " should be aligned " - RenderImage {IMG} at (182,89) size 11x35 - RenderText {#text} at (193,96) size 4x17 - text run at (193,96) width 4: " " + RenderText {#text} at (617,23) size 69x17 + text run at (617,23) width 69: "and widths" + RenderText {#text} at (686,23) size 4x17 + text run at (686,23) width 4: " " + RenderImage {IMG} at (690,23) size 6x20 + RenderText {#text} at (696,23) size 732x92 + text run at (696,23) width 36: " all of" + text run at (0,98) width 43: "which " + RenderImage {IMG} at (43,76) size 20x65 + RenderText {#text} at (63,98) size 119x17 + text run at (63,98) width 119: " should be aligned " + RenderImage {IMG} at (182,91) size 11x35 + RenderText {#text} at (193,98) size 4x17 + text run at (193,98) width 4: " " RenderInline {SPAN} at (0,0) size 236x36 - RenderText {#text} at (197,81) size 236x36 - text run at (197,81) width 236: "with the middle of" - RenderText {#text} at (433,96) size 4x17 - text run at (433,96) width 4: " " - RenderImage {IMG} at (437,81) size 15x50 - RenderText {#text} at (452,96) size 4x17 - text run at (452,96) width 4: " " + RenderText {#text} at (197,83) size 236x36 + text run at (197,83) width 236: "with the middle of" + RenderText {#text} at (433,98) size 4x17 + text run at (433,98) width 4: " " + RenderImage {IMG} at (437,83) size 15x50 + RenderText {#text} at (452,98) size 4x17 + text run at (452,98) width 4: " " RenderInline {SPAN} at (0,0) size 720x104 - RenderText {#text} at (456,89) size 17x26 - text run at (456,89) width 17: "a " + RenderText {#text} at (456,91) size 17x26 + text run at (456,91) width 17: "a " RenderInline {SPAN} at (0,0) size 204x66 - RenderText {#text} at (473,57) size 204x66 - text run at (473,57) width 204: "14-point" - RenderText {#text} at (677,89) size 720x104 - text run at (677,89) width 43: " text" - text run at (0,167) width 78: "element" - RenderText {#text} at (78,174) size 4x17 - text run at (78,174) width 4: " " - RenderImage {IMG} at (82,159) size 15x50 - RenderText {#text} at (97,174) size 4x17 - text run at (97,174) width 4: " " + RenderText {#text} at (473,59) size 204x66 + text run at (473,59) width 204: "14-point" + RenderText {#text} at (677,91) size 720x104 + text run at (677,91) width 43: " text" + text run at (0,169) width 78: "element" + RenderText {#text} at (78,176) size 4x17 + text run at (78,176) width 4: " " + RenderImage {IMG} at (82,161) size 15x50 + RenderText {#text} at (97,176) size 4x17 + text run at (97,176) width 4: " " RenderInline {SMALL} at (0,0) size 189x17 - RenderText {#text} at (101,174) size 189x17 - text run at (101,174) width 189: "regardless of the line in which" - RenderText {#text} at (290,174) size 4x17 - text run at (290,174) width 4: " " - RenderImage {IMG} at (294,177) size 5x15 - RenderText {#text} at (299,174) size 4x17 - text run at (299,174) width 4: " " + RenderText {#text} at (101,176) size 189x17 + text run at (101,176) width 189: "regardless of the line in which" + RenderText {#text} at (290,176) size 4x17 + text run at (290,176) width 4: " " + RenderImage {IMG} at (294,179) size 5x15 + RenderText {#text} at (299,176) size 4x17 + text run at (299,176) width 4: " " RenderInline {BIG} at (0,0) size 156x24 - RenderText {#text} at (303,169) size 156x24 - text run at (303,169) width 156: "the images appear." - RenderText {#text} at (459,174) size 4x17 - text run at (459,174) width 4: " " - RenderImage {IMG} at (463,139) size 27x90 + RenderText {#text} at (303,171) size 156x24 + text run at (303,171) width 156: "the images appear." + RenderText {#text} at (459,176) size 4x17 + text run at (459,176) width 4: " " + RenderImage {IMG} at (463,141) size 27x90 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,2053) size 769x35 - RenderText {#text} at (0,0) size 733x34 + RenderBlock {P} at (0,2083) size 769x37 + RenderText {#text} at (0,0) size 733x35 text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" - text run at (0,17) width 173: "element is an image or not. " - text run at (173,17) width 555: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - RenderBlock {P} at (0,2103) size 769x201 + text run at (0,18) width 173: "element is an image or not. " + text run at (173,18) width 555: "Each fragment of text has been SPANned appropriately in order to cause this to happen." + RenderBlock {P} at (0,2135) size 769x203 RenderInline {SPAN} at (0,0) size 95x17 RenderText {#text} at (0,0) size 95x17 text run at (0,0) width 95: "This paragraph" @@ -287,8 +287,8 @@ layer at (0,0) size 785x4340 RenderText {#text} at (102,0) size 4x17 text run at (102,0) width 4: " " RenderInline {SPAN} at (0,0) size 357x45 - RenderText {#text} at (106,0) size 357x45 - text run at (106,0) width 357: "contains many images" + RenderText {#text} at (106,1) size 357x45 + text run at (106,1) width 357: "contains many images" RenderText {#text} at (463,0) size 4x17 text run at (463,0) width 4: " " RenderImage {IMG} at (467,0) size 3x10 @@ -310,318 +310,318 @@ layer at (0,0) size 785x4340 RenderImage {IMG} at (690,0) size 3x10 RenderText {#text} at (693,0) size 4x17 text run at (693,0) width 4: " " - RenderInline {BIG} at (0,0) size 728x69 - RenderText {#text} at (697,0) size 728x69 + RenderInline {BIG} at (0,0) size 728x71 + RenderText {#text} at (697,0) size 728x71 text run at (697,0) width 31: "and" - text run at (0,45) width 57: "widths" - RenderText {#text} at (57,45) size 4x17 - text run at (57,45) width 4: " " - RenderImage {IMG} at (61,45) size 6x20 - RenderText {#text} at (67,45) size 4x17 - text run at (67,45) width 4: " " + text run at (0,47) width 57: "widths" + RenderText {#text} at (57,47) size 4x17 + text run at (57,47) width 4: " " + RenderImage {IMG} at (61,47) size 6x20 + RenderText {#text} at (67,47) size 4x17 + text run at (67,47) width 4: " " RenderInline {SPAN} at (0,0) size 75x17 - RenderText {#text} at (71,45) size 75x17 - text run at (71,45) width 75: "all of which" - RenderText {#text} at (146,45) size 4x17 - text run at (146,45) width 4: " " - RenderImage {IMG} at (150,45) size 20x65 - RenderText {#text} at (170,45) size 4x17 - text run at (170,45) width 4: " " + RenderText {#text} at (71,47) size 75x17 + text run at (71,47) width 75: "all of which" + RenderText {#text} at (146,47) size 4x17 + text run at (146,47) width 4: " " + RenderImage {IMG} at (150,47) size 20x65 + RenderText {#text} at (170,47) size 4x17 + text run at (170,47) width 4: " " RenderInline {SPAN} at (0,0) size 111x17 - RenderText {#text} at (174,45) size 111x17 - text run at (174,45) width 111: "should be aligned" - RenderText {#text} at (285,45) size 4x17 - text run at (285,45) width 4: " " - RenderImage {IMG} at (289,45) size 11x35 - RenderText {#text} at (300,45) size 4x17 - text run at (300,45) width 4: " " + RenderText {#text} at (174,47) size 111x17 + text run at (174,47) width 111: "should be aligned" + RenderText {#text} at (285,47) size 4x17 + text run at (285,47) width 4: " " + RenderImage {IMG} at (289,47) size 11x35 + RenderText {#text} at (300,47) size 4x17 + text run at (300,47) width 4: " " RenderInline {SPAN} at (0,0) size 188x36 - RenderText {#text} at (304,45) size 188x36 - text run at (304,45) width 188: "with the top of" - RenderText {#text} at (492,45) size 4x17 - text run at (492,45) width 4: " " - RenderImage {IMG} at (496,45) size 15x50 - RenderText {#text} at (511,45) size 4x17 - text run at (511,45) width 4: " " + RenderText {#text} at (304,47) size 188x36 + text run at (304,47) width 188: "with the top of" + RenderText {#text} at (492,47) size 4x17 + text run at (492,47) width 4: " " + RenderImage {IMG} at (496,47) size 15x50 + RenderText {#text} at (511,47) size 4x17 + text run at (511,47) width 4: " " RenderInline {SPAN} at (0,0) size 128x17 - RenderText {#text} at (515,45) size 128x17 - text run at (515,45) width 128: "the tallest element in" - RenderText {#text} at (643,45) size 4x17 - text run at (643,45) width 4: " " - RenderImage {IMG} at (647,45) size 5x15 - RenderText {#text} at (652,45) size 4x17 - text run at (652,45) width 4: " " + RenderText {#text} at (515,47) size 128x17 + text run at (515,47) width 128: "the tallest element in" + RenderText {#text} at (643,47) size 4x17 + text run at (643,47) width 4: " " + RenderImage {IMG} at (647,47) size 5x15 + RenderText {#text} at (652,47) size 4x17 + text run at (652,47) width 4: " " RenderInline {BIG} at (0,0) size 744x89 - RenderText {#text} at (656,45) size 744x89 - text run at (656,45) width 88: "whichever" - text run at (0,110) width 208: "line the elements appear." - RenderText {#text} at (208,110) size 4x17 - text run at (208,110) width 4: " " - RenderImage {IMG} at (212,110) size 27x90 + RenderText {#text} at (656,47) size 744x89 + text run at (656,47) width 88: "whichever" + text run at (0,112) width 208: "line the elements appear." + RenderText {#text} at (208,112) size 4x17 + text run at (208,112) width 4: " " + RenderImage {IMG} at (212,112) size 27x90 RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,2319) size 769x2005 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x2003 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,2353) size 769x2039 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x2037 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x1978 - RenderTableCell {TD} at (0,1001) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 767x2011 + RenderTableCell {TD} at (0,1018) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x18 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 755x1978 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x74 + RenderTableCell {TD} at (12,26) size 755x2011 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x76 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (15,40) size 126x17 text run at (15,40) width 126: "The first four words" - RenderText {#text} at (141,36) size 731x38 + RenderText {#text} at (141,36) size 731x39 text run at (141,36) width 284: " in this sentence should be subscript-aligned. " text run at (425,36) width 306: "The font size of the superscripted text should not" - text run at (0,57) width 273: "be different from that of the parent element." - RenderBlock {P} at (4,94) size 747x70 + text run at (0,58) width 273: "be different from that of the parent element." + RenderBlock {P} at (4,96) size 747x72 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (15,30) size 126x17 text run at (15,30) width 126: "The first four words" - RenderText {#text} at (141,36) size 731x34 + RenderText {#text} at (141,36) size 731x35 text run at (141,36) width 296: " in this sentence should be superscript-aligned. " text run at (437,36) width 294: "The font size of the subscripted text should not" - text run at (0,53) width 273: "be different from that of the parent element." - RenderBlock {P} at (4,180) size 747x70 + text run at (0,54) width 273: "be different from that of the parent element." + RenderBlock {P} at (4,184) size 747x72 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (15,0) size 126x17 text run at (15,0) width 126: "The first four words" - RenderText {#text} at (141,36) size 712x34 + RenderText {#text} at (141,36) size 712x35 text run at (141,36) width 571: " in this sentence should be top-aligned, which will align their tops with the top of the tallest" - text run at (0,53) width 320: "element in the line (probably the orange rectangle)." - RenderBlock {P} at (4,266) size 747x129 + text run at (0,54) width 320: "element in the line (probably the orange rectangle)." + RenderBlock {P} at (4,272) size 747x132 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,36) size 4x17 text run at (15,36) width 4: " " - RenderInline {SPAN} at (0,0) size 701x108 + RenderInline {SPAN} at (0,0) size 701x110 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (19,21) size 126x17 text run at (19,21) width 126: "The first four words" - RenderText {#text} at (145,21) size 701x108 + RenderText {#text} at (145,21) size 701x110 text run at (145,21) width 556: " in this sentence should be text-top-aligned," - text run at (0,57) width 698: "which should align their tops with the top of the tallest" - text run at (0,93) width 192: "text in the line." + text run at (0,58) width 698: "which should align their tops with the top of the tallest" + text run at (0,95) width 192: "text in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,411) size 747x67 + RenderBlock {P} at (4,420) size 747x68 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,15) size 739x52 text run at (15,15) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" text run at (0,50) width 310: "defined as the text baseline plus half the x-height." - RenderBlock {P} at (4,494) size 747x122 + RenderBlock {P} at (4,504) size 747x124 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,15) size 4x17 text run at (15,15) width 4: " " - RenderInline {SPAN} at (0,0) size 733x122 + RenderInline {SPAN} at (0,0) size 733x123 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 126x17 - RenderText {#text} at (19,33) size 126x17 - text run at (19,33) width 126: "The first four words" - RenderText {#text} at (145,0) size 733x122 + RenderText {#text} at (19,32) size 126x17 + text run at (19,32) width 126: "The first four words" + RenderText {#text} at (145,0) size 733x123 text run at (145,0) width 544: " in this sentence should be 12pt in size and" text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" - text run at (0,86) width 517: "bottom of the lowest element in the line." + text run at (0,87) width 517: "bottom of the lowest element in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,632) size 747x158 + RenderBlock {P} at (4,644) size 747x161 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,15) size 4x17 text run at (15,15) width 4: " " - RenderInline {SPAN} at (0,0) size 745x158 + RenderInline {SPAN} at (0,0) size 745x160 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 293x17 - RenderText {#text} at (19,19) size 293x17 - text run at (19,19) width 293: "The first eight words (\"eight\" has a descender)" - RenderText {#text} at (312,0) size 745x158 + RenderText {#text} at (19,18) size 293x17 + text run at (19,18) width 293: "The first eight words (\"eight\" has a descender)" + RenderText {#text} at (312,0) size 745x160 text run at (312,0) width 433: " in this sentence should be 12pt in" text run at (0,50) width 692: "size and text-bottom-aligned, which should align their" - text run at (0,86) width 671: "bottom with the bottom of the lowest text (including" - text run at (0,122) width 294: "descenders) in the line." + text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" + text run at (0,124) width 294: "descenders) in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,806) size 747x129 + RenderBlock {P} at (4,821) size 747x132 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,36) size 4x17 text run at (15,36) width 4: " " - RenderInline {SPAN} at (0,0) size 712x108 + RenderInline {SPAN} at (0,0) size 712x110 RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 126x17 RenderText {#text} at (19,36) size 126x17 text run at (19,36) width 126: "The first four words" - RenderText {#text} at (145,21) size 712x108 + RenderText {#text} at (145,21) size 712x110 text run at (145,21) width 544: " in this sentence should be 12pt in size and" - text run at (0,57) width 712: "baseline-aligned, which should align their baseline with" - text run at (0,93) width 569: "the baseline of the rest of the text in the line." + text run at (0,58) width 712: "baseline-aligned, which should align their baseline with" + text run at (0,95) width 569: "the baseline of the rest of the text in the line." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,951) size 747x70 + RenderBlock {P} at (4,969) size 747x72 RenderImage {IMG} at (0,0) size 15x50 RenderInline {SPAN} at (0,0) size 96x14 RenderText {#text} at (15,31) size 96x14 text run at (15,31) width 96: "The first four words" - RenderText {#text} at (111,36) size 700x34 + RenderText {#text} at (111,36) size 700x35 text run at (111,36) width 589: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-" - text run at (0,53) width 430: "aligned, which should raise them 8px relative to the natural baseline." - RenderBlock {P} at (4,1037) size 747x34 - RenderText {#text} at (0,0) size 742x34 + text run at (0,54) width 430: "aligned, which should raise them 8px relative to the natural baseline." + RenderBlock {P} at (4,1057) size 747x36 + RenderText {#text} at (0,0) size 742x35 text run at (0,0) width 742: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" - text run at (0,17) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." - RenderBlock {P} at (4,1089) size 747x321 - RenderText {#text} at (0,25) size 120x21 - text run at (0,25) width 120: "This paragraph " - RenderImage {IMG} at (120,25) size 9x30 - RenderText {#text} at (129,25) size 5x21 - text run at (129,25) width 5: " " + text run at (0,18) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." + RenderBlock {P} at (4,1111) size 747x324 + RenderText {#text} at (0,26) size 120x21 + text run at (0,26) width 120: "This paragraph " + RenderImage {IMG} at (120,26) size 9x30 + RenderText {#text} at (129,26) size 5x21 + text run at (129,26) width 5: " " RenderInline {SPAN} at (0,0) size 422x52 - RenderText {#text} at (134,0) size 422x52 - text run at (134,0) width 422: "contains many images" - RenderText {#text} at (556,25) size 5x21 - text run at (556,25) width 5: " " - RenderImage {IMG} at (561,25) size 15x50 - RenderText {#text} at (576,25) size 5x21 - text run at (576,25) width 5: " " + RenderText {#text} at (134,1) size 422x52 + text run at (134,1) width 422: "contains many images" + RenderText {#text} at (556,26) size 5x21 + text run at (556,26) width 5: " " + RenderImage {IMG} at (561,26) size 15x50 + RenderText {#text} at (576,26) size 5x21 + text run at (576,26) width 5: " " RenderInline {BIG} at (0,0) size 156x24 - RenderText {#text} at (581,23) size 156x24 - text run at (581,23) width 156: "of varying heights" - RenderText {#text} at (737,25) size 5x21 - text run at (737,25) width 5: " " - RenderImage {IMG} at (742,25) size 3x10 + RenderText {#text} at (581,24) size 156x24 + text run at (581,24) width 156: "of varying heights" + RenderText {#text} at (737,26) size 5x21 + text run at (737,26) width 5: " " + RenderImage {IMG} at (742,26) size 3x10 RenderText {#text} at (0,0) size 0x0 RenderInline {SMALL} at (0,0) size 69x17 - RenderText {#text} at (0,123) size 69x17 - text run at (0,123) width 69: "and widths" - RenderText {#text} at (69,120) size 5x21 - text run at (69,120) width 5: " " - RenderImage {IMG} at (74,120) size 6x20 - RenderText {#text} at (80,120) size 101x21 - text run at (80,120) width 101: " all of which " - RenderImage {IMG} at (181,120) size 20x65 - RenderText {#text} at (201,120) size 5x21 - text run at (201,120) width 5: " " + RenderText {#text} at (0,125) size 69x17 + text run at (0,125) width 69: "and widths" + RenderText {#text} at (69,122) size 5x21 + text run at (69,122) width 5: " " + RenderImage {IMG} at (74,122) size 6x20 + RenderText {#text} at (80,122) size 101x21 + text run at (80,122) width 101: " all of which " + RenderImage {IMG} at (181,122) size 20x65 + RenderText {#text} at (201,122) size 5x21 + text run at (201,122) width 5: " " RenderInline {SPAN} at (0,0) size 262x41 - RenderText {#text} at (206,104) size 262x41 - text run at (206,104) width 262: "should be aligned" - RenderText {#text} at (468,120) size 5x21 - text run at (468,120) width 5: " " - RenderImage {IMG} at (473,120) size 11x35 - RenderText {#text} at (484,120) size 123x21 - text run at (484,120) width 123: " with the top of " - RenderImage {IMG} at (607,120) size 9x30 - RenderText {#text} at (616,120) size 5x21 - text run at (616,120) width 5: " " - RenderInline {SPAN} at (0,0) size 733x141 - RenderText {#text} at (621,112) size 19x31 - text run at (621,112) width 19: "a " - RenderInline {SPAN} at (0,0) size 733x187 - RenderText {#text} at (640,75) size 733x187 - text run at (640,75) width 93: "14-" - text run at (0,185) width 143: "point" - RenderText {#text} at (143,222) size 144x31 - text run at (143,222) width 144: " text element" - RenderText {#text} at (287,230) size 5x21 - text run at (287,230) width 5: " " - RenderImage {IMG} at (292,230) size 15x50 - RenderText {#text} at (307,230) size 5x21 - text run at (307,230) width 5: " " + RenderText {#text} at (206,106) size 262x41 + text run at (206,106) width 262: "should be aligned" + RenderText {#text} at (468,122) size 5x21 + text run at (468,122) width 5: " " + RenderImage {IMG} at (473,122) size 11x35 + RenderText {#text} at (484,122) size 123x21 + text run at (484,122) width 123: " with the top of " + RenderImage {IMG} at (607,122) size 9x30 + RenderText {#text} at (616,122) size 5x21 + text run at (616,122) width 5: " " + RenderInline {SPAN} at (0,0) size 733x142 + RenderText {#text} at (621,114) size 19x31 + text run at (621,114) width 19: "a " + RenderInline {SPAN} at (0,0) size 733x188 + RenderText {#text} at (640,77) size 733x188 + text run at (640,77) width 93: "14-" + text run at (0,188) width 143: "point" + RenderText {#text} at (143,225) size 144x31 + text run at (143,225) width 144: " text element" + RenderText {#text} at (287,233) size 5x21 + text run at (287,233) width 5: " " + RenderImage {IMG} at (292,233) size 15x50 + RenderText {#text} at (307,233) size 5x21 + text run at (307,233) width 5: " " RenderInline {SMALL} at (0,0) size 189x17 - RenderText {#text} at (312,233) size 189x17 - text run at (312,233) width 189: "regardless of the line in which" - RenderText {#text} at (501,230) size 5x21 - text run at (501,230) width 5: " " - RenderImage {IMG} at (506,230) size 5x15 - RenderText {#text} at (511,230) size 5x21 - text run at (511,230) width 5: " " + RenderText {#text} at (312,236) size 189x17 + text run at (312,236) width 189: "regardless of the line in which" + RenderText {#text} at (501,233) size 5x21 + text run at (501,233) width 5: " " + RenderImage {IMG} at (506,233) size 5x15 + RenderText {#text} at (511,233) size 5x21 + text run at (511,233) width 5: " " RenderInline {BIG} at (0,0) size 156x24 - RenderText {#text} at (516,228) size 156x24 - text run at (516,228) width 156: "the images appear." - RenderText {#text} at (672,230) size 5x21 - text run at (672,230) width 5: " " - RenderImage {IMG} at (677,230) size 27x90 + RenderText {#text} at (516,231) size 156x24 + text run at (516,231) width 156: "the images appear." + RenderText {#text} at (672,233) size 5x21 + text run at (672,233) width 5: " " + RenderImage {IMG} at (677,233) size 27x90 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,1428) size 747x35 - RenderText {#text} at (0,0) size 730x34 + RenderBlock {P} at (4,1453) size 747x37 + RenderText {#text} at (0,0) size 730x35 text run at (0,0) width 730: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should" - text run at (0,17) width 381: "be aligned with the text baseline (which is the default value)." - RenderBlock {P} at (4,1478) size 747x230 - RenderText {#text} at (0,22) size 99x17 - text run at (0,22) width 99: "This paragraph " - RenderImage {IMG} at (99,17) size 9x30 - RenderText {#text} at (108,22) size 4x17 - text run at (108,22) width 4: " " + text run at (0,18) width 381: "be aligned with the text baseline (which is the default value)." + RenderBlock {P} at (4,1505) size 747x232 + RenderText {#text} at (0,23) size 99x17 + text run at (0,23) width 99: "This paragraph " + RenderImage {IMG} at (99,18) size 9x30 + RenderText {#text} at (108,23) size 4x17 + text run at (108,23) width 4: " " RenderInline {SPAN} at (0,0) size 357x45 - RenderText {#text} at (112,0) size 357x45 - text run at (112,0) width 357: "contains many images" - RenderText {#text} at (469,22) size 4x17 - text run at (469,22) width 4: " " - RenderImage {IMG} at (473,7) size 15x50 - RenderText {#text} at (488,22) size 122x17 - text run at (488,22) width 122: " of varying heights " - RenderImage {IMG} at (610,27) size 3x10 - RenderText {#text} at (613,22) size 4x17 - text run at (613,22) width 4: " " + RenderText {#text} at (112,1) size 357x45 + text run at (112,1) width 357: "contains many images" + RenderText {#text} at (469,23) size 4x17 + text run at (469,23) width 4: " " + RenderImage {IMG} at (473,8) size 15x50 + RenderText {#text} at (488,23) size 122x17 + text run at (488,23) width 122: " of varying heights " + RenderImage {IMG} at (610,28) size 3x10 + RenderText {#text} at (613,23) size 4x17 + text run at (613,23) width 4: " " RenderInline {SMALL} at (0,0) size 69x17 - RenderText {#text} at (617,22) size 69x17 - text run at (617,22) width 69: "and widths" - RenderText {#text} at (686,22) size 4x17 - text run at (686,22) width 4: " " - RenderImage {IMG} at (690,22) size 6x20 - RenderText {#text} at (696,22) size 732x91 - text run at (696,22) width 36: " all of" - text run at (0,96) width 43: "which " - RenderImage {IMG} at (43,74) size 20x65 - RenderText {#text} at (63,96) size 119x17 - text run at (63,96) width 119: " should be aligned " - RenderImage {IMG} at (182,89) size 11x35 - RenderText {#text} at (193,96) size 4x17 - text run at (193,96) width 4: " " + RenderText {#text} at (617,23) size 69x17 + text run at (617,23) width 69: "and widths" + RenderText {#text} at (686,23) size 4x17 + text run at (686,23) width 4: " " + RenderImage {IMG} at (690,23) size 6x20 + RenderText {#text} at (696,23) size 732x92 + text run at (696,23) width 36: " all of" + text run at (0,98) width 43: "which " + RenderImage {IMG} at (43,76) size 20x65 + RenderText {#text} at (63,98) size 119x17 + text run at (63,98) width 119: " should be aligned " + RenderImage {IMG} at (182,91) size 11x35 + RenderText {#text} at (193,98) size 4x17 + text run at (193,98) width 4: " " RenderInline {SPAN} at (0,0) size 236x36 - RenderText {#text} at (197,81) size 236x36 - text run at (197,81) width 236: "with the middle of" - RenderText {#text} at (433,96) size 4x17 - text run at (433,96) width 4: " " - RenderImage {IMG} at (437,81) size 15x50 - RenderText {#text} at (452,96) size 4x17 - text run at (452,96) width 4: " " + RenderText {#text} at (197,83) size 236x36 + text run at (197,83) width 236: "with the middle of" + RenderText {#text} at (433,98) size 4x17 + text run at (433,98) width 4: " " + RenderImage {IMG} at (437,83) size 15x50 + RenderText {#text} at (452,98) size 4x17 + text run at (452,98) width 4: " " RenderInline {SPAN} at (0,0) size 720x104 - RenderText {#text} at (456,89) size 17x26 - text run at (456,89) width 17: "a " + RenderText {#text} at (456,91) size 17x26 + text run at (456,91) width 17: "a " RenderInline {SPAN} at (0,0) size 204x66 - RenderText {#text} at (473,57) size 204x66 - text run at (473,57) width 204: "14-point" - RenderText {#text} at (677,89) size 720x104 - text run at (677,89) width 43: " text" - text run at (0,167) width 78: "element" - RenderText {#text} at (78,174) size 4x17 - text run at (78,174) width 4: " " - RenderImage {IMG} at (82,159) size 15x50 - RenderText {#text} at (97,174) size 4x17 - text run at (97,174) width 4: " " + RenderText {#text} at (473,59) size 204x66 + text run at (473,59) width 204: "14-point" + RenderText {#text} at (677,91) size 720x104 + text run at (677,91) width 43: " text" + text run at (0,169) width 78: "element" + RenderText {#text} at (78,176) size 4x17 + text run at (78,176) width 4: " " + RenderImage {IMG} at (82,161) size 15x50 + RenderText {#text} at (97,176) size 4x17 + text run at (97,176) width 4: " " RenderInline {SMALL} at (0,0) size 189x17 - RenderText {#text} at (101,174) size 189x17 - text run at (101,174) width 189: "regardless of the line in which" - RenderText {#text} at (290,174) size 4x17 - text run at (290,174) width 4: " " - RenderImage {IMG} at (294,177) size 5x15 - RenderText {#text} at (299,174) size 4x17 - text run at (299,174) width 4: " " + RenderText {#text} at (101,176) size 189x17 + text run at (101,176) width 189: "regardless of the line in which" + RenderText {#text} at (290,176) size 4x17 + text run at (290,176) width 4: " " + RenderImage {IMG} at (294,179) size 5x15 + RenderText {#text} at (299,176) size 4x17 + text run at (299,176) width 4: " " RenderInline {BIG} at (0,0) size 156x24 - RenderText {#text} at (303,169) size 156x24 - text run at (303,169) width 156: "the images appear." - RenderText {#text} at (459,174) size 4x17 - text run at (459,174) width 4: " " - RenderImage {IMG} at (463,139) size 27x90 + RenderText {#text} at (303,171) size 156x24 + text run at (303,171) width 156: "the images appear." + RenderText {#text} at (459,176) size 4x17 + text run at (459,176) width 4: " " + RenderImage {IMG} at (463,141) size 27x90 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,1723) size 747x35 - RenderText {#text} at (0,0) size 733x34 + RenderBlock {P} at (4,1752) size 747x37 + RenderText {#text} at (0,0) size 733x35 text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" - text run at (0,17) width 173: "element is an image or not. " - text run at (173,17) width 555: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - RenderBlock {P} at (4,1773) size 747x201 + text run at (0,18) width 173: "element is an image or not. " + text run at (173,18) width 555: "Each fragment of text has been SPANned appropriately in order to cause this to happen." + RenderBlock {P} at (4,1804) size 747x203 RenderInline {SPAN} at (0,0) size 95x17 RenderText {#text} at (0,0) size 95x17 text run at (0,0) width 95: "This paragraph" @@ -631,8 +631,8 @@ layer at (0,0) size 785x4340 RenderText {#text} at (102,0) size 4x17 text run at (102,0) width 4: " " RenderInline {SPAN} at (0,0) size 357x45 - RenderText {#text} at (106,0) size 357x45 - text run at (106,0) width 357: "contains many images" + RenderText {#text} at (106,1) size 357x45 + text run at (106,1) width 357: "contains many images" RenderText {#text} at (463,0) size 4x17 text run at (463,0) width 4: " " RenderImage {IMG} at (467,0) size 3x10 @@ -654,52 +654,52 @@ layer at (0,0) size 785x4340 RenderImage {IMG} at (690,0) size 3x10 RenderText {#text} at (693,0) size 4x17 text run at (693,0) width 4: " " - RenderInline {BIG} at (0,0) size 728x69 - RenderText {#text} at (697,0) size 728x69 + RenderInline {BIG} at (0,0) size 728x71 + RenderText {#text} at (697,0) size 728x71 text run at (697,0) width 31: "and" - text run at (0,45) width 57: "widths" - RenderText {#text} at (57,45) size 4x17 - text run at (57,45) width 4: " " - RenderImage {IMG} at (61,45) size 6x20 - RenderText {#text} at (67,45) size 4x17 - text run at (67,45) width 4: " " + text run at (0,47) width 57: "widths" + RenderText {#text} at (57,47) size 4x17 + text run at (57,47) width 4: " " + RenderImage {IMG} at (61,47) size 6x20 + RenderText {#text} at (67,47) size 4x17 + text run at (67,47) width 4: " " RenderInline {SPAN} at (0,0) size 75x17 - RenderText {#text} at (71,45) size 75x17 - text run at (71,45) width 75: "all of which" - RenderText {#text} at (146,45) size 4x17 - text run at (146,45) width 4: " " - RenderImage {IMG} at (150,45) size 20x65 - RenderText {#text} at (170,45) size 4x17 - text run at (170,45) width 4: " " + RenderText {#text} at (71,47) size 75x17 + text run at (71,47) width 75: "all of which" + RenderText {#text} at (146,47) size 4x17 + text run at (146,47) width 4: " " + RenderImage {IMG} at (150,47) size 20x65 + RenderText {#text} at (170,47) size 4x17 + text run at (170,47) width 4: " " RenderInline {SPAN} at (0,0) size 111x17 - RenderText {#text} at (174,45) size 111x17 - text run at (174,45) width 111: "should be aligned" - RenderText {#text} at (285,45) size 4x17 - text run at (285,45) width 4: " " - RenderImage {IMG} at (289,45) size 11x35 - RenderText {#text} at (300,45) size 4x17 - text run at (300,45) width 4: " " + RenderText {#text} at (174,47) size 111x17 + text run at (174,47) width 111: "should be aligned" + RenderText {#text} at (285,47) size 4x17 + text run at (285,47) width 4: " " + RenderImage {IMG} at (289,47) size 11x35 + RenderText {#text} at (300,47) size 4x17 + text run at (300,47) width 4: " " RenderInline {SPAN} at (0,0) size 188x36 - RenderText {#text} at (304,45) size 188x36 - text run at (304,45) width 188: "with the top of" - RenderText {#text} at (492,45) size 4x17 - text run at (492,45) width 4: " " - RenderImage {IMG} at (496,45) size 15x50 - RenderText {#text} at (511,45) size 4x17 - text run at (511,45) width 4: " " + RenderText {#text} at (304,47) size 188x36 + text run at (304,47) width 188: "with the top of" + RenderText {#text} at (492,47) size 4x17 + text run at (492,47) width 4: " " + RenderImage {IMG} at (496,47) size 15x50 + RenderText {#text} at (511,47) size 4x17 + text run at (511,47) width 4: " " RenderInline {SPAN} at (0,0) size 128x17 - RenderText {#text} at (515,45) size 128x17 - text run at (515,45) width 128: "the tallest element in" - RenderText {#text} at (643,45) size 4x17 - text run at (643,45) width 4: " " - RenderImage {IMG} at (647,45) size 5x15 - RenderText {#text} at (652,45) size 4x17 - text run at (652,45) width 4: " " + RenderText {#text} at (515,47) size 128x17 + text run at (515,47) width 128: "the tallest element in" + RenderText {#text} at (643,47) size 4x17 + text run at (643,47) width 4: " " + RenderImage {IMG} at (647,47) size 5x15 + RenderText {#text} at (652,47) size 4x17 + text run at (652,47) width 4: " " RenderInline {BIG} at (0,0) size 744x89 - RenderText {#text} at (656,45) size 744x89 - text run at (656,45) width 88: "whichever" - text run at (0,110) width 208: "line the elements appear." - RenderText {#text} at (208,110) size 4x17 - text run at (208,110) width 4: " " - RenderImage {IMG} at (212,110) size 27x90 + RenderText {#text} at (656,47) size 744x89 + text run at (656,47) width 88: "whichever" + text run at (0,112) width 208: "line the elements appear." + RenderText {#text} at (208,112) size 4x17 + text run at (208,112) width 4: " " + RenderImage {IMG} at (212,112) size 27x90 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.png b/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.png index b6bde37cf0eb..2ebd93011d50 100644 Binary files a/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.png and b/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.txt b/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.txt index ec740fb29268..0b621903a0c7 100644 --- a/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.txt +++ b/LayoutTests/platform/gtk/css1/text_properties/word_spacing-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x892 +layer at (0,0) size 785x914 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x892 - RenderBlock {HTML} at (0,0) size 785x892 - RenderBody {BODY} at (8,8) size 769x876 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x914 + RenderBlock {HTML} at (0,0) size 785x914 + RenderBody {BODY} at (8,8) size 769x898 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x165 + RenderBlock {PRE} at (0,34) size 769x165 RenderText {#text} at (0,0) size 232x165 text run at (0,0) width 216: ".one {word-spacing: 0.3in;}" text run at (0,15) width 216: ".two {word-spacing: 0.5cm;}" @@ -19,81 +19,81 @@ layer at (0,0) size 785x892 text run at (0,120) width 232: ".nine {word-spacing: normal;}" text run at (0,135) width 224: ".ten {word-spacing: -0.2em;}" text run at (0,150) width 0: " " - RenderBlock {HR} at (0,211) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,229) size 769x17 + RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,230) size 769x18 RenderText {#text} at (0,0) size 709x17 text run at (0,0) width 709: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,262) size 769x17 + RenderBlock {P} at (0,264) size 769x18 RenderText {#text} at (0,0) size 610x17 text run at (0,0) width 610: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,295) size 769x17 + RenderBlock {P} at (0,298) size 769x18 RenderText {#text} at (0,0) size 610x17 text run at (0,0) width 610: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,328) size 769x17 + RenderBlock {P} at (0,332) size 769x18 RenderText {#text} at (0,0) size 461x17 text run at (0,0) width 461: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,361) size 769x17 + RenderBlock {P} at (0,366) size 769x18 RenderText {#text} at (0,0) size 461x17 text run at (0,0) width 461: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,394) size 769x17 + RenderBlock {P} at (0,400) size 769x18 RenderText {#text} at (0,0) size 581x17 text run at (0,0) width 581: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,427) size 769x17 + RenderBlock {P} at (0,434) size 769x18 RenderText {#text} at (0,0) size 501x17 text run at (0,0) width 501: "This words in this sentence should have extra space between them." - RenderBlock {P} at (0,460) size 769x34 + RenderBlock {P} at (0,468) size 769x36 RenderText {#text} at (0,0) size 751x17 text run at (0,0) width 751: "This words in this sentence should have extra space between them, but the last few words in the sentence" RenderInline {SPAN} at (0,0) size 176x17 - RenderText {#text} at (0,17) size 176x17 - text run at (0,17) width 176: "should have normal spacing" - RenderText {#text} at (176,17) size 4x17 - text run at (176,17) width 4: "." - RenderBlock {P} at (0,510) size 769x17 + RenderText {#text} at (0,18) size 176x17 + text run at (0,18) width 176: "should have normal spacing" + RenderText {#text} at (176,18) size 4x17 + text run at (176,18) width 4: "." + RenderBlock {P} at (0,520) size 769x18 RenderText {#text} at (0,0) size 704x17 text run at (0,0) width 704: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." - RenderTable {TABLE} at (0,543) size 769x333 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x331 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,554) size 769x344 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x342 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x306 - RenderTableCell {TD} at (0,165) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x306 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableRow {TR} at (0,26) size 767x316 + RenderTableCell {TD} at (0,171) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x316 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 709x17 text run at (0,0) width 709: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,37) size 747x17 + RenderBlock {P} at (4,38) size 747x18 RenderText {#text} at (0,0) size 610x17 text run at (0,0) width 610: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,70) size 747x17 + RenderBlock {P} at (4,72) size 747x18 RenderText {#text} at (0,0) size 610x17 text run at (0,0) width 610: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,103) size 747x17 + RenderBlock {P} at (4,106) size 747x18 RenderText {#text} at (0,0) size 461x17 text run at (0,0) width 461: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,136) size 747x17 + RenderBlock {P} at (4,140) size 747x18 RenderText {#text} at (0,0) size 461x17 text run at (0,0) width 461: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,169) size 747x17 + RenderBlock {P} at (4,174) size 747x18 RenderText {#text} at (0,0) size 581x17 text run at (0,0) width 581: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,202) size 747x17 + RenderBlock {P} at (4,208) size 747x18 RenderText {#text} at (0,0) size 501x17 text run at (0,0) width 501: "This words in this sentence should have extra space between them." - RenderBlock {P} at (4,235) size 747x34 - RenderText {#text} at (0,0) size 688x34 + RenderBlock {P} at (4,242) size 747x36 + RenderText {#text} at (0,0) size 688x35 text run at (0,0) width 688: "This words in this sentence should have extra space between them, but the last few words in the" - text run at (0,17) width 63: "sentence " + text run at (0,18) width 63: "sentence " RenderInline {SPAN} at (0,0) size 176x17 - RenderText {#text} at (63,17) size 176x17 - text run at (63,17) width 176: "should have normal spacing" - RenderText {#text} at (239,17) size 4x17 - text run at (239,17) width 4: "." - RenderBlock {P} at (4,285) size 747x17 + RenderText {#text} at (63,18) size 176x17 + text run at (63,18) width 176: "should have normal spacing" + RenderText {#text} at (239,18) size 4x17 + text run at (239,18) width 4: "." + RenderBlock {P} at (4,294) size 747x18 RenderText {#text} at (0,0) size 704x17 text run at (0,0) width 704: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." diff --git a/LayoutTests/platform/gtk/css1/units/color_units-expected.png b/LayoutTests/platform/gtk/css1/units/color_units-expected.png index 2f541c99f6f9..3b74bdf81586 100644 Binary files a/LayoutTests/platform/gtk/css1/units/color_units-expected.png and b/LayoutTests/platform/gtk/css1/units/color_units-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/units/color_units-expected.txt b/LayoutTests/platform/gtk/css1/units/color_units-expected.txt index 1df6cfdd0167..a4bef1be8501 100644 --- a/LayoutTests/platform/gtk/css1/units/color_units-expected.txt +++ b/LayoutTests/platform/gtk/css1/units/color_units-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1683 +layer at (0,0) size 785x1717 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1683 - RenderBlock {HTML} at (0,0) size 785x1683 - RenderBody {BODY} at (8,8) size 769x1667 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1717 + RenderBlock {HTML} at (0,0) size 785x1717 + RenderBody {BODY} at (8,8) size 769x1701 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x180 + RenderBlock {PRE} at (0,34) size 769x180 RenderText {#text} at (0,0) size 288x180 text run at (0,0) width 160: "BODY {color: black;}" text run at (0,15) width 152: ".one {color: #080;}" @@ -20,29 +20,29 @@ layer at (0,0) size 785x1683 text run at (0,135) width 240: ".nine {color: rgb(0,128,255);}" text run at (0,150) width 264: ".ten {color: rgb(50%,-500%,60%);}" text run at (0,165) width 264: ".eleven {color: rgb(50%,0%,60%);}" - RenderBlock {HR} at (0,226) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,244) size 769x17 + RenderBlock {HR} at (0,227) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,245) size 769x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "This sentence should be black." - RenderBlock {P} at (0,277) size 769x17 [color=#008800] + RenderBlock {P} at (0,279) size 769x18 [color=#008800] RenderText {#text} at (0,0) size 507x17 text run at (0,0) width 507: "This sentence should be green, although slightly different from those that follow." - RenderBlock {P} at (0,310) size 769x17 [color=#008000] + RenderBlock {P} at (0,313) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,343) size 769x17 [color=#008000] + RenderBlock {P} at (0,347) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,376) size 769x17 [color=#008000] + RenderBlock {P} at (0,381) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,409) size 769x17 [color=#008000] + RenderBlock {P} at (0,415) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,442) size 769x17 [color=#008000] + RenderBlock {P} at (0,449) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,475) size 769x18 + RenderBlock {P} at (0,483) size 769x18 RenderText {#text} at (0,0) size 407x17 text run at (0,0) width 407: "This sentence should be black, because the value given for class " RenderInline {CODE} at (0,0) size 48x15 @@ -50,26 +50,26 @@ layer at (0,0) size 785x1683 text run at (407,3) width 48: ".seven" RenderText {#text} at (455,0) size 65x17 text run at (455,0) width 65: " is invalid." - RenderBlock {P} at (0,509) size 769x34 [color=#0080FF] - RenderText {#text} at (0,0) size 726x34 + RenderBlock {P} at (0,517) size 769x36 [color=#0080FF] + RenderText {#text} at (0,0) size 726x35 text run at (0,0) width 726: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (0,559) size 769x34 [color=#0080FF] - RenderText {#text} at (0,0) size 753x34 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (0,569) size 769x36 [color=#0080FF] + RenderText {#text} at (0,0) size 753x35 text run at (0,0) width 753: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (0,609) size 769x34 [color=#800099] - RenderText {#text} at (0,0) size 699x34 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (0,621) size 769x36 [color=#800099] + RenderText {#text} at (0,0) size 699x35 text run at (0,0) width 699: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (0,659) size 769x34 [color=#800099] - RenderText {#text} at (0,0) size 726x34 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (0,673) size 769x36 [color=#800099] + RenderText {#text} at (0,0) size 726x35 text run at (0,0) width 726: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (0,709) size 769x17 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (0,725) size 769x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "This sentence should be black." - RenderBlock {P} at (0,742) size 769x18 [color=#008800] + RenderBlock {P} at (0,759) size 769x18 [color=#008800] RenderText {#text} at (0,0) size 399x17 text run at (0,0) width 399: "This sentence should be a slightly different green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -77,7 +77,7 @@ layer at (0,0) size 785x1683 text run at (399,3) width 40: "style" RenderText {#text} at (439,0) size 59x17 text run at (439,0) width 59: " attribute." - RenderBlock {P} at (0,776) size 769x18 [color=#008000] + RenderBlock {P} at (0,793) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -85,7 +85,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (0,810) size 769x18 [color=#008000] + RenderBlock {P} at (0,827) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -93,7 +93,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (0,844) size 769x18 [color=#008000] + RenderBlock {P} at (0,861) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -101,7 +101,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (0,878) size 769x18 [color=#008000] + RenderBlock {P} at (0,895) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -109,7 +109,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (0,912) size 769x18 [color=#008000] + RenderBlock {P} at (0,929) size 769x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -117,40 +117,40 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderTable {TABLE} at (0,946) size 769x721 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x719 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,963) size 769x738 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x736 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x694 - RenderTableCell {TD} at (0,359) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x694 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x17 + RenderTableRow {TR} at (0,26) size 767x710 + RenderTableCell {TD} at (0,368) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x710 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "This sentence should be black." - RenderBlock {P} at (4,37) size 747x17 [color=#008800] + RenderBlock {P} at (4,38) size 747x18 [color=#008800] RenderText {#text} at (0,0) size 507x17 text run at (0,0) width 507: "This sentence should be green, although slightly different from those that follow." - RenderBlock {P} at (4,70) size 747x17 [color=#008000] + RenderBlock {P} at (4,72) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,103) size 747x17 [color=#008000] + RenderBlock {P} at (4,106) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,136) size 747x17 [color=#008000] + RenderBlock {P} at (4,140) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,169) size 747x17 [color=#008000] + RenderBlock {P} at (4,174) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,202) size 747x17 [color=#008000] + RenderBlock {P} at (4,208) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (4,235) size 747x18 + RenderBlock {P} at (4,242) size 747x18 RenderText {#text} at (0,0) size 407x17 text run at (0,0) width 407: "This sentence should be black, because the value given for class " RenderInline {CODE} at (0,0) size 48x15 @@ -158,26 +158,26 @@ layer at (0,0) size 785x1683 text run at (407,3) width 48: ".seven" RenderText {#text} at (455,0) size 65x17 text run at (455,0) width 65: " is invalid." - RenderBlock {P} at (4,269) size 747x34 [color=#0080FF] - RenderText {#text} at (0,0) size 726x34 + RenderBlock {P} at (4,276) size 747x36 [color=#0080FF] + RenderText {#text} at (0,0) size 726x35 text run at (0,0) width 726: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (4,319) size 747x34 [color=#0080FF] - RenderText {#text} at (0,0) size 695x34 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (4,328) size 747x36 [color=#0080FF] + RenderText {#text} at (0,0) size 695x35 text run at (0,0) width 695: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the" - text run at (0,17) width 125: "previous paragraph." - RenderBlock {P} at (4,369) size 747x34 [color=#800099] - RenderText {#text} at (0,0) size 699x34 + text run at (0,18) width 125: "previous paragraph." + RenderBlock {P} at (4,380) size 747x36 [color=#800099] + RenderText {#text} at (0,0) size 699x35 text run at (0,0) width 699: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (4,419) size 747x34 [color=#800099] - RenderText {#text} at (0,0) size 726x34 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (4,432) size 747x36 [color=#800099] + RenderText {#text} at (0,0) size 726x35 text run at (0,0) width 726: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,17) width 67: "paragraph." - RenderBlock {P} at (4,469) size 747x17 + text run at (0,18) width 67: "paragraph." + RenderBlock {P} at (4,484) size 747x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "This sentence should be black." - RenderBlock {P} at (4,502) size 747x18 [color=#008800] + RenderBlock {P} at (4,518) size 747x18 [color=#008800] RenderText {#text} at (0,0) size 399x17 text run at (0,0) width 399: "This sentence should be a slightly different green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -185,7 +185,7 @@ layer at (0,0) size 785x1683 text run at (399,3) width 40: "style" RenderText {#text} at (439,0) size 59x17 text run at (439,0) width 59: " attribute." - RenderBlock {P} at (4,536) size 747x18 [color=#008000] + RenderBlock {P} at (4,552) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -193,7 +193,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (4,570) size 747x18 [color=#008000] + RenderBlock {P} at (4,586) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -201,7 +201,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (4,604) size 747x18 [color=#008000] + RenderBlock {P} at (4,620) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -209,7 +209,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (4,638) size 747x18 [color=#008000] + RenderBlock {P} at (4,654) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 @@ -217,7 +217,7 @@ layer at (0,0) size 785x1683 text run at (281,3) width 40: "style" RenderText {#text} at (321,0) size 59x17 text run at (321,0) width 59: " attribute." - RenderBlock {P} at (4,672) size 747x18 [color=#008000] + RenderBlock {P} at (4,688) size 747x18 [color=#008000] RenderText {#text} at (0,0) size 281x17 text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x15 diff --git a/LayoutTests/platform/gtk/css1/units/length_units-expected.png b/LayoutTests/platform/gtk/css1/units/length_units-expected.png index 43f275cfefe9..a53879f52722 100644 Binary files a/LayoutTests/platform/gtk/css1/units/length_units-expected.png and b/LayoutTests/platform/gtk/css1/units/length_units-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/units/length_units-expected.txt b/LayoutTests/platform/gtk/css1/units/length_units-expected.txt index 1da3e1308f11..dcb51e403000 100644 --- a/LayoutTests/platform/gtk/css1/units/length_units-expected.txt +++ b/LayoutTests/platform/gtk/css1/units/length_units-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x1572 +layer at (0,0) size 785x1613 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1572 - RenderBlock {HTML} at (0,0) size 785x1572 - RenderBody {BODY} at (8,8) size 769x1556 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x1613 + RenderBlock {HTML} at (0,0) size 785x1613 + RenderBody {BODY} at (8,8) size 769x1597 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 769x165 + RenderBlock {PRE} at (0,34) size 769x165 RenderText {#text} at (0,0) size 624x165 text run at (0,0) width 184: ".zero {margin-left: 0;}" text run at (0,15) width 192: ".one {margin-left: 3em;}" @@ -19,143 +19,143 @@ layer at (0,0) size 785x1572 text run at (0,120) width 208: ".eight {margin-left: 3pc;}" text run at (0,135) width 208: ".nine {margin-left: +3pc;}" text run at (0,150) width 624: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" - RenderBlock {HR} at (0,211) size 769x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,229) size 769x34 - RenderText {#text} at (0,0) size 761x34 + RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,230) size 769x36 + RenderText {#text} at (0,0) size 761x35 text run at (0,0) width 761: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges" - text run at (0,17) width 347: "should therefore be appropriately shifted to the right of " + text run at (0,18) width 347: "should therefore be appropriately shifted to the right of " RenderInline {EM} at (0,0) size 22x17 - RenderText {#text} at (347,17) size 22x17 - text run at (347,17) width 22: "this" - RenderText {#text} at (369,17) size 138x17 - text run at (369,17) width 138: " paragraph's left edge." - RenderBlock {P} at (48,279) size 721x17 + RenderText {#text} at (347,18) size 22x17 + text run at (347,18) width 22: "this" + RenderText {#text} at (369,18) size 138x17 + text run at (369,18) width 138: " paragraph's left edge." + RenderBlock {P} at (48,282) size 721x18 RenderText {#text} at (0,0) size 310x17 text run at (0,0) width 310: "This paragraph should have a left margin of 3em." - RenderBlock {P} at (24,312) size 745x17 + RenderBlock {P} at (24,316) size 745x18 RenderText {#text} at (0,0) size 306x17 text run at (0,0) width 306: "This paragraph should have a left margin of 3ex." - RenderBlock {P} at (36,345) size 733x17 + RenderBlock {P} at (36,350) size 733x18 RenderText {#text} at (0,0) size 340x17 text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels." - RenderBlock {P} at (48,378) size 721x17 + RenderBlock {P} at (48,384) size 721x18 RenderText {#text} at (0,0) size 357x17 text run at (0,0) width 357: "This paragraph should have a left margin of half an inch." - RenderBlock {P} at (48,411) size 721x17 + RenderBlock {P} at (48,418) size 721x18 RenderText {#text} at (0,0) size 330x17 text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm." - RenderBlock {P} at (48,444) size 721x17 + RenderBlock {P} at (48,452) size 721x18 RenderText {#text} at (0,0) size 335x17 text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm." - RenderBlock {P} at (48,477) size 721x17 + RenderBlock {P} at (48,486) size 721x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "This paragraph should have a left margin of 36 points." - RenderBlock {P} at (48,510) size 721x17 + RenderBlock {P} at (48,520) size 721x18 RenderText {#text} at (0,0) size 327x17 text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas." - RenderBlock {P} at (48,543) size 721x17 + RenderBlock {P} at (48,554) size 721x18 RenderText {#text} at (0,0) size 591x17 text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - RenderBlock {P} at (0,600) size 769x231 [bgcolor=#00FFFF] [border: none (19px solid #800080)] - RenderText {#text} at (19,0) size 310x45 - text run at (19,0) width 310: "This element has a " + RenderBlock {P} at (0,612) size 769x239 [bgcolor=#00FFFF] [border: none (19px solid #800080)] + RenderText {#text} at (19,1) size 310x45 + text run at (19,1) width 310: "This element has a " RenderInline {CODE} at (0,0) size 216x45 - RenderText {#text} at (329,3) size 216x45 - text run at (329,3) width 216: "font-size" - RenderText {#text} at (545,0) size 53x45 - text run at (545,0) width 53: " of " + RenderText {#text} at (329,4) size 216x45 + text run at (329,4) width 216: "font-size" + RenderText {#text} at (545,1) size 53x45 + text run at (545,1) width 53: " of " RenderInline {CODE} at (0,0) size 96x45 - RenderText {#text} at (598,3) size 96x45 - text run at (598,3) width 96: "40px" - RenderText {#text} at (694,0) size 743x93 - text run at (694,0) width 68: " and" - text run at (19,48) width 28: "a " + RenderText {#text} at (598,4) size 96x45 + text run at (598,4) width 96: "40px" + RenderText {#text} at (694,1) size 743x94 + text run at (694,1) width 68: " and" + text run at (19,50) width 28: "a " RenderInline {CODE} at (0,0) size 264x45 - RenderText {#text} at (47,51) size 264x45 - text run at (47,51) width 264: "border-left" - RenderText {#text} at (311,48) size 53x45 - text run at (311,48) width 53: " of " + RenderText {#text} at (47,53) size 264x45 + text run at (47,53) width 264: "border-left" + RenderText {#text} at (311,50) size 53x45 + text run at (311,50) width 53: " of " RenderInline {CODE} at (0,0) size 384x45 - RenderText {#text} at (364,51) size 384x45 - text run at (364,51) width 384: "1ex solid purple" - RenderText {#text} at (748,48) size 739x183 - text run at (748,48) width 10: "." - text run at (19,96) width 673: "This should make the left border the same" - text run at (19,141) width 711: "number of pixels as the lower-case 'x' in this" - text run at (19,186) width 611: "element's font, as well as solid purple." - RenderTable {TABLE} at (0,871) size 769x685 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x683 - RenderTableRow {TR} at (0,0) size 767x25 - RenderTableCell {TD} at (0,0) size 767x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (364,53) size 384x45 + text run at (364,53) width 384: "1ex solid purple" + RenderText {#text} at (748,50) size 739x188 + text run at (748,50) width 10: "." + text run at (19,99) width 673: "This should make the left border the same" + text run at (19,146) width 711: "number of pixels as the lower-case 'x' in this" + text run at (19,193) width 611: "element's font, as well as solid purple." + RenderTable {TABLE} at (0,891) size 769x706 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x704 + RenderTableRow {TR} at (0,0) size 767x26 + RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 767x658 - RenderTableCell {TD} at (0,341) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 755x658 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x34 - RenderText {#text} at (0,0) size 721x34 + RenderTableRow {TR} at (0,26) size 767x678 + RenderTableCell {TD} at (0,352) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 755x678 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x36 + RenderText {#text} at (0,0) size 721x35 text run at (0,0) width 721: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" - text run at (0,17) width 387: "edges should therefore be appropriately shifted to the right of " + text run at (0,18) width 387: "edges should therefore be appropriately shifted to the right of " RenderInline {EM} at (0,0) size 22x17 - RenderText {#text} at (387,17) size 22x17 - text run at (387,17) width 22: "this" - RenderText {#text} at (409,17) size 138x17 - text run at (409,17) width 138: " paragraph's left edge." - RenderBlock {P} at (52,54) size 699x17 + RenderText {#text} at (387,18) size 22x17 + text run at (387,18) width 22: "this" + RenderText {#text} at (409,18) size 138x17 + text run at (409,18) width 138: " paragraph's left edge." + RenderBlock {P} at (52,56) size 699x18 RenderText {#text} at (0,0) size 310x17 text run at (0,0) width 310: "This paragraph should have a left margin of 3em." - RenderBlock {P} at (28,87) size 723x17 + RenderBlock {P} at (28,90) size 723x18 RenderText {#text} at (0,0) size 306x17 text run at (0,0) width 306: "This paragraph should have a left margin of 3ex." - RenderBlock {P} at (40,120) size 711x17 + RenderBlock {P} at (40,124) size 711x18 RenderText {#text} at (0,0) size 340x17 text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels." - RenderBlock {P} at (52,153) size 699x17 + RenderBlock {P} at (52,158) size 699x18 RenderText {#text} at (0,0) size 357x17 text run at (0,0) width 357: "This paragraph should have a left margin of half an inch." - RenderBlock {P} at (52,186) size 699x17 + RenderBlock {P} at (52,192) size 699x18 RenderText {#text} at (0,0) size 330x17 text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm." - RenderBlock {P} at (52,219) size 699x17 + RenderBlock {P} at (52,226) size 699x18 RenderText {#text} at (0,0) size 335x17 text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm." - RenderBlock {P} at (52,252) size 699x17 + RenderBlock {P} at (52,260) size 699x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "This paragraph should have a left margin of 36 points." - RenderBlock {P} at (52,285) size 699x17 + RenderBlock {P} at (52,294) size 699x18 RenderText {#text} at (0,0) size 327x17 text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas." - RenderBlock {P} at (52,318) size 699x17 + RenderBlock {P} at (52,328) size 699x18 RenderText {#text} at (0,0) size 591x17 text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - RenderBlock {P} at (4,375) size 747x279 [bgcolor=#00FFFF] [border: none (19px solid #800080)] - RenderText {#text} at (19,0) size 310x45 - text run at (19,0) width 310: "This element has a " + RenderBlock {P} at (4,386) size 747x288 [bgcolor=#00FFFF] [border: none (19px solid #800080)] + RenderText {#text} at (19,1) size 310x45 + text run at (19,1) width 310: "This element has a " RenderInline {CODE} at (0,0) size 216x45 - RenderText {#text} at (329,3) size 216x45 - text run at (329,3) width 216: "font-size" - RenderText {#text} at (545,0) size 53x45 - text run at (545,0) width 53: " of " + RenderText {#text} at (329,4) size 216x45 + text run at (329,4) width 216: "font-size" + RenderText {#text} at (545,1) size 53x45 + text run at (545,1) width 53: " of " RenderInline {CODE} at (0,0) size 96x45 - RenderText {#text} at (598,3) size 96x45 - text run at (598,3) width 96: "40px" - RenderText {#text} at (19,48) size 96x45 - text run at (19,48) width 96: "and a " + RenderText {#text} at (598,4) size 96x45 + text run at (598,4) width 96: "40px" + RenderText {#text} at (19,50) size 96x45 + text run at (19,50) width 96: "and a " RenderInline {CODE} at (0,0) size 264x45 - RenderText {#text} at (115,51) size 264x45 - text run at (115,51) width 264: "border-left" - RenderText {#text} at (379,48) size 53x45 - text run at (379,48) width 53: " of " - RenderInline {CODE} at (0,0) size 629x93 - RenderText {#text} at (432,51) size 629x93 - text run at (432,51) width 216: "1ex solid" - text run at (19,99) width 144: "purple" - RenderText {#text} at (163,96) size 710x183 - text run at (163,96) width 20: ". " - text run at (183,96) width 521: "This should make the left border" - text run at (19,144) width 710: "the same number of pixels as the lower-case" - text run at (19,189) width 642: "'x' in this element's font, as well as solid" - text run at (19,234) width 112: "purple." + RenderText {#text} at (115,53) size 264x45 + text run at (115,53) width 264: "border-left" + RenderText {#text} at (379,50) size 53x45 + text run at (379,50) width 53: " of " + RenderInline {CODE} at (0,0) size 629x94 + RenderText {#text} at (432,53) size 629x94 + text run at (432,53) width 216: "1ex solid" + text run at (19,102) width 144: "purple" + RenderText {#text} at (163,99) size 710x188 + text run at (163,99) width 20: ". " + text run at (183,99) width 521: "This should make the left border" + text run at (19,148) width 710: "the same number of pixels as the lower-case" + text run at (19,195) width 642: "'x' in this element's font, as well as solid" + text run at (19,242) width 112: "purple." diff --git a/LayoutTests/platform/gtk/css1/units/percentage_units-expected.png b/LayoutTests/platform/gtk/css1/units/percentage_units-expected.png index 4a5f973b84d4..8ab7386b24ab 100644 Binary files a/LayoutTests/platform/gtk/css1/units/percentage_units-expected.png and b/LayoutTests/platform/gtk/css1/units/percentage_units-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/units/percentage_units-expected.txt b/LayoutTests/platform/gtk/css1/units/percentage_units-expected.txt index 7d23bbef4eac..848a2ca3854f 100644 --- a/LayoutTests/platform/gtk/css1/units/percentage_units-expected.txt +++ b/LayoutTests/platform/gtk/css1/units/percentage_units-expected.txt @@ -3,60 +3,60 @@ layer 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 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x75 + RenderBlock {PRE} at (0,34) size 784x75 RenderText {#text} at (0,0) size 504x75 text run at (0,0) width 224: ".zero { background: yellow }" text run at (0,15) width 504: ".one { margin-left: 25%; margin-right: 25%; background: white }" text run at (0,30) width 496: ".two { margin-left: 50%; margin-right: 0%; background: white }" text run at (0,45) width 208: ".three {margin-left: 25%;}" text run at (0,60) width 0: " " - RenderBlock {HR} at (0,121) size 784x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (0,139) size 784x118 [bgcolor=#FFFF00] - RenderBlock {DIV} at (196,0) size 392x51 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 392x51 - RenderText {#text} at (0,0) size 326x51 + RenderBlock {HR} at (0,122) size 784x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,140) size 784x124 [bgcolor=#FFFF00] + RenderBlock {DIV} at (196,0) size 392x54 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 392x54 + RenderText {#text} at (0,0) size 326x53 text run at (0,0) width 326: "This paragraph should be centered within its yellow" - text run at (0,17) width 323: "containing block and its width should be half of the" - text run at (0,34) width 109: "containing block." - RenderBlock {DIV} at (392,67) size 392x51 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 392x51 - RenderText {#text} at (0,0) size 353x51 + text run at (0,18) width 323: "containing block and its width should be half of the" + text run at (0,36) width 109: "containing block." + RenderBlock {DIV} at (392,70) size 392x54 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 392x54 + RenderText {#text} at (0,0) size 353x53 text run at (0,0) width 353: "This paragraph should be right-aligned within its yellow" - text run at (0,17) width 323: "containing block and its width should be half of the" - text run at (0,34) width 109: "containing block." - RenderBlock {P} at (196,273) size 588x34 - RenderText {#text} at (0,0) size 549x34 + text run at (0,18) width 323: "containing block and its width should be half of the" + text run at (0,36) width 109: "containing block." + RenderBlock {P} at (196,280) size 588x36 + RenderText {#text} at (0,0) size 549x35 text run at (0,0) width 549: "This paragraph should have a left margin of 25% the width of its parent element, which" - text run at (0,17) width 357: "should require some extra text in order to test effectively." - RenderTable {TABLE} at (0,323) size 784x203 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x201 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 357: "should require some extra text in order to test effectively." + RenderTable {TABLE} at (0,332) size 784x212 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x210 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x176 - RenderTableCell {TD} at (0,100) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 4x18 - text run at (4,5) width 4: " " - RenderTableCell {TD} at (12,25) size 770x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {DIV} at (4,4) size 762x118 [bgcolor=#FFFF00] - RenderBlock {DIV} at (190,0) size 382x51 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 381x51 - RenderText {#text} at (0,0) size 326x51 + RenderTableRow {TR} at (0,26) size 782x184 + RenderTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x17 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,26) size 770x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {DIV} at (4,4) size 762x124 [bgcolor=#FFFF00] + RenderBlock {DIV} at (190,0) size 382x54 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 381x54 + RenderText {#text} at (0,0) size 326x53 text run at (0,0) width 326: "This paragraph should be centered within its yellow" - text run at (0,17) width 323: "containing block and its width should be half of the" - text run at (0,34) width 109: "containing block." - RenderBlock {DIV} at (381,67) size 381x51 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 381x51 - RenderText {#text} at (0,0) size 353x51 + text run at (0,18) width 323: "containing block and its width should be half of the" + text run at (0,36) width 109: "containing block." + RenderBlock {DIV} at (381,70) size 381x54 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 381x54 + RenderText {#text} at (0,0) size 353x53 text run at (0,0) width 353: "This paragraph should be right-aligned within its yellow" - text run at (0,17) width 323: "containing block and its width should be half of the" - text run at (0,34) width 109: "containing block." - RenderBlock {P} at (194,138) size 572x34 - RenderText {#text} at (0,0) size 549x34 + text run at (0,18) width 323: "containing block and its width should be half of the" + text run at (0,36) width 109: "containing block." + RenderBlock {P} at (194,144) size 572x36 + RenderText {#text} at (0,0) size 549x35 text run at (0,0) width 549: "This paragraph should have a left margin of 25% the width of its parent element, which" - text run at (0,17) width 357: "should require some extra text in order to test effectively." + text run at (0,18) width 357: "should require some extra text in order to test effectively." diff --git a/LayoutTests/platform/gtk/css1/units/urls-expected.png b/LayoutTests/platform/gtk/css1/units/urls-expected.png index 7d854a156925..018249774311 100644 Binary files a/LayoutTests/platform/gtk/css1/units/urls-expected.png and b/LayoutTests/platform/gtk/css1/units/urls-expected.png differ diff --git a/LayoutTests/platform/gtk/css1/units/urls-expected.txt b/LayoutTests/platform/gtk/css1/units/urls-expected.txt index b821b4633999..cfdb1c4f6b1b 100644 --- a/LayoutTests/platform/gtk/css1/units/urls-expected.txt +++ b/LayoutTests/platform/gtk/css1/units/urls-expected.txt @@ -3,55 +3,55 @@ layer 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 - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 355x17 text run at (0,0) width 355: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,33) size 784x60 + RenderBlock {PRE} at (0,34) size 784x60 RenderText {#text} at (0,0) size 648x60 text run at (0,0) width 648: "" text run at (0,15) width 296: "@import url(../resources/sec642.css);" text run at (0,30) width 352: "BODY {background: url(../resources/bg.gif);}" text run at (0,45) width 0: " " - RenderBlock {HR} at (0,106) size 784x2 [border: (1px inset #000000)] - RenderBlock {P} at (0,124) size 784x17 + RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,125) size 784x18 RenderText {#text} at (0,0) size 386x17 text run at (0,0) width 386: "This page should have a green grid pattern as its background." - RenderBlock {P} at (0,157) size 784x51 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 779x51 + RenderBlock {P} at (0,159) size 784x54 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 779x53 text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " text run at (620,0) width 159: "If an image, in this case a" - text run at (0,17) width 756: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,34) width 274: "document's URL, not the stylesheet's URL." - RenderBlock {P} at (0,224) size 784x51 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 779x51 + text run at (0,18) width 756: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" + text run at (0,36) width 274: "document's URL, not the stylesheet's URL." + RenderBlock {P} at (0,229) size 784x54 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 779x53 text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " text run at (620,0) width 159: "If an image, in this case a" - text run at (0,17) width 756: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,34) width 274: "document's URL, not the stylesheet's URL." - RenderTable {TABLE} at (0,291) size 784x186 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x184 - RenderTableRow {TR} at (0,0) size 782x25 - RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 756: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" + text run at (0,36) width 274: "document's URL, not the stylesheet's URL." + RenderTable {TABLE} at (0,299) size 784x194 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x192 + RenderTableRow {TR} at (0,0) size 782x26 + RenderTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 163x17 RenderText {#text} at (4,4) size 163x17 text run at (4,4) width 163: "TABLE Testing Section" - RenderTableRow {TR} at (0,25) size 782x159 - RenderTableCell {TD} at (0,92) size 12x25 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 782x166 + RenderTableCell {TD} at (0,96) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,25) size 770x159 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x17 + RenderTableCell {TD} at (12,26) size 770x166 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x18 RenderText {#text} at (0,0) size 386x17 text run at (0,0) width 386: "This page should have a green grid pattern as its background." - RenderBlock {P} at (4,37) size 762x51 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 759x51 + RenderBlock {P} at (4,38) size 762x54 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 759x53 text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " text run at (620,0) width 117: "If an image, in this" - text run at (0,17) width 759: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" - text run at (0,34) width 313: "to the document's URL, not the stylesheet's URL." - RenderBlock {P} at (4,104) size 762x51 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 759x51 + text run at (0,18) width 759: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" + text run at (0,36) width 313: "to the document's URL, not the stylesheet's URL." + RenderBlock {P} at (4,108) size 762x54 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 759x53 text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " text run at (620,0) width 117: "If an image, in this" - text run at (0,17) width 759: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" - text run at (0,34) width 313: "to the document's URL, not the stylesheet's URL." + text run at (0,18) width 759: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" + text run at (0,36) width 313: "to the document's URL, not the stylesheet's URL." diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-001-expected.txt index eb46f480db44..2e3afe852705 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-001-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x17 - RenderBlock {HTML} at (0,0) size 800x17 - RenderBody {BODY} at (0,0) size 800x17 - RenderBlock {P} at (0,0) size 800x17 +layer at (0,0) size 800x18 + RenderBlock {HTML} at (0,0) size 800x18 + RenderBody {BODY} at (0,0) size 800x18 + RenderBlock {P} at (0,0) size 800x18 RenderText {#text} at (0,0) size 511x17 text run at (0,0) width 511: "Test passes the a filled blue square touches the upper-left corner of the black box." layer at (0,96) size 294x198 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.png index fb7154341081..6349e42329a1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.txt index 1e3a963e9d25..f83923b92d95 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-002-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 723x17 text run at (0,0) width 723: "Test passes if the blue box below is in the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-003-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-004-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-005-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.png index afe1724046d4..8deb5ae5bd71 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.txt index 4a645818fbd2..8d33b3ce4854 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-006-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x377 - RenderBlock {HTML} at (0,0) size 800x377 - RenderBody {BODY} at (8,16) size 784x353 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x378 + RenderBlock {HTML} at (0,0) size 800x378 + RenderBody {BODY} at (8,16) size 784x354 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 300x17 text run at (0,0) width 300: "Test passes if there is one blue box on the page." -layer at (8,49) size 320x320 clip at (18,59) size 300x300 - RenderBlock (relative positioned) {DIV} at (0,33) size 320x320 [border: (10px solid #000000)] -layer at (18,159) size 150x150 +layer at (8,50) size 320x320 clip at (18,60) size 300x300 + RenderBlock (relative positioned) {DIV} at (0,34) size 320x320 [border: (10px solid #000000)] +layer at (18,160) size 150x150 RenderBlock (positioned) {DIV} at (10,110) size 150x150 [bgcolor=#0000FF] -layer at (168,159) size 150x150 +layer at (168,160) size 150x150 RenderBlock (positioned) {DIV} at (160,110) size 150x150 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.png index c4a0789d644f..dcbb0db72033 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.txt index 6ae1337cf942..4a9e1c285120 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-007-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x441 - RenderBlock {HTML} at (0,0) size 800x441 - RenderBody {BODY} at (8,16) size 784x417 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x442 + RenderBlock {HTML} at (0,0) size 800x442 + RenderBody {BODY} at (8,16) size 784x418 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height." -layer at (8,49) size 192x384 - RenderBlock (relative positioned) {DIV} at (0,33) size 192x384 [color=#FFA500] -layer at (8,49) size 192x96 +layer at (8,50) size 192x384 + RenderBlock (relative positioned) {DIV} at (0,34) size 192x384 [color=#FFA500] +layer at (8,50) size 192x96 RenderBlock (positioned) {DIV} at (0,0) size 192x96 [bgcolor=#0000FF] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.png index 673b61964823..8946a1865e21 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.txt index aa2c94fdba5a..02fc23d8ce60 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-008-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x345 - RenderBlock {HTML} at (0,0) size 800x345 - RenderBody {BODY} at (8,16) size 784x321 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x346 + RenderBlock {HTML} at (0,0) size 800x346 + RenderBody {BODY} at (8,16) size 784x322 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 469x17 text run at (0,0) width 469: "Test passes if there are two boxes below, a blue box below an orange box." -layer at (8,49) size 96x288 - RenderBlock (relative positioned) {DIV} at (0,33) size 96x288 [bgcolor=#0000FF] -layer at (8,49) size 96x96 +layer at (8,50) size 96x288 + RenderBlock (relative positioned) {DIV} at (0,34) size 96x288 [bgcolor=#0000FF] +layer at (8,50) size 96x96 RenderBlock (positioned) {DIV} at (0,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.png index e1605e84d5bd..fbbc54c41d68 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.txt index b10f1d58584f..4e5c390b0d6b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-009-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height." -layer at (8,73) size 192x96 +layer at (8,74) size 192x96 RenderBlock (positioned) {DIV} at (0,24) size 192x96 [color=#FFA500] [bgcolor=#0000FF] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-010-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-011-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-height-012-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.png index f9a4d70213d7..2f1455a910ec 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt index 9668e960b120..57c02e74482b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x17 - RenderBlock {HTML} at (0,0) size 800x17 - RenderBody {BODY} at (0,0) size 800x17 - RenderBlock {P} at (0,0) size 800x17 +layer at (0,0) size 800x18 + RenderBlock {HTML} at (0,0) size 800x18 + RenderBody {BODY} at (0,0) size 800x18 + RenderBlock {P} at (0,0) size 800x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes the blue box is in the upper-left corner of the black box." -layer at (0,17) size 198x198 - RenderBlock (positioned) {DIV} at (0,17) size 198x198 [border: (3px solid #000000)] -layer at (3,20) size 96x48 - RenderBlock (positioned) {DIV} at (3,20) size 96x48 [bgcolor=#0000FF] +layer at (0,18) size 198x198 + RenderBlock (positioned) {DIV} at (0,18) size 198x198 [border: (3px solid #000000)] +layer at (3,21) size 96x48 + RenderBlock (positioned) {DIV} at (3,21) size 96x48 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.png index a2e3c8d72e3d..466fd762ba1a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt index 23848b998f2e..446d222adfb7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 607x17 text run at (0,0) width 607: "Test passes if there is blue rectangle, and not a square, in the upper-right corner of the black box." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x48 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x48 RenderBlock (positioned) {DIV} at (99,3) size 96x48 [bgcolor=#0000FF] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: " " diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.png index efc782627a53..56fffcd9b3c6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt index f111f7d29e36..243aedea0def 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,172) size 288x48 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,173) size 288x48 RenderBlock (positioned) {DIV} at (3,123) size 288x48 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.png index 7fb5decae3fc..a3cca6e9d4dd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt index de4ec976a4f5..9df9fdf8d9f7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x441 - RenderBlock {HTML} at (0,0) size 800x441 - RenderBody {BODY} at (8,16) size 784x417 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x442 + RenderBlock {HTML} at (0,0) size 800x442 + RenderBody {BODY} at (8,16) size 784x418 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 96x384 - RenderBlock (relative positioned) {DIV} at (0,33) size 96x384 -layer at (8,97) size 96x48 +layer at (8,50) size 96x384 + RenderBlock (relative positioned) {DIV} at (0,34) size 96x384 +layer at (8,98) size 96x48 RenderBlock (relative positioned) {DIV} at (0,0) size 96x48 [bgcolor=#FFA500] -layer at (8,97) size 48x48 +layer at (8,98) size 48x48 RenderBlock (positioned) {DIV} at (0,48) size 48x48 [bgcolor=#0000FF] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: " " diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.png index 133cb178de90..690b1b8e5e77 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt index 058ffc1937b4..b0e7368c83d4 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x345 - RenderBlock {HTML} at (0,0) size 800x345 - RenderBody {BODY} at (8,16) size 784x321 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x346 + RenderBlock {HTML} at (0,0) size 800x346 + RenderBody {BODY} at (8,16) size 784x322 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 469x17 text run at (0,0) width 469: "Test passes if there are two boxes below, a blue box below an orange box." -layer at (8,49) size 96x288 - RenderBlock (relative positioned) {DIV} at (0,33) size 96x288 [bgcolor=#0000FF] -layer at (8,49) size 96x48 +layer at (8,50) size 96x288 + RenderBlock (relative positioned) {DIV} at (0,34) size 96x288 [bgcolor=#0000FF] +layer at (8,50) size 96x48 RenderBlock (positioned) {DIV} at (0,0) size 96x48 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.png index ca2acb16c9fc..1c1e5b2e8e0e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt index a7338def1ac5..8d34a7f5c32c 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the orange and blue boxes below are the same height." -layer at (104,73) size 96x48 +layer at (104,74) size 96x48 RenderBlock (positioned) {DIV} at (96,24) size 96x48 [bgcolor=#0000FF] -layer at (8,73) size 96x48 +layer at (8,74) size 96x48 RenderBlock (positioned) {DIV} at (0,24) size 96x48 [bgcolor=#FFA500] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: " " diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.png index efc782627a53..56fffcd9b3c6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt index f111f7d29e36..243aedea0def 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,172) size 288x48 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,173) size 288x48 RenderBlock (positioned) {DIV} at (3,123) size 288x48 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.png index 390d6c6e8ee9..fb0908bb0929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt index 6fa69d54e79e..97566062fc1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "Test passes if the blue box is vertically centered in the black box." -layer at (8,49) size 294x294 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x294 [border: (3px solid #000000)] -layer at (11,148) size 288x96 +layer at (8,50) size 294x294 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x294 [border: (3px solid #000000)] +layer at (11,149) size 288x96 RenderBlock (positioned) {DIV} at (3,99) size 288x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.png index 71ed3c85a1ee..0631f90f4f65 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.txt index 2bedee0bff53..02476f79f650 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-001-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 680x17 text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.png index 9ec9674eaa56..30edd48e2c5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.txt index d98eabd28802..bc1b0cd7fffe 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-002-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 689x17 text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.png index 6b684a424938..6fbf9c8adee8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.txt index bcaaf7220437..8f3f820da276 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-003-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 741x17 text run at (0,0) width 741: "Test passes if the blue square in in the upper-right corner of the black rectangle and there is no red visible on the page." -layer at (8,49) size 390x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 390x198 [border: (3px solid #000000)] -layer at (299,52) size 96x96 +layer at (8,50) size 390x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 390x198 [border: (3px solid #000000)] +layer at (299,53) size 96x96 RenderBlock (positioned) {DIV} at (291,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.png index 599fa98cc69b..351c88250ced 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.txt index 1c6105a8a29e..dfaf2baef641 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-004-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 686x17 text run at (0,0) width 686: "Test passes if the blue box fills the upper-right corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.png index ad728183b998..dcb556ea7906 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.txt index 9363a5bd7ed8..f6bf14a5797f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-005-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 677x17 text run at (0,0) width 677: "Test passes if the blue box fills the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.png index 9ec9674eaa56..30edd48e2c5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.txt index d98eabd28802..bc1b0cd7fffe 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-006-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 689x17 text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.png index 71ed3c85a1ee..0631f90f4f65 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.txt index 2bedee0bff53..02476f79f650 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-007-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 680x17 text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.png index 2ccf730d5273..a1a5cb54f485 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.txt index ae2ceef22c33..a0c060afb122 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-008-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 730x17 text run at (0,0) width 730: "Test passes if the blue square is in the upper-left corner of the black rectangle and there is no red visible on the page." -layer at (8,49) size 294x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 294x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.png index b5dc41c8c2ed..a6afab89deba 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.txt index a5477c0f487e..ccc76cf83b30 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-009-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 739x17 text run at (0,0) width 739: "Test passes if the blue square is in the upper-right corner of the black rectangle and there is no red visible on the page." -layer at (8,49) size 294x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x198 [border: (3px solid #000000)] -layer at (203,52) size 96x96 +layer at (8,50) size 294x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x198 [border: (3px solid #000000)] +layer at (203,53) size 96x96 RenderBlock (positioned) {DIV} at (195,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.png index 71ed3c85a1ee..0631f90f4f65 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.txt index 2bedee0bff53..02476f79f650 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-010-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 680x17 text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.png index 71ed3c85a1ee..0631f90f4f65 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.txt index 2bedee0bff53..02476f79f650 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-011-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 680x17 text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.png index 9ec9674eaa56..30edd48e2c5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.txt index d98eabd28802..bc1b0cd7fffe 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-012-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 689x17 text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.png index 9ec9674eaa56..30edd48e2c5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.txt index d98eabd28802..bc1b0cd7fffe 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-013-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 689x17 text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.png index 71ed3c85a1ee..0631f90f4f65 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.txt index 2bedee0bff53..02476f79f650 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-014-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 680x17 text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (11,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (11,53) size 96x96 RenderBlock (positioned) {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.png index 440dcb3dfe9b..738972b07799 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.txt index b0b995c17b88..32cc588bf895 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-015-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 669x17 text run at (0,0) width 669: "Test passes if the blue box is horizontally centered inside black box and there is no red visible on the page." -layer at (8,49) size 294x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 294x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 294x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 294x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.png index 9ec9674eaa56..30edd48e2c5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.txt index d98eabd28802..bc1b0cd7fffe 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-016-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 689x17 text run at (0,0) width 689: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." -layer at (8,49) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] -layer at (107,52) size 96x96 +layer at (8,50) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] +layer at (107,53) size 96x96 RenderBlock (positioned) {DIV} at (99,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.txt index 3ae8ea3d44a0..d8fa51708368 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-017-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." -layer at (8,66) size 128x128 - RenderBlock (positioned) {DIV} at (8,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." +layer at (8,68) size 128x128 + RenderBlock (positioned) {DIV} at (8,68) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.txt index 647559f02995..db3b1dcb26d5 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-018-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." -layer at (8,66) size 128x128 - RenderBlock (positioned) {DIV} at (8,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." +layer at (8,68) size 128x128 + RenderBlock (positioned) {DIV} at (8,68) size 128x128 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.txt index 118c96c65083..f7db6f04dd47 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-019-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." -layer at (8,66) size 128x128 - RenderBlock (positioned) {DIV} at (8,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." +layer at (8,68) size 128x128 + RenderBlock (positioned) {DIV} at (8,68) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.txt index 6dcc9ec54dfd..b0e88d8907bd 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-020-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." -layer at (8,66) size 128x128 - RenderBlock (positioned) {DIV} at (8,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." +layer at (8,68) size 128x128 + RenderBlock (positioned) {DIV} at (8,68) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.png index dd7240ad3ba2..b3499b54ead1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.txt index 621c1b71d433..29b14d7d8b55 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-021-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" - text run at (0,17) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." -layer at (664,66) size 128x128 - RenderBlock (positioned) {DIV} at (664,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." +layer at (664,68) size 128x128 + RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (-128,48) size 256x32 text run at (-128,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.png index dd7240ad3ba2..b3499b54ead1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.txt index 9ef7f0166591..8f2aa0a71e08 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-022-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" - text run at (0,17) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." -layer at (664,66) size 128x128 - RenderBlock (positioned) {DIV} at (664,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." +layer at (664,68) size 128x128 + RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (-128,48) size 256x32 text run at (-128,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.png index dd7240ad3ba2..b3499b54ead1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.txt index 497266678549..50e134cdc307 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-023-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" - text run at (0,17) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." -layer at (664,66) size 128x128 - RenderBlock (positioned) {DIV} at (664,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." +layer at (664,68) size 128x128 + RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (-128,48) size 256x32 text run at (-128,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.png index dd7240ad3ba2..b3499b54ead1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.txt index 6ccf1c930516..af22243b429d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-non-replaced-width-024-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" - text run at (0,17) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." -layer at (664,66) size 128x128 - RenderBlock (positioned) {DIV} at (664,66) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." +layer at (664,68) size 128x128 + RenderBlock (positioned) {DIV} at (664,68) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (-128,48) size 256x32 text run at (-128,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.png index 104441a9298a..cf0476c62fb8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.txt index a54348dc180f..5595b8e2bb36 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-001-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x78 - RenderBlock {HTML} at (0,0) size 800x78 - RenderBody {BODY} at (8,16) size 784x54 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x79 + RenderBlock {HTML} at (0,0) size 800x79 + RenderBody {BODY} at (8,16) size 784x55 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock {DIV} at (0,33) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] -layer at (8,52) size 15x15 - RenderImage {IMG} at (8,52) size 15x15 + RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] +layer at (8,53) size 15x15 + RenderImage {IMG} at (8,53) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.png index 9812d5850e5f..e3c2606d61d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.txt index e4968ae72fbf..a6fdd370669b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-002-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 15x15 +layer at (8,50) size 15x15 RenderImage {IMG} at (0,0) size 15x15 -layer at (23,49) size 15x15 +layer at (23,50) size 15x15 RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.txt index 2d6eb61c5b24..c82cbbf3e4a7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-003-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 96x96 +layer at (8,50) size 96x96 RenderImage {IMG} at (0,0) size 96x96 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.txt index dae83ea6336e..d5876e1c0761 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-004-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.png index 81e3387873db..6eb3b4fe00e6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.txt index bd483f61d4cd..4b489a5912d6 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-005-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,49) size 306x102 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,50) size 306x102 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,49) size 306x102 +layer at (8,50) size 306x102 RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.png index c63396875188..8e4bb24f5f57 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.txt index 64e703b932ae..0d1161f063a7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-007-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 306x6 +layer at (8,50) size 306x6 RenderIFrame {IFRAME} at (0,0) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 RenderView at (0,0) size 285x0 layer at (0,0) size 285x8 RenderBlock {HTML} at (0,0) size 285x8 RenderBody {BODY} at (8,8) size 269x0 -layer at (8,49) size 306x6 +layer at (8,50) size 306x6 RenderBlock (positioned) {DIV} at (0,0) size 306x6 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.txt index 0e8bcee15ee5..390ae85c0cd7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-008-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x75 - RenderBlock {HTML} at (0,0) size 800x75 - RenderBody {BODY} at (8,16) size 784x51 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x76 + RenderBlock {HTML} at (0,0) size 800x76 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x18 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x18 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x18 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (relative positioned) {DIV} at (0,3) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.txt index 334e5397657c..c7ce3a3db2bf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-009-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.png index 88428bbe5931..5d8858138033 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.txt index cb500fa02048..0954556bec40 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-010-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 96x96 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 96x96 RenderImage {IMG} at (0,99) size 96x96 -layer at (104,148) size 96x96 +layer at (104,149) size 96x96 RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.png index 63bf3a85949e..3e2d97887143 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.txt index 15330c2e80b1..59eccab8da27 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-011-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.png index f2fc447b1374..b678b5ea5ae8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.txt index d0a2376c95e8..37bb86ca6131 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-012-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,145) size 306x102 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,146) size 306x102 RenderIFrame {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,145) size 306x102 +layer at (8,146) size 306x102 RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.png index 83f943487c52..c3d75373bd5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.txt index 62ad5f263d3e..15c9cde0bfdb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-014-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 RenderView at (0,0) size 285x0 layer at (0,0) size 285x8 RenderBlock {HTML} at (0,0) size 285x8 RenderBody {BODY} at (8,8) size 269x0 -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.txt index 334e5397657c..c7ce3a3db2bf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-016-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.png index 88428bbe5931..5d8858138033 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.txt index cb500fa02048..0954556bec40 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-017-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 96x96 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 96x96 RenderImage {IMG} at (0,99) size 96x96 -layer at (104,148) size 96x96 +layer at (104,149) size 96x96 RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.png index 63bf3a85949e..3e2d97887143 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.txt index 15330c2e80b1..59eccab8da27 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-018-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.png index f2fc447b1374..b678b5ea5ae8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.txt index d0a2376c95e8..37bb86ca6131 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-019-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,145) size 306x102 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,146) size 306x102 RenderIFrame {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,145) size 306x102 +layer at (8,146) size 306x102 RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.png index 83f943487c52..c3d75373bd5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.txt index 62ad5f263d3e..15c9cde0bfdb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-021-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 RenderView at (0,0) size 285x0 layer at (0,0) size 285x8 RenderBlock {HTML} at (0,0) size 285x8 RenderBody {BODY} at (8,8) size 269x0 -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.txt index 0e8bcee15ee5..390ae85c0cd7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-022-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x75 - RenderBlock {HTML} at (0,0) size 800x75 - RenderBody {BODY} at (8,16) size 784x51 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x76 + RenderBlock {HTML} at (0,0) size 800x76 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x18 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x18 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x18 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (relative positioned) {DIV} at (0,3) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.txt index 334e5397657c..c7ce3a3db2bf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-023-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.png index 88428bbe5931..5d8858138033 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.txt index cb500fa02048..0954556bec40 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-024-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 96x96 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 96x96 RenderImage {IMG} at (0,99) size 96x96 -layer at (104,148) size 96x96 +layer at (104,149) size 96x96 RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.png index 63bf3a85949e..3e2d97887143 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.txt index 15330c2e80b1..59eccab8da27 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-025-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.png index f2fc447b1374..b678b5ea5ae8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.txt index d0a2376c95e8..37bb86ca6131 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-026-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,145) size 306x102 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,146) size 306x102 RenderIFrame {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,145) size 306x102 +layer at (8,146) size 306x102 RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.png index 83f943487c52..c3d75373bd5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.txt index 62ad5f263d3e..15c9cde0bfdb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-028-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 RenderView at (0,0) size 285x0 layer at (0,0) size 285x8 RenderBlock {HTML} at (0,0) size 285x8 RenderBody {BODY} at (8,8) size 269x0 -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.txt index 0e8bcee15ee5..390ae85c0cd7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-029-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x75 - RenderBlock {HTML} at (0,0) size 800x75 - RenderBody {BODY} at (8,16) size 784x51 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x76 + RenderBlock {HTML} at (0,0) size 800x76 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x18 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x18 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x18 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (relative positioned) {DIV} at (0,3) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.png index e29b8b7804f2..232be4b46e63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.txt index 334e5397657c..c7ce3a3db2bf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-030-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 15x15 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 15x15 RenderImage {IMG} at (0,99) size 15x15 -layer at (23,148) size 15x15 +layer at (23,149) size 15x15 RenderBlock (positioned) {DIV} at (15,99) size 15x15 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.png index 88428bbe5931..5d8858138033 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.txt index cb500fa02048..0954556bec40 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-031-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x60 - RenderBlock {HTML} at (0,0) size 800x60 - RenderBody {BODY} at (8,16) size 784x36 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x61 + RenderBlock {HTML} at (0,0) size 800x61 + RenderBody {BODY} at (8,16) size 784x37 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 514x17 text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line." -layer at (8,49) size 784x3 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x3 [border: (3px solid #000000) none] -layer at (8,148) size 96x96 +layer at (8,50) size 784x3 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none] +layer at (8,149) size 96x96 RenderImage {IMG} at (0,99) size 96x96 -layer at (104,148) size 96x96 +layer at (104,149) size 96x96 RenderBlock (positioned) {DIV} at (96,99) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.png index 63bf3a85949e..3e2d97887143 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.txt index 15330c2e80b1..59eccab8da27 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-032-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,145) size 306x156 +layer at (8,146) size 306x156 RenderBlock (positioned) {DIV} at (0,96) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.png index f2fc447b1374..b678b5ea5ae8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.txt index d0a2376c95e8..37bb86ca6131 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-033-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,145) size 306x102 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,146) size 306x102 RenderIFrame {IFRAME} at (0,96) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,145) size 306x102 +layer at (8,146) size 306x102 RenderBlock (positioned) {DIV} at (0,96) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.png index 83f943487c52..c3d75373bd5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.txt index 62ad5f263d3e..15c9cde0bfdb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-035-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 RenderView at (0,0) size 285x0 layer at (0,0) size 285x8 RenderBlock {HTML} at (0,0) size 285x8 RenderBody {BODY} at (8,8) size 269x0 -layer at (8,145) size 306x6 +layer at (8,146) size 306x6 RenderBlock (positioned) {DIV} at (0,96) size 306x6 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-036-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-036-expected.txt index 7579a4083b43..37d570db2c95 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-036-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-height-036-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x102 - RenderBlock {HTML} at (0,0) size 800x102 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x103 + RenderBlock {HTML} at (0,0) size 800x103 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 138x17 text run at (0,0) width 138: "There must be no red." -layer at (8,49) size 45x45 - RenderBlock (relative positioned) {DIV} at (0,33) size 45x45 +layer at (8,50) size 45x45 + RenderBlock (relative positioned) {DIV} at (0,34) size 45x45 RenderBlock {DIV} at (0,0) size 45x15 [border: none (15px solid #FF0000) none] RenderBlock {DIV} at (0,15) size 45x15 [border: none (15px solid #FF0000)] RenderBlock {DIV} at (15,30) size 15x15 [bgcolor=#FF0000] -layer at (8,64) size 15x15 +layer at (8,65) size 15x15 RenderImage {IMG} at (0,15) size 15x15 [bgcolor=#FF0000] -layer at (23,79) size 15x15 +layer at (23,80) size 15x15 RenderImage {IMG} at (15,30) size 15x15 [bgcolor=#FF0000] -layer at (38,49) size 15x15 +layer at (38,50) size 15x15 RenderImage {IMG} at (30,0) size 15x15 [bgcolor=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.png index 127a67a5e811..89ddfac3d9d5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.txt index 22ec05677730..c8aa1cd91f2e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-001-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500] -layer at (11,69) size 15x15 - RenderImage {IMG} at (11,69) size 15x15 +layer at (11,71) size 15x15 + RenderImage {IMG} at (11,71) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.png index cb77ebe4499b..bd1778c60853 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.txt index 8ba055914553..8e919d4a401d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-006-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500] -layer at (11,69) size 96x96 +layer at (11,71) size 96x96 RenderImage {IMG} at (3,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.png index 127a67a5e811..89ddfac3d9d5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.txt index 22ec05677730..c8aa1cd91f2e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-008-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500] -layer at (11,69) size 15x15 - RenderImage {IMG} at (11,69) size 15x15 +layer at (11,71) size 15x15 + RenderImage {IMG} at (11,71) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.png index cb77ebe4499b..bd1778c60853 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.txt index 8ba055914553..8e919d4a401d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-013-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500] -layer at (11,69) size 96x96 +layer at (11,71) size 96x96 RenderImage {IMG} at (3,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.png index ee4fc76c6523..772f6870722e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.txt index bf87c876be95..0b24238ccc43 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-015-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 780x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 780x35 text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (180,18) size 15x15 [bgcolor=#FFA500] -layer at (188,69) size 15x15 +layer at (188,71) size 15x15 RenderImage {IMG} at (180,3) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.png index 9b7a0b7f29da..f8ac9bf4841f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.txt index 2f53cf924244..cf10b0de6f94 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-020-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 780x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 780x35 text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,69) size 96x96 +layer at (107,71) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.png index 848f60a0fb5b..ed69e2c16ad5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.txt index ac315c76c96f..77c17f7b327f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-022-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 780x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 780x35 text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,69) size 96x96 +layer at (107,71) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.png index 9b7a0b7f29da..f8ac9bf4841f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.txt index 2f53cf924244..cf10b0de6f94 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-027-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 780x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 780x35 text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,69) size 96x96 +layer at (107,71) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.png index 848f60a0fb5b..ed69e2c16ad5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.txt index ac315c76c96f..77c17f7b327f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-029-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 780x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 780x35 text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,69) size 96x96 +layer at (107,71) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.png index 9b7a0b7f29da..f8ac9bf4841f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.txt index 2f53cf924244..cf10b0de6f94 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-034-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 780x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 780x35 text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,69) size 96x96 +layer at (107,71) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.png index bcb293cb325c..b89a7d677dca 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.txt index 8f654509d5e9..b8e9ebb3df10 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-036-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.png index 4bc8905a3dda..9f877fad9038 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.txt index d98c88d56169..7559e1374a1e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-041-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.png index bcb293cb325c..b89a7d677dca 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.txt index 8f654509d5e9..b8e9ebb3df10 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-043-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.png index 4bc8905a3dda..9f877fad9038 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.txt index d98c88d56169..7559e1374a1e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-048-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.png index bcb293cb325c..b89a7d677dca 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.txt index 8f654509d5e9..b8e9ebb3df10 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-050-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.png index 4bc8905a3dda..9f877fad9038 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.txt index d98c88d56169..7559e1374a1e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-055-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.png index bcb293cb325c..b89a7d677dca 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.txt index 8f654509d5e9..b8e9ebb3df10 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-057-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.png index 4bc8905a3dda..9f877fad9038 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.txt index d98c88d56169..7559e1374a1e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-062-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.png index bcb293cb325c..b89a7d677dca 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.txt index 8f654509d5e9..b8e9ebb3df10 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-064-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.png index 4bc8905a3dda..9f877fad9038 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.txt index d98c88d56169..7559e1374a1e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-069-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.png index bcb293cb325c..b89a7d677dca 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.txt index 8f654509d5e9..b8e9ebb3df10 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-071-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.png index 4bc8905a3dda..9f877fad9038 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.txt index d98c88d56169..7559e1374a1e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/absolute-replaced-width-076-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 774x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 774x35 text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" - text run at (0,17) width 28: "box." -layer at (8,66) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." +layer at (8,68) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,69) size 96x96 +layer at (59,71) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.png index e2d484934b8c..0431cea45748 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.txt index 42e0be7190d0..043c32431c8a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-001-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 80x100 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 80x100 RenderBlock (positioned) {DIV} at (10,10) size 80x100 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 80x100 +layer at (26,188) size 80x100 RenderBlock (positioned) {DIV} at (10,10) size 80x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.png index e2d484934b8c..0431cea45748 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.txt index 765cdc6e13ee..6dee2a47d614 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-002-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 60x100 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 60x100 RenderBlock (positioned) {DIV} at (10,10) size 60x100 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 60x100 +layer at (26,188) size 60x100 RenderBlock (positioned) {DIV} at (10,10) size 60x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.png index e2d484934b8c..0431cea45748 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.txt index df6faff26fe5..d5700a896a3d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-003-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 80x60 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 80x60 RenderBlock (positioned) {DIV} at (10,10) size 80x60 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 80x60 +layer at (26,188) size 80x60 RenderBlock (positioned) {DIV} at (10,10) size 80x60 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.png index 4eaaaf7617ed..b266739e2530 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.txt index 4e32cd971936..f5d75dc41997 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-004-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 66x100 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 66x100 RenderBlock (positioned) {DIV} at (10,10) size 66x100 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 67x100 +layer at (26,188) size 67x100 RenderBlock (positioned) {DIV} at (10,10) size 67x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.png index 2077ef41b66f..b81887934932 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.txt index f88d11664b8a..343551bb2010 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-005-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 80x53 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 80x53 RenderBlock (positioned) {DIV} at (10,10) size 80x53 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 80x54 +layer at (26,188) size 80x54 RenderBlock (positioned) {DIV} at (10,10) size 80x54 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.png index e2d484934b8c..5b1f33eb7f8e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.txt index af10bf549093..c09194b172c9 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-006-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 32x60 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 32x60 RenderBlock (positioned) {DIV} at (10,10) size 32x60 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 32x60 +layer at (26,188) size 32x60 RenderBlock (positioned) {DIV} at (10,10) size 32x60 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.png index e2d484934b8c..0431cea45748 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.txt index 33a48dff96fe..a45ec0b49c54 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-007-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 40x60 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 40x60 RenderBlock (positioned) {DIV} at (10,10) size 40x60 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 40x60 +layer at (26,188) size 40x60 RenderBlock (positioned) {DIV} at (10,10) size 40x60 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.png index e2d484934b8c..0431cea45748 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.txt index 33a48dff96fe..a45ec0b49c54 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-008-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 40x60 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 40x60 RenderBlock (positioned) {DIV} at (10,10) size 40x60 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 40x60 +layer at (26,188) size 40x60 RenderBlock (positioned) {DIV} at (10,10) size 40x60 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.png index e2d484934b8c..0431cea45748 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.txt index 33a48dff96fe..a45ec0b49c54 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/background-intrinsic-009-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x305 - RenderBlock {HTML} at (0,0) size 800x305 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x306 + RenderBlock {HTML} at (0,0) size 800x306 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "There must be two green boxes below and no red." -layer at (16,49) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,33) size 120x120 [bgcolor=#008000] -layer at (26,59) size 40x60 +layer at (16,50) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000] +layer at (26,60) size 40x60 RenderBlock (positioned) {DIV} at (10,10) size 40x60 [bgcolor=#FF0000] -layer at (16,49) size 100x120 +layer at (16,50) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (16,177) size 120x120 - RenderBlock (relative positioned) {DIV} at (8,161) size 120x120 [bgcolor=#008000] -layer at (16,177) size 100x120 +layer at (16,178) size 120x120 + RenderBlock (relative positioned) {DIV} at (8,162) size 120x120 [bgcolor=#008000] +layer at (16,178) size 100x120 RenderBlock (relative positioned) {DIV} at (0,0) size 100x120 [border: (10px solid #00000000)] -layer at (26,187) size 40x60 +layer at (26,188) size 40x60 RenderBlock (positioned) {DIV} at (10,10) size 40x60 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.png index aca33253956c..79acaafc66ec 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.txt index a9882105637b..0bd540409054 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x80 - RenderBlock {HTML} at (0,0) size 800x80 - RenderBody {BODY} at (8,16) size 784x56 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x82 + RenderBlock {HTML} at (0,0) size 800x82 + RenderBody {BODY} at (8,16) size 784x58 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock {DIV} at (0,33) size 96x23 [border: (3px solid #FFA500) none (3px solid #FFA500) none] - RenderBlock {DIV} at (0,3) size 96x17 [bgcolor=#0000FF] + RenderBlock {DIV} at (0,34) size 96x24 [border: (3px solid #FFA500) none (3px solid #FFA500) none] + RenderBlock {DIV} at (0,3) size 96x18 [bgcolor=#0000FF] RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.png index 919ad2ec181f..7471c7c955b5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.txt index c24048815804..f8c8ea315260 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-002-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x103 - RenderBlock {HTML} at (0,0) size 785x103 -layer at (8,8) size 769x87 clip at (8,8) size 754x72 - RenderBody {BODY} at (8,8) size 769x87 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x105 + RenderBlock {HTML} at (0,0) size 785x105 +layer at (8,8) size 769x89 clip at (8,8) size 754x74 + RenderBody {BODY} at (8,8) size 769x89 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock {DIV} at (0,49) size 96x23 [border: (3px solid #FFA500) none (3px solid #FFA500) none] - RenderBlock {DIV} at (0,3) size 96x17 [bgcolor=#0000FF] + RenderBlock {DIV} at (0,50) size 96x24 [border: (3px solid #FFA500) none (3px solid #FFA500) none] + RenderBlock {DIV} at (0,3) size 96x18 [bgcolor=#0000FF] RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.png index df27aaa2e325..3a1286444479 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.txt index f16cea849d3f..1f3f1ca5550b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-003-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,49) size 96x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,50) size 96x192 RenderBlock (relative positioned) {DIV} at (0,0) size 96x192 -layer at (8,49) size 96x192 +layer at (8,50) size 96x192 RenderBlock (relative positioned) {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] -layer at (104,49) size 96x192 +layer at (104,50) size 96x192 RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.png index f5028b00e9d7..8f47469048e5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.txt index 3a80be066fb1..81aa8fa42b45 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-004-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x272 - RenderBlock {HTML} at (0,0) size 785x272 -layer at (8,8) size 769x256 clip at (8,8) size 754x241 - RenderBody {BODY} at (8,8) size 769x256 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x273 + RenderBlock {HTML} at (0,0) size 785x273 +layer at (8,8) size 769x257 clip at (8,8) size 754x242 + RenderBody {BODY} at (8,8) size 769x257 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,57) size 754x192 - RenderBlock (relative positioned) {DIV} at (0,49) size 754x192 -layer at (8,57) size 96x192 +layer at (8,58) size 754x192 + RenderBlock (relative positioned) {DIV} at (0,50) size 754x192 +layer at (8,58) size 96x192 RenderBlock (relative positioned) {DIV} at (0,0) size 96x192 -layer at (8,57) size 96x192 +layer at (8,58) size 96x192 RenderBlock (relative positioned) {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] -layer at (104,57) size 96x192 +layer at (104,58) size 96x192 RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.png index e99a9d1a3287..ba5d8bc7bb7c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.txt index 7f9b00388af6..1299ac9c23b8 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-005-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 667x17 text run at (0,0) width 667: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 -layer at (8,49) size 192x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 +layer at (8,50) size 192x192 RenderBlock (relative positioned) {DIV} at (0,0) size 192x192 [bgcolor=#FF0000] RenderInline {SPAN} at (0,0) size 192x192 [color=#0000FF] RenderText {#text} at (0,0) size 192x192 text run at (0,0) width 192: "XX" text run at (0,96) width 192: "XX" RenderText {#text} at (0,0) size 0x0 -layer at (200,49) size 192x192 +layer at (200,50) size 192x192 RenderBlock (positioned) {DIV} at (192,0) size 192x192 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.png index 94116e186650..71183e17800c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.txt index dba451caf51b..ec596b0d919f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-006-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x272 - RenderBlock {HTML} at (0,0) size 785x272 -layer at (8,8) size 769x256 clip at (8,8) size 754x241 - RenderBody {BODY} at (8,8) size 769x256 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x273 + RenderBlock {HTML} at (0,0) size 785x273 +layer at (8,8) size 769x257 clip at (8,8) size 754x242 + RenderBody {BODY} at (8,8) size 769x257 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 667x17 text run at (0,0) width 667: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page." -layer at (8,57) size 754x192 - RenderBlock (relative positioned) {DIV} at (0,49) size 754x192 -layer at (8,57) size 192x192 +layer at (8,58) size 754x192 + RenderBlock (relative positioned) {DIV} at (0,50) size 754x192 +layer at (8,58) size 192x192 RenderBlock (relative positioned) {DIV} at (0,0) size 192x192 [bgcolor=#FF0000] RenderInline {SPAN} at (0,0) size 192x192 [color=#0000FF] RenderText {#text} at (0,0) size 192x192 text run at (0,0) width 192: "XX" text run at (0,96) width 192: "XX" RenderText {#text} at (0,0) size 0x0 -layer at (200,57) size 192x192 +layer at (200,58) size 192x192 RenderBlock (positioned) {DIV} at (192,0) size 192x192 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.png index 241eb42491bc..6be61daf9d6c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.txt index 6e833454dbd8..db256842b8e7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-007-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x321 - RenderBlock {HTML} at (0,0) size 800x321 - RenderBody {BODY} at (8,16) size 784x257 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x322 + RenderBlock {HTML} at (0,0) size 800x322 + RenderBody {BODY} at (8,16) size 784x258 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "Test passes if there is a blue square below." -layer at (8,81) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,65) size 784x192 +layer at (8,82) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,66) size 784x192 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none] RenderBlock {DIV} at (0,96) size 96x96 [bgcolor=#0000FF] [border: none (48px solid #0000FF) none] -layer at (104,81) size 96x192 +layer at (104,82) size 96x192 RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.png index f3e1ba650774..e0c2682c3929 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.txt index 9b18add0e19d..ac36f009e8f2 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-008-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x352 - RenderBlock {HTML} at (0,0) size 785x352 -layer at (8,8) size 769x336 clip at (8,8) size 754x321 - RenderBody {BODY} at (8,8) size 769x336 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x353 + RenderBlock {HTML} at (0,0) size 785x353 +layer at (8,8) size 769x337 clip at (8,8) size 754x322 + RenderBody {BODY} at (8,8) size 769x337 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "Test passes if there is a blue square below." -layer at (8,89) size 754x192 - RenderBlock (relative positioned) {DIV} at (0,81) size 754x192 +layer at (8,90) size 754x192 + RenderBlock (relative positioned) {DIV} at (0,82) size 754x192 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none] RenderBlock {DIV} at (0,96) size 96x96 [bgcolor=#0000FF] [border: none (48px solid #0000FF) none] -layer at (104,89) size 96x192 +layer at (104,90) size 96x192 RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.png index 4e3844cb530d..c5c94eabd341 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.txt index ebbcb16263a1..1419bb6bcb9a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-009-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "Test passes if there is a blue square below." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 RenderBlock {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] [border: (24px solid #0000FF) none (24px solid #0000FF) none] RenderBlock {DIV} at (0,48) size 96x48 [border: (24px solid #0000FF) none] RenderBlock {DIV} at (0,96) size 96x48 [border: none (24px solid #0000FF) none] -layer at (104,49) size 96x192 +layer at (104,50) size 96x192 RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.png index 230fcdb8292e..626328e9360e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.txt index 5c4b58fb0522..a98a0bc62201 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-010-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x272 - RenderBlock {HTML} at (0,0) size 785x272 -layer at (8,8) size 769x256 clip at (8,8) size 754x241 - RenderBody {BODY} at (8,8) size 769x256 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x273 + RenderBlock {HTML} at (0,0) size 785x273 +layer at (8,8) size 769x257 clip at (8,8) size 754x242 + RenderBody {BODY} at (8,8) size 769x257 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "Test passes if there is a blue square below." -layer at (8,57) size 754x192 - RenderBlock (relative positioned) {DIV} at (0,49) size 754x192 +layer at (8,58) size 754x192 + RenderBlock (relative positioned) {DIV} at (0,50) size 754x192 RenderBlock {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] [border: (24px solid #0000FF) none (24px solid #0000FF) none] RenderBlock {DIV} at (0,48) size 96x48 [border: (24px solid #0000FF) none] RenderBlock {DIV} at (0,96) size 96x48 [border: none (24px solid #0000FF) none] -layer at (104,57) size 96x192 +layer at (104,58) size 96x192 RenderBlock (positioned) {DIV} at (96,0) size 96x192 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-011-expected.txt index d4b8700bec5e..f51eb7dd56c4 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-011-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x145 - RenderBlock {HTML} at (0,0) size 800x145 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x146 + RenderBlock {HTML} at (0,0) size 800x146 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock {DIV} at (0,33) size 784x0 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.png index 58553c654325..499e68017283 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.txt index aad1c31f474b..56764ba6139d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-012-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x176 - RenderBlock {HTML} at (0,0) size 785x176 -layer at (8,8) size 769x160 clip at (8,8) size 754x145 - RenderBody {BODY} at (8,8) size 769x160 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x177 + RenderBlock {HTML} at (0,0) size 785x177 +layer at (8,8) size 769x161 clip at (8,8) size 754x146 + RenderBody {BODY} at (8,8) size 769x161 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock {DIV} at (0,49) size 754x0 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,50) size 754x0 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-013-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-013-expected.txt index c4a9959974c7..7594774440df 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-013-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-013-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock {DIV} at (0,33) size 784x0 [bgcolor=#FF0000] -layer at (8,49) size 96x96 - RenderBlock (positioned) {DIV} at (8,49) size 96x96 + RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000] +layer at (8,50) size 96x96 + RenderBlock (positioned) {DIV} at (8,50) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.png index 53b8141d3316..ce80b783f0f3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.txt index 5f9aa309ecbc..dc69583894af 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-014-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x80 - RenderBlock {HTML} at (0,0) size 785x80 -layer at (8,8) size 769x64 clip at (8,8) size 754x49 - RenderBody {BODY} at (8,8) size 769x64 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x81 + RenderBlock {HTML} at (0,0) size 785x81 +layer at (8,8) size 769x65 clip at (8,8) size 754x50 + RenderBody {BODY} at (8,8) size 769x65 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock {DIV} at (0,49) size 754x0 [bgcolor=#FF0000] -layer at (8,57) size 96x96 - RenderBlock (positioned) {DIV} at (8,57) size 96x96 + RenderBlock {DIV} at (0,50) size 754x0 [bgcolor=#FF0000] +layer at (8,58) size 96x96 + RenderBlock (positioned) {DIV} at (8,58) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.txt index 6f9c81ce5133..96b9dfba822a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-015-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x96 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x96 +layer at (8,50) size 784x96 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x96 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] -layer at (8,145) size 96x96 +layer at (8,146) size 96x96 RenderBlock (relative positioned) {DIV} at (0,0) size 96x96 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.png index 71174181011d..2b1d23b3a01d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.txt index f93cdbad4290..c13f6bde13dd 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-height-016-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 785x585 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x176 - RenderBlock {HTML} at (0,0) size 785x176 -layer at (8,8) size 769x160 clip at (8,8) size 754x145 scrollHeight 241 - RenderBody {BODY} at (8,8) size 769x160 - RenderBlock {P} at (0,16) size 754x17 +layer at (0,0) size 785x177 + RenderBlock {HTML} at (0,0) size 785x177 +layer at (8,8) size 769x161 clip at (8,8) size 754x146 scrollHeight 242 + RenderBody {BODY} at (8,8) size 769x161 + RenderBlock {P} at (0,16) size 754x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,57) size 754x96 - RenderBlock (relative positioned) {DIV} at (0,49) size 754x96 +layer at (8,58) size 754x96 + RenderBlock (relative positioned) {DIV} at (0,50) size 754x96 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] -layer at (104,57) size 96x96 +layer at (104,58) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.png index 0aff33f52b73..b72f291110be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.txt index 9b3269237605..b7177de6037f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x90 - RenderBlock {HTML} at (0,0) size 800x90 - RenderBody {BODY} at (8,16) size 784x66 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x92 + RenderBlock {HTML} at (0,0) size 800x92 + RenderBody {BODY} at (8,16) size 784x68 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 422x17 text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width." - RenderBlock (anonymous) at (0,33) size 784x33 + RenderBlock (anonymous) at (0,34) size 784x34 RenderBlock {DIV} at (0,0) size 150x30 [bgcolor=#FFA500] [border: (5px solid #FFA500)] RenderBlock {DIV} at (15,5) size 120x20 [border: none (10px solid #FFA500) none (10px solid #FFA500)] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.png index 0aff33f52b73..b72f291110be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.txt index 7511d3dbe3e2..dc9facf990e9 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-002-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x87 - RenderBlock {HTML} at (0,0) size 800x87 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x88 + RenderBlock {HTML} at (0,0) size 800x88 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 422x17 text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width." - RenderBlock {DIV} at (0,33) size 100x30 + RenderBlock {DIV} at (0,34) size 100x30 RenderBlock {DIV} at (0,0) size 150x30 [bgcolor=#FFA500] [border: none (10px solid #FFA500) none (10px solid #FFA500)] layer at (8,82) size 150x30 RenderBlock (positioned) {DIV} at (8,82) size 150x30 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.png index 0aff33f52b73..b72f291110be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.txt index 3e3bd633c83b..36d7464e8b4b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-003-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x87 - RenderBlock {HTML} at (0,0) size 800x87 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x88 + RenderBlock {HTML} at (0,0) size 800x88 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 422x17 text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width." - RenderBlock {DIV} at (0,33) size 100x30 [bgcolor=#FFA500] + RenderBlock {DIV} at (0,34) size 100x30 [bgcolor=#FFA500] RenderBlock {DIV} at (10,0) size 140x30 [border: none (10px solid #FFA500) none (10px solid #FFA500)] layer at (8,82) size 150x30 RenderBlock (positioned) {DIV} at (8,82) size 150x30 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.png index ae644d4d00d1..501ddd9c6c6c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.txt index b615830a6401..93deac3392b6 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-004-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x87 - RenderBlock {HTML} at (0,0) size 800x87 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x88 + RenderBlock {HTML} at (0,0) size 800x88 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 422x17 text run at (0,0) width 422: "Test passes if the orange and blue boxes below are the same width." -layer at (8,49) size 784x30 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x30 -layer at (692,49) size 100x30 +layer at (8,50) size 784x30 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x30 +layer at (692,50) size 100x30 RenderBlock (relative positioned) {DIV} at (684,0) size 100x30 [bgcolor=#FFA500] -layer at (642,49) size 140x30 +layer at (642,50) size 140x30 RenderBlock (relative positioned) {DIV} at (-50,0) size 140x30 [border: none (10px solid #FFA500) none (10px solid #FFA500)] -layer at (642,79) size 150x30 +layer at (642,80) size 150x30 RenderBlock (positioned) {DIV} at (634,30) size 150x30 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.png index b2a19bbc1a94..aca5bc0e867f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.txt index 5fff4b09dbb1..99d2693a84dd 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-005-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x89 - RenderBlock {HTML} at (0,0) size 800x89 - RenderBody {BODY} at (0,16) size 800x73 - RenderBlock {P} at (0,0) size 800x17 +layer at (0,0) size 800x90 + RenderBlock {HTML} at (0,0) size 800x90 + RenderBody {BODY} at (0,16) size 800x74 + RenderBlock {P} at (0,0) size 800x18 RenderText {#text} at (0,0) size 639x17 text run at (0,0) width 639: "Test passes if the box below spans the entire width of the page and there is no red visible on the page." - RenderBlock {DIV} at (0,33) size 800x40 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 800x40 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 800x40 [bgcolor=#008000] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.png index b2a19bbc1a94..aca5bc0e867f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.txt index 59ef5e37054e..f11a1e1c929c 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-006-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x89 - RenderBlock {HTML} at (0,0) size 800x89 - RenderBody {BODY} at (0,16) size 800x73 - RenderBlock {P} at (0,0) size 800x17 +layer at (0,0) size 800x90 + RenderBlock {HTML} at (0,0) size 800x90 + RenderBody {BODY} at (0,16) size 800x74 + RenderBlock {P} at (0,0) size 800x18 RenderText {#text} at (0,0) size 639x17 text run at (0,0) width 639: "Test passes if the box below spans the entire width of the page and there is no red visible on the page." - RenderBlock {DIV} at (0,33) size 800x40 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 800x40 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 800x40 [bgcolor=#008000] [border: (10px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.png index 44c2a4b43ea6..5ebb5d8f7dcc 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.txt index 317bb456133c..3b32d0269fd9 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-007-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 694x17 text run at (0,0) width 694: "Test passes if the blue and orange boxes are the same width and the blue box is directly below the orange box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,3) size 96x96 [bgcolor=#FFA500] [border: none (24px solid #FFA500) none (24px solid #FFA500)] RenderBlock {DIV} at (3,99) size 192x96 [color=#0000FF] RenderText {#text} at (48,0) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.png index 3c4cdd84a3f2..c1049db9e4cf 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.txt index a74c374b864d..fd89aaecf904 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-non-replaced-width-008-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x257 - RenderBlock {HTML} at (0,0) size 800x257 - RenderBody {BODY} at (8,16) size 784x233 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x258 + RenderBlock {HTML} at (0,0) size 800x258 + RenderBody {BODY} at (8,16) size 784x234 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 338x17 text run at (0,0) width 338: "Test passes if there is a filled green square below and " RenderInline {STRONG} at (0,0) size 44x17 @@ -11,5 +11,5 @@ layer at (0,0) size 800x257 text run at (338,0) width 44: "no red" RenderText {#text} at (382,0) size 4x17 text run at (382,0) width 4: "." - RenderBlock {DIV} at (0,33) size 400x200 [border: none (200px solid #FF0000) none] + RenderBlock {DIV} at (0,34) size 400x200 [border: none (200px solid #FF0000) none] RenderBlock {DIV} at (0,0) size 400x200 [border: none (200px solid #008000) none] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.png index 104441a9298a..cf0476c62fb8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.txt index 52a704b54fc5..8f45dc7737eb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-001-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x78 - RenderBlock {HTML} at (0,0) size 800x78 - RenderBody {BODY} at (8,16) size 784x54 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x79 + RenderBlock {HTML} at (0,0) size 800x79 + RenderBody {BODY} at (8,16) size 784x55 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock {DIV} at (0,33) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] + RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.png index 9812d5850e5f..e3c2606d61d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.txt index be6e9da646e5..3dbd56d5adc5 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-002-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x72 - RenderBlock {HTML} at (0,0) size 800x72 - RenderBody {BODY} at (8,16) size 784x48 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x73 + RenderBlock {HTML} at (0,0) size 800x73 + RenderBody {BODY} at (8,16) size 784x49 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x15 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x15 +layer at (8,50) size 784x15 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x15 RenderImage {IMG} at (0,0) size 15x15 -layer at (23,49) size 15x15 +layer at (23,50) size 15x15 RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.txt index 8cefc76b0f17..c4fe783b1221 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-003-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x96 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x96 +layer at (8,50) size 784x96 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.txt index 171b907b8f21..bae2ff488edf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-004-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x213 - RenderBlock {HTML} at (0,0) size 800x213 - RenderBody {BODY} at (8,16) size 784x189 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,16) size 784x190 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x156 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x156 +layer at (8,50) size 784x156 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.png index 81e3387873db..6eb3b4fe00e6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.txt index 553a266ba232..4941382d034b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-005-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,49) size 306x102 +layer at (8,50) size 306x102 RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.txt index 171b907b8f21..bae2ff488edf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-height-007-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x213 - RenderBlock {HTML} at (0,0) size 800x213 - RenderBody {BODY} at (8,16) size 784x189 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,16) size 784x190 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x156 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x156 +layer at (8,50) size 784x156 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.png index 0fe9cd3f8242..518d1916a947 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.txt index fe58227340aa..46cee353d1ab 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 773x17 text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (91,3) size 16x15 RenderBlock {DIV} at (3,18) size 192x15 [color=#FFA500] RenderText {#text} at (88,0) size 16x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.png index ec212936c35f..cd28a15bff07 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.txt index b0f6e744c81d..48ceece757a5 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/block-replaced-width-006-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x351 - RenderBlock {HTML} at (0,0) size 800x351 - RenderBody {BODY} at (8,16) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,16) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 773x17 text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box." - RenderBlock {DIV} at (0,33) size 198x294 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x294 [border: (3px solid #000000)] RenderImage {IMG} at (51,3) size 96x96 RenderBlock {DIV} at (3,99) size 192x96 [color=#FFA500] RenderText {#text} at (48,0) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.png index 083094ae1bc7..a8c1a6a27d43 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.txt index 5a10b3e0bb7e..51879bbca71a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/border-collapse-offset-002-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x81 - RenderBlock {HTML} at (0,0) size 800x81 - RenderBody {BODY} at (8,8) size 784x65 - RenderTable {TABLE} at (0,0) size 110x65 [border: (2px none #808080)] - RenderBlock {CAPTION} at (0,0) size 110x25 [border: (4px solid #008000)] +layer at (0,0) size 800x82 + RenderBlock {HTML} at (0,0) size 800x82 + RenderBody {BODY} at (8,8) size 784x66 + RenderTable {TABLE} at (0,0) size 110x66 [border: (2px none #808080)] + RenderBlock {CAPTION} at (0,0) size 110x26 [border: (4px solid #008000)] RenderText {#text} at (32,4) size 46x17 text run at (32,4) width 46: "caption" - RenderTableSection {TBODY} at (2,27) size 106x36 + RenderTableSection {TBODY} at (2,28) size 106x36 RenderTableRow {TR} at (0,0) size 106x36 RenderTableCell {TD} at (0,6) size 106x24 [border: (2px solid #FFA500)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (36,3) size 34x18 - text run at (36,4) width 34: "cell 1" + RenderText {#text} at (36,3) size 34x17 + text run at (36,3) width 34: "cell 1" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.png index 533d40f3d8b2..64e4c576f407 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.txt index 3e194d4c7422..caea4a5963e3 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-079-expected.txt @@ -1,44 +1,44 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x307 - RenderBlock {HTML} at (0,0) size 800x307 - RenderBody {BODY} at (8,16) size 784x283 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x308 + RenderBlock {HTML} at (0,0) size 800x308 + RenderBody {BODY} at (8,16) size 784x284 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 466x17 text run at (0,0) width 466: "Test passes if the center box in the table below has a border similar to this:" - RenderTable {TABLE} at (0,33) size 60x60 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 60x60 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 55x55 RenderTableRow {TR} at (0,0) size 55x55 RenderTableCell {TD} at (0,24) size 55x7 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderTable {TABLE} at (0,113) size 170x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,114) size 170x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 165x165 RenderTableRow {TR} at (0,0) size 165x55 RenderTableCell {TD} at (0,15) size 55x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (55,15) size 55x25 [border: (3px outset #00FF00) (2px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (110,15) size 55x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,55) size 165x55 RenderTableCell {TD} at (0,70) size 55x25 [border: (3px outset #00FF00) (2px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (55,70) size 55x25 [border: (3px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (110,70) size 55x25 [border: (3px outset #00FF00) (3px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,110) size 165x55 RenderTableCell {TD} at (0,125) size 55x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (55,125) size 55x25 [border: (3px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (110,125) size 55x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.png index bf28a816d51f..6dad115ef967 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.txt index 0c759bbb50e5..9c2954afe452 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/border-conflict-style-088-expected.txt @@ -1,44 +1,44 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x307 - RenderBlock {HTML} at (0,0) size 800x307 - RenderBody {BODY} at (8,16) size 784x283 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x308 + RenderBlock {HTML} at (0,0) size 800x308 + RenderBody {BODY} at (8,16) size 784x284 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 466x17 text run at (0,0) width 466: "Test passes if the center box in the table below has a border similar to this:" - RenderTable {TABLE} at (0,33) size 60x60 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 60x60 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 55x55 RenderTableRow {TR} at (0,0) size 55x55 RenderTableCell {TD} at (0,24) size 55x7 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderTable {TABLE} at (0,113) size 170x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,114) size 170x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 165x165 RenderTableRow {TR} at (0,0) size 165x55 RenderTableCell {TD} at (0,15) size 55x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (55,15) size 55x25 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (110,15) size 55x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,55) size 165x55 RenderTableCell {TD} at (0,70) size 55x25 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (55,70) size 55x25 [border: (3px outset #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (110,70) size 55x25 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,110) size 165x55 RenderTableCell {TD} at (0,125) size 55x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (55,125) size 55x25 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (110,125) size 55x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.png index 9aa6e185144b..908bb82a6163 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.txt index 4d136689cd3c..6fd27346bdcd 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/border-spacing-applies-to-015-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x297 - RenderBlock {HTML} at (0,0) size 800x297 - RenderBody {BODY} at (8,16) size 784x273 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x298 + RenderBlock {HTML} at (0,0) size 800x298 + RenderBody {BODY} at (8,16) size 784x274 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 645x17 text run at (0,0) width 645: "Test passes if there is a blue and orange square below and there is no vertical gap between the squares." - RenderTable {DIV} at (0,33) size 120x240 + RenderTable {DIV} at (0,34) size 120x240 RenderBlock {DIV} at (0,0) size 120x120 [border: (10px solid #0000FF)] RenderBlock {DIV} at (0,120) size 120x120 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.png index 4e604073c001..5ade0e9301c9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.txt index 7353c7debadf..200c4bf77570 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/c543-txt-decor-000-expected.txt @@ -1,21 +1,21 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x417 - RenderBlock {HTML} at (0,0) size 800x417 - RenderBody {BODY} at (8,16) size 784x385 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x430 + RenderBlock {HTML} at (0,0) size 800x430 + RenderBody {BODY} at (8,16) size 784x398 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "This sentence should be underlined." - RenderBlock {P} at (0,33) size 784x17 [color=#000080] + RenderBlock {P} at (0,34) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 218x17 text run at (0,0) width 218: "This sentence should be overlined." - RenderBlock {P} at (0,66) size 784x17 [color=#000080] + RenderBlock {P} at (0,68) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 232x17 text run at (0,0) width 232: "This sentence should be stricken out." - RenderBlock {P} at (0,99) size 784x17 [color=#000080] + RenderBlock {P} at (0,102) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 369x17 text run at (0,0) width 369: "This sentence should be blinking (if the UA supports that)." - RenderBlock {P} at (0,132) size 784x17 [color=#000080] + RenderBlock {P} at (0,136) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "The sentence should be underlined. " RenderInline {B} at (0,0) size 238x17 @@ -23,20 +23,20 @@ layer at (0,0) size 800x417 text run at (227,0) width 238: "This sentence should be underlined" RenderText {#text} at (465,0) size 4x17 text run at (465,0) width 4: "." - RenderBlock {P} at (0,165) size 784x17 [color=#000080] + RenderBlock {P} at (0,170) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 316x17 text run at (0,0) width 316: "This sentence should be underlined and overlined." - RenderBlock {P} at (0,198) size 784x17 [color=#000080] + RenderBlock {P} at (0,204) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 377x17 text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." - RenderBlock {DIV} at (0,231) size 784x0 [color=#FF0000] - RenderBlock {P} at (0,231) size 784x18 [color=#000080] + RenderBlock {DIV} at (0,238) size 784x0 [color=#FF0000] + RenderBlock {P} at (0,238) size 784x19 [color=#000080] RenderText {#text} at (0,1) size 285x17 text run at (0,1) width 285: "There should be no red at the end of this line." RenderImage {IMG} at (285,0) size 15x15 [color=#FF0000] RenderText {#text} at (300,1) size 4x17 text run at (300,1) width 4: " " - RenderBlock {P} at (0,265) size 784x37 [color=#000080] + RenderBlock {P} at (0,273) size 784x39 [color=#000080] RenderText {#text} at (0,3) size 199x17 text run at (0,3) width 199: "The text of this sentence and all" RenderInline {SPAN} at (0,0) size 4x17 @@ -53,26 +53,26 @@ layer at (0,0) size 800x417 RenderText {#text} at (546,3) size 4x17 text run at (546,3) width 4: " " RenderImage {IMG} at (550,0) size 17x17 [color=#FF0000] - RenderText {#text} at (567,3) size 754x34 + RenderText {#text} at (567,3) size 754x35 text run at (567,3) width 4: " " text run at (571,3) width 183: "should be underlined, but the" - text run at (0,20) width 167: "images themselves should " + text run at (0,21) width 167: "images themselves should " RenderInline {EM} at (0,0) size 20x17 - RenderText {#text} at (167,20) size 20x17 - text run at (167,20) width 20: "not" - RenderText {#text} at (187,20) size 94x17 - text run at (187,20) width 94: " be underlined." - RenderBlock {P} at (0,318) size 784x34 [color=#000080] + RenderText {#text} at (167,21) size 20x17 + text run at (167,21) width 20: "not" + RenderText {#text} at (187,21) size 94x17 + text run at (187,21) width 94: " be underlined." + RenderBlock {P} at (0,328) size 784x36 [color=#000080] RenderText {#text} at (0,0) size 568x17 text run at (0,0) width 478: "This sentence should have a long blue underline including between the two " text run at (478,0) width 90: "arrows here\x{2192}" RenderInline {SPAN} at (0,0) size 164x17 [color=#FFFFFF] RenderText {#text} at (568,0) size 164x17 text run at (568,0) width 164: " FAIL FAIL FAIL FAIL " - RenderText {#text} at (732,0) size 771x34 + RenderText {#text} at (732,0) size 771x35 text run at (732,0) width 39: "\x{2190}and" - text run at (0,17) width 31: "here." - RenderBlock {P} at (0,368) size 784x17 [color=#000080] + text run at (0,18) width 31: "here." + RenderBlock {P} at (0,380) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 343x17 text run at (0,0) width 343: "There should be a long blue underline between here\x{2192}" RenderInline {SPAN} at (0,0) size 88x17 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.png index 2762fe7c76e1..5e54965b59e8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.txt index a0a02758ad7f..b32f19dcd2bf 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 150x17 text run at (0,0) width 150: "There should be no red." -layer at (8,145) size 100x100 +layer at (8,146) size 100x100 RenderBlock (positioned) {DIV} at (0,32) size 100x100 [bgcolor=#FF0000] -layer at (8,145) size 100x100 +layer at (8,146) size 100x100 RenderBlock (positioned) {DIV} at (0,64) size 100x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-002-expected.txt index a486ff697782..456ae829d3a0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-002-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 150x17 text run at (0,0) width 150: "There should be no red." layer at (8,32) size 100x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-003-expected.txt index e3d4232c47c1..c55b414fe913 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-003-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 150x17 text run at (0,0) width 150: "There should be no red." layer at (8,32) size 100x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-004-expected.txt index d1cee7a1832b..d1472e443603 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/dynamic-top-change-004-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 150x17 text run at (0,0) width 150: "There should be no red." layer at (8,32) size 100x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-001-expected.txt index bf4bba891666..3457827ecd7c 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-001-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 261x17 text run at (0,0) width 261: "Test passes if there is no red on this page." - RenderBlock {DIV} at (0,33) size 784x0 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000] RenderInline {SPAN} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.png index 43afa8c3e7aa..e6fee9a250ec 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.txt index 589bbaf17ae3..d2e9b9cf0efe 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-002-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x425 layerType: background only -layer at (8,129) size 528x144 +layer at (0,0) size 800x426 layerType: background only +layer at (8,130) size 528x144 RenderBlock (relative positioned) zI: -1 {DIV} at (0,144) size 528x144 [border: (24px solid #FF0000)] -layer at (128,33) size 240x336 +layer at (128,34) size 240x336 RenderBlock (relative positioned) {DIV} at (120,24) size 240x336 [bgcolor=#FF0000] [border: (24px solid #FF0000)] -layer at (0,0) size 800x425 layerType: foreground only - RenderBlock {HTML} at (0,0) size 800x425 - RenderBody {BODY} at (8,16) size 784x401 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x426 layerType: foreground only + RenderBlock {HTML} at (0,0) size 800x426 + RenderBody {BODY} at (8,16) size 784x402 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock {DIV} at (0,113) size 784x288 + RenderBlock {DIV} at (0,114) size 784x288 RenderBlock {DIV} at (0,0) size 528x144 [border: (24px solid #008000)] RenderInline {SPAN} at (0,0) size 240x336 [bgcolor=#008000] [border: (24px solid #008000)] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.png index bde8b92ce95c..e31d3d76a3b2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.txt index 035c952b9805..cd0472088a46 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/empty-inline-003-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x137 layerType: background only -layer at (8,49) size 784x80 +layer at (0,0) size 800x138 layerType: background only +layer at (8,50) size 784x80 RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 784x80 [bgcolor=#FF0000] RenderText zI: -1 {#text} at (0,31) size 12x17 text run at (0,31) width 12: "X" -layer at (0,0) size 800x137 layerType: foreground only - RenderBlock {HTML} at (0,0) size 800x137 - RenderBody {BODY} at (8,16) size 784x113 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x138 layerType: foreground only + RenderBlock {HTML} at (0,0) size 800x138 + RenderBody {BODY} at (8,16) size 784x114 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 617x17 text run at (0,0) width 617: "Test passes if there is a wide bright green rectangle below with one \"X\" in it and if there is no red." -layer at (8,49) size 784x80 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x80 +layer at (8,50) size 784x80 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x80 RenderBlock {DIV} at (0,0) size 784x80 [bgcolor=#00FF00] RenderInline {SPAN} at (0,0) size 0x17 RenderText {#text} at (0,31) size 12x17 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.txt index 578ad331ee92..e0480e9e5618 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-height-001-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x145 - RenderBlock {HTML} at (0,0) size 800x145 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x146 + RenderBlock {HTML} at (0,0) size 800x146 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x0 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x0 +layer at (8,50) size 784x0 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x0 RenderBlock (floating) {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] RenderBlock {DIV} at (0,0) size 96x96 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.png index 9225c86aee69..45021bfe21f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.txt index d699e6b0c6b9..bcce29dfac1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-001-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 438x17 text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.png index d7298ba74b26..f89da3f9d2be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.txt index 7cfb92259441..e9cdd8e0ec9f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-002-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 450x17 text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.png index 4e355a1f659c..f79681aa73b4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.txt index 296691c2bdea..945509200ae5 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-003-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 447x17 text run at (0,0) width 447: "Test passes if the blue box is in the upper-right corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (99,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.png index d7298ba74b26..f89da3f9d2be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.txt index 7cfb92259441..e9cdd8e0ec9f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-004-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 450x17 text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.png index 9225c86aee69..45021bfe21f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.txt index d699e6b0c6b9..bcce29dfac1f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-005-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 438x17 text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.png index 743d6d126a1b..ba14cf1f429d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.txt index 4d181f397408..d828484247ea 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-006-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x145 - RenderBlock {HTML} at (0,0) size 800x145 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x146 + RenderBlock {HTML} at (0,0) size 800x146 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock (floating) {DIV} at (0,33) size 96x96 [color=#008000] [bgcolor=#FF0000] + RenderBlock (floating) {DIV} at (0,34) size 96x96 [color=#008000] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.txt index d39def31023b..41888915c112 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-007-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x194 - RenderBlock {HTML} at (0,0) size 800x194 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x196 + RenderBlock {HTML} at (0,0) size 800x196 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (floating) {DIV} at (0,50) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.txt index df70e21b1621..dbe61094f7ac 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-008-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x194 - RenderBlock {HTML} at (0,0) size 800x194 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x196 + RenderBlock {HTML} at (0,0) size 800x196 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (floating) {DIV} at (0,50) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.txt index 1abcb96a3270..c6fc78b7f85d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-009-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x194 - RenderBlock {HTML} at (0,0) size 800x194 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x196 + RenderBlock {HTML} at (0,0) size 800x196 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (floating) {DIV} at (0,50) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.txt index 1abcb96a3270..c6fc78b7f85d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-010-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x194 - RenderBlock {HTML} at (0,0) size 800x194 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x196 + RenderBlock {HTML} at (0,0) size 800x196 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (floating) {DIV} at (0,50) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.txt index 1abcb96a3270..c6fc78b7f85d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-011-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x194 - RenderBlock {HTML} at (0,0) size 800x194 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x196 + RenderBlock {HTML} at (0,0) size 800x196 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (floating) {DIV} at (0,50) size 128x128 [bgcolor=#FF0000] + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.png index f3da1270949f..3837c6e22441 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.txt index 8b53508477e3..acd2eb728dfa 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-non-replaced-width-012-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x194 - RenderBlock {HTML} at (0,0) size 800x194 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x196 + RenderBlock {HTML} at (0,0) size 800x196 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 254: "and protruding out of it toward the right." - RenderBlock (floating) {DIV} at (0,50) size 128x128 [bgcolor=#008000] + text run at (0,18) width 254: "and protruding out of it toward the right." + RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.png index 104441a9298a..cf0476c62fb8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.txt index c7e3c1cebbdd..eabaaaeff299 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-001-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x70 - RenderBlock {HTML} at (0,0) size 800x70 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x71 + RenderBlock {HTML} at (0,0) size 800x71 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock (floating) {DIV} at (0,33) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] + RenderBlock (floating) {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.png index 9812d5850e5f..e3c2606d61d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.txt index 9f01b4385494..1ca1b3a75f92 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-002-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x64 - RenderBlock {HTML} at (0,0) size 800x64 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x65 + RenderBlock {HTML} at (0,0) size 800x65 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 15x15 - RenderBlock (floating) {DIV} at (0,33) size 15x15 +layer at (8,50) size 15x15 + RenderBlock (floating) {DIV} at (0,34) size 15x15 RenderImage {IMG} at (0,0) size 15x15 -layer at (23,49) size 15x15 +layer at (23,50) size 15x15 RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.txt index 637276990680..2e55ffed4ba0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-003-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x145 - RenderBlock {HTML} at (0,0) size 800x145 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x146 + RenderBlock {HTML} at (0,0) size 800x146 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 96x96 - RenderBlock (floating) {DIV} at (0,33) size 96x96 +layer at (8,50) size 96x96 + RenderBlock (floating) {DIV} at (0,34) size 96x96 RenderImage {IMG} at (0,0) size 96x96 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.txt index 6d40a1536b26..7d874acf728c 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-004-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x205 - RenderBlock {HTML} at (0,0) size 800x205 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x206 + RenderBlock {HTML} at (0,0) size 800x206 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x0 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x0 +layer at (8,50) size 784x0 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x0 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.png index 81e3387873db..6eb3b4fe00e6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.txt index 553a266ba232..4941382d034b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-005-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 layer at (0,0) size 300x96 RenderBlock {HTML} at (0,0) size 300x96 RenderBody {BODY} at (8,8) size 284x80 -layer at (8,49) size 306x102 +layer at (8,50) size 306x102 RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.txt index 6d40a1536b26..7d874acf728c 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-height-007-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x205 - RenderBlock {HTML} at (0,0) size 800x205 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x206 + RenderBlock {HTML} at (0,0) size 800x206 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x0 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x0 +layer at (8,50) size 784x0 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x0 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.png index 9225c86aee69..45021bfe21f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.txt index 75a40e50cb2d..bbef4a747f86 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-001-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 438x17 text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.png index d7298ba74b26..f89da3f9d2be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.txt index 46f37da5d057..3b94478802a7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-002-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 450x17 text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.png index 4e355a1f659c..f79681aa73b4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.txt index 86b872c857d8..b04a15744a7d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-003-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 447x17 text run at (0,0) width 447: "Test passes if the blue box is in the upper-right corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (99,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.png index d7298ba74b26..f89da3f9d2be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.txt index 46f37da5d057..3b94478802a7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-004-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 450x17 text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.png index 9225c86aee69..45021bfe21f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.txt index 75a40e50cb2d..bbef4a747f86 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-005-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 438x17 text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.png index 127a67a5e811..89ddfac3d9d5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.txt index 490062c9ce91..146e8aca9d2f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-006-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 15x15 RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.png index cb77ebe4499b..bd1778c60853 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.txt index 9df836fc2643..33eccad95892 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/float-replaced-width-011-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 96x96 RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.png index f089a7b655a0..9d06421aae5c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.txt index c8552a4984ce..a5008124d8e7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/floating-replaced-height-008-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x184 - RenderBlock {HTML} at (0,0) size 800x184 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x186 + RenderBlock {HTML} at (0,0) size 800x186 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "There should be " RenderInline {STRONG} at (0,0) size 143x17 @@ -17,11 +17,11 @@ layer at (0,0) size 800x184 RenderText {#text} at (514,0) size 236x17 text run at (514,0) width 236: ". The 5 filled green squares should be" RenderInline {STRONG} at (0,0) size 57x17 - RenderText {#text} at (0,17) size 57x17 - text run at (0,17) width 57: "identical" - RenderText {#text} at (57,17) size 445x17 - text run at (57,17) width 445: " to each other. This should still remain true even after a window resize." - RenderBlock {DIV} at (0,50) size 784x0 + RenderText {#text} at (0,18) size 57x17 + text run at (0,18) width 57: "identical" + RenderText {#text} at (57,18) size 445x17 + text run at (57,18) width 445: " to each other. This should still remain true even after a window resize." + RenderBlock {DIV} at (0,52) size 784x0 RenderImage {IMG} at (0,0) size 118x118 RenderImage {IMG} at (117,0) size 6x5 RenderImage {IMG} at (122,0) size 119x118 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.png index ece1f784992c..690ff51df029 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.txt index 4bbeedfcdeac..0bb1dd7fdf43 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/height-width-inline-table-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x160 layerType: background only -layer at (8,49) size 100x100 - RenderBlock (positioned) zI: -1 {DIV} at (8,49) size 100x100 [bgcolor=#FF0000] -layer at (0,0) size 800x160 layerType: foreground only - RenderBlock {HTML} at (0,0) size 800x160 - RenderBody {BODY} at (8,16) size 784x136 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x162 layerType: background only +layer at (8,50) size 100x100 + RenderBlock (positioned) zI: -1 {DIV} at (8,50) size 100x100 [bgcolor=#FF0000] +layer at (0,0) size 800x162 layerType: foreground only + RenderBlock {HTML} at (0,0) size 800x162 + RenderBody {BODY} at (8,16) size 784x138 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 295x17 text run at (0,0) width 295: "Test passes if there is a filled green square and " RenderInline {STRONG} at (0,0) size 44x17 @@ -14,6 +14,6 @@ layer at (0,0) size 800x160 layerType: foreground only text run at (295,0) width 44: "no red" RenderText {#text} at (339,0) size 4x17 text run at (339,0) width 4: "." - RenderBlock (anonymous) at (0,33) size 784x103 + RenderBlock (anonymous) at (0,34) size 784x104 RenderTable {DIV} at (0,0) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.png index ece1f784992c..690ff51df029 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.txt index ffe99d9dd735..edba4d59233a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/height-width-table-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x157 layerType: background only -layer at (8,49) size 100x100 - RenderBlock (positioned) zI: -1 {DIV} at (8,49) size 100x100 [bgcolor=#FF0000] -layer at (0,0) size 800x157 layerType: foreground only - RenderBlock {HTML} at (0,0) size 800x157 - RenderBody {BODY} at (8,16) size 784x133 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x158 layerType: background only +layer at (8,50) size 100x100 + RenderBlock (positioned) zI: -1 {DIV} at (8,50) size 100x100 [bgcolor=#FF0000] +layer at (0,0) size 800x158 layerType: foreground only + RenderBlock {HTML} at (0,0) size 800x158 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 295x17 text run at (0,0) width 295: "Test passes if there is a filled green square and " RenderInline {STRONG} at (0,0) size 44x17 @@ -14,4 +14,4 @@ layer at (0,0) size 800x157 layerType: foreground only text run at (295,0) width 44: "no red" RenderText {#text} at (339,0) size 4x17 text run at (339,0) width 4: "." - RenderTable {DIV} at (0,33) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)] + RenderTable {DIV} at (0,34) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt index e565fb92cb93..bdece117af05 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x156 - RenderBlock {HTML} at (0,0) size 800x156 - RenderBody {BODY} at (8,16) size 784x132 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x158 + RenderBlock {HTML} at (0,0) size 800x158 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x99 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x99 +layer at (8,50) size 784x100 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x100 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] RenderBlock {DIV} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt index 38e8e55d030f..ba38077afda8 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x96 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x96 +layer at (8,50) size 784x96 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x96 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] RenderBlock {DIV} at (0,48) size 96x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.png index 81a26e9673e8..c80dce4d673d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt index 369391d5bf3e..913484b1d96e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." - RenderBlock (anonymous) at (0,33) size 784x96 + RenderBlock (anonymous) at (0,34) size 784x96 RenderBlock {DIV} at (0,0) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.png index 71ed3c85a1ee..0631f90f4f65 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt index 43ec90140e7f..194d489a8c1b 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 680x17 text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt index 9ace5c085978..f0102180d16a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x202 - RenderBlock {HTML} at (0,0) size 800x202 - RenderBody {BODY} at (8,16) size 784x178 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x204 + RenderBlock {HTML} at (0,0) size 800x204 + RenderBody {BODY} at (8,16) size 784x180 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (anonymous) at (0,50) size 784x128 + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (anonymous) at (0,52) size 784x128 RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.png index dbdb18de77a7..e922826fb737 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt index f9c8d0ca8d01..44e56c52d92f 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x202 - RenderBlock {HTML} at (0,0) size 800x202 - RenderBody {BODY} at (8,16) size 784x178 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 763x34 +layer at (0,0) size 800x204 + RenderBlock {HTML} at (0,0) size 800x204 + RenderBody {BODY} at (8,16) size 784x180 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 763x35 text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" - text run at (0,17) width 484: "and protruding out of it toward the right. There should be no red in this page." - RenderBlock (anonymous) at (0,50) size 784x128 + text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page." + RenderBlock (anonymous) at (0,52) size 784x128 RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.png index 104441a9298a..cf0476c62fb8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.txt index 047ff884c84f..f0eb1eb9b726 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-001-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x78 - RenderBlock {HTML} at (0,0) size 800x78 - RenderBody {BODY} at (8,16) size 784x54 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x79 + RenderBlock {HTML} at (0,0) size 800x79 + RenderBody {BODY} at (8,16) size 784x55 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock {DIV} at (0,33) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] + RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.png index 9812d5850e5f..e3c2606d61d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.txt index 1575b59462f7..15574324f413 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-002-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x72 - RenderBlock {HTML} at (0,0) size 800x72 - RenderBody {BODY} at (8,16) size 784x48 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x73 + RenderBlock {HTML} at (0,0) size 800x73 + RenderBody {BODY} at (8,16) size 784x49 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x15 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x15 +layer at (8,50) size 784x15 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x15 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (23,49) size 15x15 +layer at (23,50) size 15x15 RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.txt index 8cefc76b0f17..c4fe783b1221 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-003-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x96 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x96 +layer at (8,50) size 784x96 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.txt index 2f0c879a98f8..3637fc843bc0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-004-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x213 - RenderBlock {HTML} at (0,0) size 800x213 - RenderBody {BODY} at (8,16) size 784x189 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,16) size 784x190 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x156 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x156 +layer at (8,50) size 784x156 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 @@ -16,5 +16,5 @@ layer at (8,49) size 784x156 RenderBody {BODY} at (8,8) size 284x134 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.png index 81e3387873db..6eb3b4fe00e6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.txt index 6889257a40fd..dcce2fa0de17 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-005-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 @@ -16,5 +16,5 @@ layer at (8,49) size 784x192 RenderBody {BODY} at (8,8) size 284x80 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 306x102 +layer at (8,50) size 306x102 RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.txt index 2f0c879a98f8..3637fc843bc0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-007-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x213 - RenderBlock {HTML} at (0,0) size 800x213 - RenderBody {BODY} at (8,16) size 784x189 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,16) size 784x190 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x156 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x156 +layer at (8,50) size 784x156 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 @@ -16,5 +16,5 @@ layer at (8,49) size 784x156 RenderBody {BODY} at (8,8) size 284x134 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.png index 271931e0c56c..c34332b3df37 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.txt index 46358920ba3c..86a5838793b6 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-height-008-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x195 - RenderBlock {HTML} at (0,0) size 800x195 - RenderBody {BODY} at (8,16) size 784x171 - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x198 + RenderBlock {HTML} at (0,0) size 800x198 + RenderBody {BODY} at (8,16) size 784x174 + RenderBlock {P} at (0,0) size 784x36 RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "There should be " RenderInline {STRONG} at (0,0) size 143x17 @@ -17,11 +17,11 @@ layer at (0,0) size 800x195 RenderText {#text} at (514,0) size 236x17 text run at (514,0) width 236: ". The 5 filled green squares should be" RenderInline {STRONG} at (0,0) size 57x17 - RenderText {#text} at (0,17) size 57x17 - text run at (0,17) width 57: "identical" - RenderText {#text} at (57,17) size 445x17 - text run at (57,17) width 445: " to each other. This should still remain true even after a window resize." - RenderBlock {DIV} at (0,50) size 784x121 + RenderText {#text} at (0,18) size 57x17 + text run at (0,18) width 57: "identical" + RenderText {#text} at (57,18) size 445x17 + text run at (57,18) width 445: " to each other. This should still remain true even after a window resize." + RenderBlock {DIV} at (0,52) size 784x122 RenderImage {OBJECT} at (0,0) size 118x118 RenderText {#text} at (117,104) size 5x17 text run at (117,104) width 5: " " diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.png index 127a67a5e811..89ddfac3d9d5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.txt index 233b1d86669a..8de4556ae9ca 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-001-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x272 - RenderBlock {HTML} at (0,0) size 800x272 - RenderBody {BODY} at (8,16) size 784x248 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x274 + RenderBlock {HTML} at (0,0) size 800x274 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x198 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x15 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.png index cb77ebe4499b..bd1778c60853 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.txt index 8eaf2eaedc79..a9b5d32e3fcb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-block-replaced-width-006-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.png index 2b80496d4aa4..9f0520ad4764 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.txt index 12918074cd45..d67bf0b1b080 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-002-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x281 - RenderBlock {HTML} at (0,0) size 800x281 - RenderBody {BODY} at (8,16) size 784x257 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x282 + RenderBlock {HTML} at (0,0) size 800x282 + RenderBody {BODY} at (8,16) size 784x258 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,129) size 784x144 - RenderBlock (relative positioned) {DIV} at (0,113) size 784x144 +layer at (8,130) size 784x144 + RenderBlock (relative positioned) {DIV} at (0,114) size 784x144 RenderInline {SPAN} at (0,0) size 96x192 [color=#0000FF] [bgcolor=#0000FF] RenderText {#text} at (0,24) size 96x96 text run at (0,24) width 96: "X" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,105) size 96x192 +layer at (104,106) size 96x192 RenderBlock (positioned) {DIV} at (96,-24) size 96x192 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.png index 2b80496d4aa4..9f0520ad4764 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.txt index 15b7ba0cf09b..a39cb2157ebb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-height-003-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x281 - RenderBlock {HTML} at (0,0) size 800x281 - RenderBody {BODY} at (8,16) size 784x257 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x282 + RenderBlock {HTML} at (0,0) size 800x282 + RenderBody {BODY} at (8,16) size 784x258 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,129) size 784x144 - RenderBlock (relative positioned) {DIV} at (0,113) size 784x144 +layer at (8,130) size 784x144 + RenderBlock (relative positioned) {DIV} at (0,114) size 784x144 RenderInline {SPAN} at (0,0) size 96x192 [color=#0000FF] [bgcolor=#0000FF] [border: (48px solid #0000FF) none (48px solid #0000FF) none] RenderText {#text} at (0,24) size 96x96 text run at (0,24) width 96: "X" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,105) size 96x192 +layer at (104,106) size 96x192 RenderBlock (positioned) {DIV} at (96,-24) size 96x192 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.png index d63500d877d5..27b34be3ca8f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.txt index 70fcd4ade12c..52bdb9498198 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-001-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 481: "Test passes if the blue box below is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 96x96 +layer at (8,50) size 96x96 RenderInline (relative positioned) {SPAN} at (0,0) size 96x96 [color=#0000FF] RenderText {#text} at (3,3) size 96x96 text run at (3,3) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.png index d63500d877d5..27b34be3ca8f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.txt index 70fcd4ade12c..52bdb9498198 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-non-replaced-width-002-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x255 - RenderBlock {HTML} at (0,0) size 800x255 - RenderBody {BODY} at (8,16) size 784x231 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x256 + RenderBlock {HTML} at (0,0) size 800x256 + RenderBody {BODY} at (8,16) size 784x232 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 481x17 text run at (0,0) width 481: "Test passes if the blue box below is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,33) size 198x198 [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)] RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 96x96 +layer at (8,50) size 96x96 RenderInline (relative positioned) {SPAN} at (0,0) size 96x96 [color=#0000FF] RenderText {#text} at (3,3) size 96x96 text run at (3,3) width 96: "X" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.png index 104441a9298a..cf0476c62fb8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.txt index 047ff884c84f..f0eb1eb9b726 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-001-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x78 - RenderBlock {HTML} at (0,0) size 800x78 - RenderBody {BODY} at (8,16) size 784x54 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x79 + RenderBlock {HTML} at (0,0) size 800x79 + RenderBody {BODY} at (8,16) size 784x55 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 547x17 text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines." - RenderBlock {DIV} at (0,33) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] + RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.png index 9812d5850e5f..e3c2606d61d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.txt index 1575b59462f7..15574324f413 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-002-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x72 - RenderBlock {HTML} at (0,0) size 800x72 - RenderBody {BODY} at (8,16) size 784x48 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x73 + RenderBlock {HTML} at (0,0) size 800x73 + RenderBody {BODY} at (8,16) size 784x49 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x15 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x15 +layer at (8,50) size 784x15 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x15 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (23,49) size 15x15 +layer at (23,50) size 15x15 RenderBlock (positioned) {DIV} at (15,0) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.png index 73d63bedeb3c..8aaa12b05071 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.txt index 8cefc76b0f17..c4fe783b1221 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-003-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height." -layer at (8,49) size 784x96 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x96 +layer at (8,50) size 784x96 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (104,49) size 96x96 +layer at (104,50) size 96x96 RenderBlock (positioned) {DIV} at (96,0) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.txt index 2f0c879a98f8..3637fc843bc0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-004-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x213 - RenderBlock {HTML} at (0,0) size 800x213 - RenderBody {BODY} at (8,16) size 784x189 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,16) size 784x190 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x156 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x156 +layer at (8,50) size 784x156 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 @@ -16,5 +16,5 @@ layer at (8,49) size 784x156 RenderBody {BODY} at (8,8) size 284x134 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.png index 81e3387873db..6eb3b4fe00e6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.txt index 6889257a40fd..dcce2fa0de17 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-005-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,16) size 784x225 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x250 + RenderBlock {HTML} at (0,0) size 800x250 + RenderBody {BODY} at (8,16) size 784x226 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x192 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x192 +layer at (8,50) size 784x192 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] layer at (0,0) size 300x96 RenderView at (0,0) size 300x96 @@ -16,5 +16,5 @@ layer at (8,49) size 784x192 RenderBody {BODY} at (8,8) size 284x80 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 306x102 +layer at (8,50) size 306x102 RenderBlock (positioned) {DIV} at (0,0) size 306x102 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.png index 76c37f1f44ca..2bb44bf035de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.txt index 2f0c879a98f8..3637fc843bc0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-007-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x213 - RenderBlock {HTML} at (0,0) size 800x213 - RenderBody {BODY} at (8,16) size 784x189 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,16) size 784x190 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 303x17 text run at (0,0) width 303: "Test passes if there is no red visible on the page." -layer at (8,49) size 784x156 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x156 +layer at (8,50) size 784x156 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 @@ -16,5 +16,5 @@ layer at (8,49) size 784x156 RenderBody {BODY} at (8,8) size 284x134 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 306x156 +layer at (8,50) size 306x156 RenderBlock (positioned) {DIV} at (0,0) size 306x156 [border: (3px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.png index 271931e0c56c..c34332b3df37 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.txt index a10209a7c890..c6b7e6fe953a 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-height-008-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x195 - RenderBlock {HTML} at (0,0) size 800x195 - RenderBody {BODY} at (8,16) size 784x171 - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x198 + RenderBlock {HTML} at (0,0) size 800x198 + RenderBody {BODY} at (8,16) size 784x174 + RenderBlock {P} at (0,0) size 784x36 RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "There should be " RenderInline {STRONG} at (0,0) size 143x17 @@ -17,11 +17,11 @@ layer at (0,0) size 800x195 RenderText {#text} at (514,0) size 236x17 text run at (514,0) width 236: ". The 5 filled green squares should be" RenderInline {STRONG} at (0,0) size 57x17 - RenderText {#text} at (0,17) size 57x17 - text run at (0,17) width 57: "identical" - RenderText {#text} at (57,17) size 445x17 - text run at (57,17) width 445: " to each other. This should still remain true even after a window resize." - RenderBlock {DIV} at (0,50) size 784x121 + RenderText {#text} at (0,18) size 57x17 + text run at (0,18) width 57: "identical" + RenderText {#text} at (57,18) size 445x17 + text run at (57,18) width 445: " to each other. This should still remain true even after a window resize." + RenderBlock {DIV} at (0,52) size 784x122 RenderImage {IMG} at (0,0) size 118x118 RenderText {#text} at (117,104) size 5x17 text run at (117,104) width 5: " " diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.png index bbba2d62c6c5..d0f995d60083 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.txt index 91e6d2a5a02c..9aaaa40834c0 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-001-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] - RenderBlock (anonymous) at (3,3) size 192x99 + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] + RenderBlock (anonymous) at (3,3) size 192x100 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (3,102) size 96x96 [bgcolor=#FFA500] + RenderBlock {DIV} at (3,103) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.png index cb77ebe4499b..bd1778c60853 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.txt index 8eaf2eaedc79..a9b5d32e3fcb 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-006-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x368 - RenderBlock {HTML} at (0,0) size 800x368 - RenderBody {BODY} at (8,16) size 784x344 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 771x34 +layer at (0,0) size 800x370 + RenderBlock {HTML} at (0,0) size 800x370 + RenderBody {BODY} at (8,16) size 784x346 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 771x35 text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" - text run at (0,17) width 28: "box." - RenderBlock {DIV} at (0,50) size 198x294 [border: (3px solid #000000)] + text run at (0,18) width 28: "box." + RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.png index b4a24844790d..182f51c2075b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.txt index 663e476313fe..a99e46fbb4d9 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-011-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x165 - RenderBlock {HTML} at (0,0) size 800x165 - RenderBody {BODY} at (8,16) size 784x133 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x166 + RenderBlock {HTML} at (0,0) size 800x166 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "There should be no red below." - RenderBlock {DIV} at (0,33) size 784x100 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 784x100 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 784x100 RenderImage {IMG} at (0,0) size 784x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.png index 607d95edcf69..081e7b3cc61b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.txt index cac300a03593..548a8f76c1a9 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-012-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x257 - RenderBlock {HTML} at (0,0) size 800x257 - RenderBody {BODY} at (8,16) size 784x233 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x258 + RenderBlock {HTML} at (0,0) size 800x258 + RenderBody {BODY} at (8,16) size 784x234 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "There should be no red below." - RenderBlock {DIV} at (0,33) size 600x200 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 600x200 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000] RenderImage {IMG} at (0,0) size 100x100 RenderImage {IMG} at (0,100) size 600x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.png index 607d95edcf69..081e7b3cc61b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.txt index cac300a03593..548a8f76c1a9 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-013-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x257 - RenderBlock {HTML} at (0,0) size 800x257 - RenderBody {BODY} at (8,16) size 784x233 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x258 + RenderBlock {HTML} at (0,0) size 800x258 + RenderBody {BODY} at (8,16) size 784x234 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "There should be no red below." - RenderBlock {DIV} at (0,33) size 600x200 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 600x200 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000] RenderImage {IMG} at (0,0) size 100x100 RenderImage {IMG} at (0,100) size 600x100 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.png index 3791f8d2dea9..0baf93456194 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.txt index 7067201f2e8d..223d1cccdc72 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-014-expected.txt @@ -1,21 +1,21 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x281 - RenderBlock {HTML} at (0,0) size 800x281 - RenderBody {BODY} at (8,16) size 784x249 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x282 + RenderBlock {HTML} at (0,0) size 800x282 + RenderBody {BODY} at (8,16) size 784x250 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 632x17 text run at (0,0) width 386: "There should be no red below, just two 300\x{D7}100 pixel green " text run at (386,0) width 246: "rectangles seperated by 1em of margin." - RenderBlock {DIV} at (0,33) size 300x100 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 300x100 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 600x100 RenderImage {IMG} at (0,0) size 300x100 RenderText {#text} at (0,0) size 0x0 -layer at (8,165) size 300x100 - RenderBlock (relative positioned) {DIV} at (0,149) size 300x100 +layer at (8,166) size 300x100 + RenderBlock (relative positioned) {DIV} at (0,150) size 300x100 RenderBlock {P} at (0,0) size 600x100 RenderImage {IMG} at (0,0) size 300x100 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,165) size 300x100 +layer at (8,166) size 300x100 RenderBlock (positioned) {SPAN} at (0,0) size 300x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.png index c8bd77a1a0b7..c70f4e4fa675 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.txt index bdafcc6766a2..4c4d01e3b135 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-replaced-width-015-expected.txt @@ -1,25 +1,25 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x473 - RenderBlock {HTML} at (0,0) size 800x473 - RenderBody {BODY} at (8,16) size 784x449 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x474 + RenderBlock {HTML} at (0,0) size 800x474 + RenderBody {BODY} at (8,16) size 784x450 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 444x17 text run at (0,0) width 444: "There should be no red below, just two 300x200 pixel lime rectangles." -layer at (8,49) size 300x200 - RenderBlock (relative positioned) {DIV} at (0,33) size 300x200 [bgcolor=#FF0000] +layer at (8,50) size 300x200 + RenderBlock (relative positioned) {DIV} at (0,34) size 300x200 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 300x100 [bgcolor=#00FF00] RenderBlock {P} at (0,0) size 375x100 RenderImage {IMG} at (0,0) size 100x100 RenderImage {IMG} at (0,100) size 300x100 RenderText {#text} at (0,0) size 0x0 -layer at (8,265) size 300x200 - RenderBlock (relative positioned) {DIV} at (0,249) size 300x200 [bgcolor=#FF0000] +layer at (8,266) size 300x200 + RenderBlock (relative positioned) {DIV} at (0,250) size 300x200 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 300x100 [bgcolor=#00FF00] RenderBlock {P} at (0,0) size 375x100 RenderImage {IMG} at (0,0) size 100x100 RenderImage {IMG} at (0,100) size 300x100 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,365) size 300x100 +layer at (8,366) size 300x100 RenderBlock (positioned) {SPAN} at (0,100) size 300x100 [bgcolor=#00FF00] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.png index 76464863a9e3..46dda778e030 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.txt index c4d4c062ac31..e813acd31650 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-001-expected.txt @@ -3,10 +3,10 @@ layer 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 - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 377x17 text run at (0,0) width 377: "Test passes if the \"Filler Text\" below is all on the same line." - RenderBlock {DIV} at (0,33) size 784x96 + RenderBlock {DIV} at (0,34) size 784x96 RenderInline {SPAN} at (0,0) size 66x17 RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" @@ -15,7 +15,7 @@ layer at (0,0) size 800x600 RenderTable {DIV} at (70,0) size 96x96 [bgcolor=#FFA500] RenderTableSection (anonymous) at (0,0) size 96x96 RenderTableRow {DIV} at (0,0) size 96x96 - RenderTableCell {DIV} at (0,0) size 96x17 [r=0 c=0 rs=1 cs=1] + RenderTableCell {DIV} at (0,0) size 96x18 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-002a-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-002a-expected.txt index 6a7ab9225f57..cc8163a7c3c4 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-002a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-002a-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 RenderText {#text} at (0,0) size 7x17 text run at (0,0) width 7: "a" - RenderTable {SPAN} at (7,0) size 23x34 - RenderTableSection (anonymous) at (0,0) size 23x34 - RenderTableRow (anonymous) at (0,0) size 23x34 - RenderTableCell (anonymous) at (0,0) size 23x34 [r=0 c=0 rs=1 cs=1] - RenderBlock (anonymous) at (0,0) size 23x17 + RenderTable {SPAN} at (7,0) size 23x36 + RenderTableSection (anonymous) at (0,0) size 23x36 + RenderTableRow (anonymous) at (0,0) size 23x36 + RenderTableCell (anonymous) at (0,0) size 23x36 [r=0 c=0 rs=1 cs=1] + RenderBlock (anonymous) at (0,0) size 23x18 RenderText {#text} at (0,0) size 23x17 text run at (0,0) width 23: "bcd" - RenderBlock {SPAN} at (0,17) size 23x17 + RenderBlock {SPAN} at (0,18) size 23x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "x" RenderText {#text} at (30,0) size 7x17 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-003-expected.txt index dc4628d730d6..f53c2fee6331 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/inline-table-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/inline-table-003-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 7x17 text run at (0,0) width 7: "a" - RenderTable {SPAN} at (7,0) size 8x17 - RenderTableSection (anonymous) at (0,0) size 8x17 - RenderTableRow (anonymous) at (0,0) size 8x17 - RenderTableCell (anonymous) at (0,0) size 8x17 [r=0 c=0 rs=1 cs=1] + RenderTable {SPAN} at (7,0) size 8x18 + RenderTableSection (anonymous) at (0,0) size 8x18 + RenderTableRow (anonymous) at (0,0) size 8x18 + RenderTableCell (anonymous) at (0,0) size 8x18 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "b" RenderText {#text} at (15,0) size 7x17 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.txt index 501a7bcfca46..284535e0abee 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-001-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableSection {DIV} at (0,0) size 220x220 RenderTableRow {DIV} at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.txt index 501a7bcfca46..284535e0abee 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-002-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableSection {DIV} at (0,0) size 220x220 RenderTableRow {DIV} at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.txt index 501a7bcfca46..284535e0abee 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-003-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableSection {DIV} at (0,0) size 220x220 RenderTableRow {DIV} at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.txt index 96f772969983..0092f89688af 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-004-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableSection (anonymous) at (0,0) size 220x220 RenderTableRow {DIV} at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.txt index a2a2c2b83cfb..f6ccb4a856c7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-005-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableCol {DIV} at (0,0) size 0x0 RenderTableSection (anonymous) at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.txt index a2a2c2b83cfb..f6ccb4a856c7 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-006-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableCol {DIV} at (0,0) size 0x0 RenderTableSection (anonymous) at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.png index 46fae63a120a..810f3d60bf40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.txt index 96f772969983..0092f89688af 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-007-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 457x17 text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below." -layer at (8,49) size 240x240 - RenderBlock (positioned) {DIV} at (8,49) size 240x240 [border: (10px solid #0000FF)] +layer at (8,50) size 240x240 + RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 RenderTableSection (anonymous) at (0,0) size 220x220 RenderTableRow {DIV} at (0,0) size 220x220 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.png index 9c30de0edc2d..9df89e454a4d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.txt index 6a1939e44c8b..d49dab746d34 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-008-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x74 - RenderBlock {HTML} at (0,0) size 800x74 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x76 + RenderBlock {HTML} at (0,0) size 800x76 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 437x17 text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below." - RenderBlock (anonymous) at (0,33) size 784x17 + RenderBlock (anonymous) at (0,34) size 784x18 RenderInline {DIV} at (0,0) size 186x17 [border: none (5px solid #0000FF) none (5px solid #0000FF)] RenderText {#text} at (0,0) size 0x0 RenderInline {DIV} at (0,0) size 76x17 [border: none (5px solid #FFA500) none (5px solid #FFA500)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.png index 2ab794c6c3af..c3d744e403a0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.txt index 0d369ce08729..81e00a55fe20 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-009-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 437x17 text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below." -layer at (8,49) size 340x340 - RenderBlock (positioned) {DIV} at (8,49) size 340x340 [border: (10px solid #0000FF)] +layer at (8,50) size 340x340 + RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)] RenderBlock {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.png index 8ba960861e95..d30ad867a662 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.txt index b72a2f1775d6..d7c3bda382d1 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-010-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x66 - RenderBlock {HTML} at (0,0) size 800x66 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 779x34 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 779x35 text run at (0,0) width 779: "Test passes if there is space between the blue and orange lines below and there is a marker bullet on the left-hand side of the" - text run at (0,17) width 75: "orange box." -layer at (8,66) size 340x340 - RenderBlock (positioned) {DIV} at (8,66) size 340x340 [border: (10px solid #0000FF)] + text run at (0,18) width 75: "orange box." +layer at (8,68) size 340x340 + RenderBlock (positioned) {DIV} at (8,68) size 340x340 [border: (10px solid #0000FF)] RenderListItem {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] RenderListMarker at (-17,10) size 7x17: bullet diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.png index 0c723e2ab048..da99f9f7d7cb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.txt index 469b75837888..11aa4017fabc 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-012-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 437x17 text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below." -layer at (8,49) size 340x343 - RenderBlock (positioned) {DIV} at (8,49) size 340x343 [border: (10px solid #0000FF)] +layer at (8,50) size 340x344 + RenderBlock (positioned) {DIV} at (8,50) size 340x344 [border: (10px solid #0000FF)] RenderBlock {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.png index 2ab794c6c3af..c3d744e403a0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.txt index 70733e110eab..0b7adbcb9949 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-013-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 437x17 text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below." -layer at (8,49) size 340x340 - RenderBlock (positioned) {DIV} at (8,49) size 340x340 [border: (10px solid #0000FF)] +layer at (8,50) size 340x340 + RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)] RenderTable {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] RenderTableSection (anonymous) at (10,10) size 200x200 RenderTableRow {DIV} at (0,0) size 200x200 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.png index 0c723e2ab048..da99f9f7d7cb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.txt index 0f89b63ff302..151f28b3c5bc 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-014-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 437x17 text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below." -layer at (8,49) size 340x343 - RenderBlock (positioned) {DIV} at (8,49) size 340x343 [border: (10px solid #0000FF)] +layer at (8,50) size 340x344 + RenderBlock (positioned) {DIV} at (8,50) size 340x344 [border: (10px solid #0000FF)] RenderTable {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] RenderTableSection (anonymous) at (10,10) size 200x200 RenderTableRow {DIV} at (0,0) size 200x200 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.png index 2ab794c6c3af..c3d744e403a0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.txt index 20c2c52e8eab..1717f35ddda2 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/margin-applies-to-015-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 437x17 text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below." -layer at (8,49) size 340x340 - RenderBlock (positioned) {DIV} at (8,49) size 340x340 [border: (10px solid #0000FF)] +layer at (8,50) size 340x340 + RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 320x320 RenderBlock {DIV} at (50,50) size 220x220 [border: (10px solid #FFA500)] RenderTableSection (anonymous) at (0,320) size 320x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.png index 97ca202d95e0..c844b2e3d3e1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.txt index c3a258052503..5fd83b1f184d 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/outline-color-applies-to-008-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x74 - RenderBlock {HTML} at (0,0) size 800x74 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x76 + RenderBlock {HTML} at (0,0) size 800x76 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "Test passes if the box below is blue." - RenderBlock (anonymous) at (0,33) size 784x17 + RenderBlock (anonymous) at (0,34) size 784x18 RenderInline {DIV} at (0,0) size 66x17 RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.png index 2933b1ccd01e..3b91877c55fc 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.txt index bbe41c7b6ae1..557460939e76 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/replaced-elements-001-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x171 - RenderBlock {HTML} at (0,0) size 800x171 - RenderBody {BODY} at (8,16) size 784x139 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x176 + RenderBlock {HTML} at (0,0) size 800x176 + RenderBody {BODY} at (8,16) size 784x144 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 598x17 text run at (0,0) width 598: "Below, there should be 2 orange boxes horizontally centered within their respective green bars." - RenderBlock {DIV} at (16,33) size 752x45 [bgcolor=#008000] - RenderBlock (anonymous) at (0,0) size 752x17 + RenderBlock {DIV} at (16,34) size 752x47 [bgcolor=#008000] + RenderBlock (anonymous) at (0,0) size 752x18 RenderText {#text} at (0,0) size 36x17 text run at (0,0) width 36: " " - RenderButton {INPUT} at (368,19) size 16x26 [color=#2E3436] [bgcolor=#FFA500] [border: (2px outset #C0C0C0)] - RenderBlock {FORM} at (0,94) size 784x45 - RenderBlock {DIV} at (16,0) size 752x45 [bgcolor=#008000] - RenderBlock (anonymous) at (0,0) size 752x17 + RenderButton {INPUT} at (368,20) size 16x27 [color=#2E3436] [bgcolor=#FFA500] [border: (2px outset #C0C0C0)] + RenderBlock {FORM} at (0,97) size 784x47 + RenderBlock {DIV} at (16,0) size 752x47 [bgcolor=#008000] + RenderBlock (anonymous) at (0,0) size 752x18 RenderText {#text} at (0,0) size 36x17 text run at (0,0) width 36: " " - RenderButton {INPUT} at (368,19) size 16x26 [color=#2E3436] [bgcolor=#FFA500] [border: (2px outset #C0C0C0)] + RenderButton {INPUT} at (368,20) size 16x27 [color=#2E3436] [bgcolor=#FFA500] [border: (2px outset #C0C0C0)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.txt index 7c5ecd0ffaec..21213772b734 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-003-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x265 - RenderBlock {HTML} at (0,0) size 800x265 [color=#000080] [bgcolor=#FFFFFF] - RenderBody {BODY} at (8,16) size 784x233 +layer at (0,0) size 800x266 + RenderBlock {HTML} at (0,0) size 800x266 [color=#000080] [bgcolor=#FFFFFF] + RenderBody {BODY} at (8,16) size 784x234 RenderBlock {DIV} at (0,0) size 100x200 RenderBlock {P} at (0,0) size 100x200 RenderEmbeddedObject {OBJECT} at (0,0) size 200x200 @@ -10,6 +10,6 @@ layer at (0,0) size 800x265 RenderView at (0,0) size 100x200 layer at (0,0) size 100x200 RenderSVGRoot {svg} at (0,0) size 0x0 - RenderBlock {P} at (0,216) size 784x17 + RenderBlock {P} at (0,216) size 784x18 RenderText {#text} at (0,0) size 428x17 text run at (0,0) width 428: "There should be a complete unbroken yin-yang symbol (\x{E2}\x{2DC}\x{AF}) above." diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.png index 4af3d1f4a9d8..eec965a200ab 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.txt index 53c5a83d7684..42aab75af939 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-004-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x160 - RenderBlock {HTML} at (0,0) size 800x160 - RenderBody {BODY} at (8,16) size 784x136 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x162 + RenderBlock {HTML} at (0,0) size 800x162 + RenderBody {BODY} at (8,16) size 784x138 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 286x17 text run at (0,0) width 286: "There must be a green box below and no red." - RenderBlock {DIV} at (0,33) size 784x103 + RenderBlock {DIV} at (0,34) size 784x104 RenderEmbeddedObject {OBJECT} at (0,0) size 100x100 [bgcolor=#008000] [border: (20px solid #FF0000)] layer at (0,0) size 60x60 RenderView at (0,0) size 60x60 layer at (0,0) size 60x60 RenderSVGRoot {svg} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 100x100 - RenderBlock (positioned) {DIV} at (8,49) size 100x100 [border: (20px solid #008000)] +layer at (8,50) size 100x100 + RenderBlock (positioned) {DIV} at (8,50) size 100x100 [border: (20px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.png index b50c2687c143..1dc623c502ea 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.txt index c89f4f711b86..171b2217dc23 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/replaced-intrinsic-005-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x250 - RenderBlock {HTML} at (0,0) size 800x250 - RenderBody {BODY} at (8,16) size 784x226 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x252 + RenderBlock {HTML} at (0,0) size 800x252 + RenderBody {BODY} at (8,16) size 784x228 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 286x17 text run at (0,0) width 286: "There must be a green box below and no red." - RenderBlock {DIV} at (0,33) size 784x193 + RenderBlock {DIV} at (0,34) size 784x194 RenderEmbeddedObject {OBJECT} at (0,0) size 100x190 [bgcolor=#008000] [border: (20px solid #FF0000)] layer at (0,0) size 60x150 RenderView at (0,0) size 60x150 layer at (0,0) size 60x150 RenderSVGRoot {svg} at (0,0) size 0x0 -layer at (8,49) size 100x190 - RenderBlock (positioned) {DIV} at (8,49) size 100x190 [border: (20px solid #008000)] +layer at (8,50) size 100x190 + RenderBlock (positioned) {DIV} at (8,50) size 100x190 [border: (20px solid #008000)] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.png index c127e48fd514..732d42349355 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.txt index 335ea3d8d203..c1ed08f504ae 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/replaced-min-max-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x267 - RenderBlock {HTML} at (0,0) size 800x267 - RenderBody {BODY} at (8,8) size 784x251 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x271 + RenderBlock {HTML} at (0,0) size 800x271 + RenderBody {BODY} at (8,8) size 784x255 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 298x17 text run at (0,0) width 298: "All twenty images should be identically square." - RenderBlock (anonymous) at (0,17) size 784x234 + RenderBlock (anonymous) at (0,18) size 784x237 RenderInline {P} at (0,0) size 75x17 RenderImage {IMG} at (0,0) size 75x75 RenderText {#text} at (75,61) size 4x17 @@ -52,55 +52,55 @@ layer at (0,0) size 800x267 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (0,78) size 75x75 - RenderText {#text} at (75,139) size 4x17 - text run at (75,139) width 4: " " + RenderImage {IMG} at (0,79) size 75x75 + RenderText {#text} at (75,140) size 4x17 + text run at (75,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (79,78) size 75x75 - RenderText {#text} at (154,139) size 4x17 - text run at (154,139) width 4: " " + RenderImage {IMG} at (79,79) size 75x75 + RenderText {#text} at (154,140) size 4x17 + text run at (154,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (158,78) size 75x75 - RenderText {#text} at (233,139) size 4x17 - text run at (233,139) width 4: " " + RenderImage {IMG} at (158,79) size 75x75 + RenderText {#text} at (233,140) size 4x17 + text run at (233,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (237,78) size 75x75 - RenderText {#text} at (312,139) size 4x17 - text run at (312,139) width 4: " " + RenderImage {IMG} at (237,79) size 75x75 + RenderText {#text} at (312,140) size 4x17 + text run at (312,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (316,78) size 75x75 - RenderText {#text} at (391,139) size 4x17 - text run at (391,139) width 4: " " + RenderImage {IMG} at (316,79) size 75x75 + RenderText {#text} at (391,140) size 4x17 + text run at (391,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (395,78) size 75x75 - RenderText {#text} at (470,139) size 4x17 - text run at (470,139) width 4: " " + RenderImage {IMG} at (395,79) size 75x75 + RenderText {#text} at (470,140) size 4x17 + text run at (470,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (474,78) size 75x75 - RenderText {#text} at (549,139) size 4x17 - text run at (549,139) width 4: " " + RenderImage {IMG} at (474,79) size 75x75 + RenderText {#text} at (549,140) size 4x17 + text run at (549,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (553,78) size 75x75 - RenderText {#text} at (628,139) size 4x17 - text run at (628,139) width 4: " " + RenderImage {IMG} at (553,79) size 75x75 + RenderText {#text} at (628,140) size 4x17 + text run at (628,140) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (632,78) size 75x75 + RenderImage {IMG} at (632,79) size 75x75 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (0,156) size 75x75 - RenderText {#text} at (75,217) size 4x17 - text run at (75,217) width 4: " " + RenderImage {IMG} at (0,158) size 75x75 + RenderText {#text} at (75,219) size 4x17 + text run at (75,219) width 4: " " RenderText {#text} at (0,0) size 0x0 RenderInline {P} at (0,0) size 75x17 - RenderImage {IMG} at (79,156) size 75x75 + RenderImage {IMG} at (79,158) size 75x75 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.png index 5ac2ba6af63b..297d2afcc47e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.txt index b64eed236de5..5a3e40bdd8e2 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-001-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x170 - RenderBlock {HTML} at (0,0) size 800x170 - RenderBody {BODY} at (8,16) size 784x146 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x172 + RenderBlock {HTML} at (0,0) size 800x172 + RenderBody {BODY} at (8,16) size 784x148 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 302x17 text run at (0,0) width 302: "Test passes if the \"Filler Text\" is above the box." - RenderTable {DIV} at (0,33) size 96x113 - RenderBlock {DIV} at (0,0) size 96x17 + RenderTable {DIV} at (0,34) size 96x114 + RenderBlock {DIV} at (0,0) size 96x18 RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" - RenderTableSection (anonymous) at (0,17) size 96x96 + RenderTableSection (anonymous) at (0,18) size 96x96 RenderTableRow {DIV} at (0,0) size 96x48 RenderTableCell {DIV} at (0,0) size 48x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] RenderTableCell {DIV} at (48,0) size 48x0 [bgcolor=#000000] [r=0 c=1 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.png index 3481c2979b85..dbcad4c0fa4f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.txt index 0ef15522cb8d..3047dec1a2c4 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-002-expected.txt @@ -1,34 +1,34 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x152 - RenderBlock {HTML} at (0,0) size 800x152 - RenderTable {BODY} at (8,8) size 784x136 - RenderTableSection (anonymous) at (0,51) size 784x51 - RenderTableRow (anonymous) at (0,0) size 784x34 - RenderTableCell {DIV} at (0,0) size 784x34 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (0,0) size 743x34 +layer at (0,0) size 800x160 + RenderBlock {HTML} at (0,0) size 800x160 + RenderTable {BODY} at (8,8) size 784x144 + RenderTableSection (anonymous) at (0,54) size 784x54 + RenderTableRow (anonymous) at (0,0) size 784x36 + RenderTableCell {DIV} at (0,0) size 784x36 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (0,0) size 743x35 text run at (0,0) width 743: "Test passes if the numbers above are in order from top-to-bottom (1-3) and the number below are in order from top-to-" - text run at (0,17) width 83: "bottom (4-6)." - RenderTableRow {DIV} at (0,34) size 784x17 [color=#008000] - RenderTableCell (anonymous) at (0,34) size 784x17 [r=1 c=0 rs=1 cs=1] + text run at (0,18) width 83: "bottom (4-6)." + RenderTableRow {DIV} at (0,36) size 784x18 [color=#008000] + RenderTableCell (anonymous) at (0,36) size 784x18 [r=1 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "4. This line should be green." - RenderBlock {DIV} at (0,0) size 784x17 [color=#008000] + RenderBlock {DIV} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "1. This line should be green." - RenderBlock {DIV} at (0,17) size 784x17 [color=#008000] + RenderBlock {DIV} at (0,18) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "2. This line should be green." - RenderTableSection (anonymous) at (0,102) size 784x17 - RenderTableRow {DIV} at (0,0) size 784x17 [color=#008000] - RenderTableCell (anonymous) at (0,0) size 784x17 [r=0 c=0 rs=1 cs=1] + RenderTableSection (anonymous) at (0,108) size 784x18 + RenderTableRow {DIV} at (0,0) size 784x18 [color=#008000] + RenderTableCell (anonymous) at (0,0) size 784x18 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "5. This line should be green." - RenderBlock {DIV} at (0,34) size 784x17 [color=#008000] + RenderBlock {DIV} at (0,36) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "3. This line should be green." - RenderTableSection (anonymous) at (0,119) size 784x17 - RenderTableRow {DIV} at (0,0) size 784x17 [color=#008000] - RenderTableCell (anonymous) at (0,0) size 784x17 [r=0 c=0 rs=1 cs=1] + RenderTableSection (anonymous) at (0,126) size 784x18 + RenderTableRow {DIV} at (0,0) size 784x18 [color=#008000] + RenderTableCell (anonymous) at (0,0) size 784x18 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 179x17 text run at (0,0) width 179: "6. This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png index ab23048eebcc..f543af7b18c9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt index 53800918c823..9b5c2b6eed4e 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x58 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x60 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 425x17 text run at (0,0) width 425: "Test passes if the \"Filler Text\" below is on the right side of the box." - RenderTable {TABLE} at (0,33) size 202x25 - RenderBlock {CAPTION} at (0,0) size 202x19 [border: (1px solid #000000)] + RenderTable {TABLE} at (0,34) size 202x26 + RenderBlock {CAPTION} at (0,0) size 202x20 [border: (1px solid #000000)] RenderText {#text} at (135,1) size 66x17 text run at (135,1) width 66: "Filler Text" - RenderTableSection {TBODY} at (0,19) size 202x6 + RenderTableSection {TBODY} at (0,20) size 202x6 RenderTableRow {TR} at (0,2) size 202x2 RenderTableCell {TD} at (2,2) size 198x2 [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.png index 113b8e1e7446..6387e2ce8c78 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.txt index e54069adb5bf..ea7f3415f0dd 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-margins-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x244 - RenderBlock {HTML} at (0,0) size 800x244 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x245 + RenderBlock {HTML} at (0,0) size 800x245 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 393x17 text run at (0,0) width 393: "There must be four evenly-spaced blue bars below and no red." - RenderBlock {DIV} at (15,33) size 96x180 [border: (15px solid #FF0000) none (15px solid #FF0000) none] + RenderBlock {DIV} at (15,34) size 96x180 [border: (15px solid #FF0000) none (15px solid #FF0000) none] RenderBlock {DIV} at (0,0) size 96x180 [border: (15px solid #0000FF) none (15px solid #0000FF) none] RenderTable {DIV} at (0,35) size 96x90 [bgcolor=#0000FF] RenderBlock {DIV} at (0,20) size 96x15 diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.png index 002609b5d565..ade8fce91447 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.txt index 44e75676dd5b..36ef928b35b5 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-001-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x291 - RenderBlock {HTML} at (0,0) size 800x291 - RenderBody {BODY} at (8,16) size 784x267 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x294 + RenderBlock {HTML} at (0,0) size 800x294 + RenderBody {BODY} at (8,16) size 784x270 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 637x17 text run at (0,0) width 637: "Test passes if the top square below has \"Filler Text\" directly above it and the bottom square does not." - RenderTable {DIV} at (0,33) size 100x117 - RenderBlock {DIV} at (0,0) size 100x17 + RenderTable {DIV} at (0,34) size 100x118 + RenderBlock {DIV} at (0,0) size 100x18 RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" - RenderTableSection (anonymous) at (0,17) size 100x100 + RenderTableSection (anonymous) at (0,18) size 100x100 RenderTableRow {DIV} at (0,0) size 100x50 RenderTableCell {DIV} at (0,0) size 50x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] RenderTableCell {DIV} at (50,0) size 50x0 [bgcolor=#000000] [r=0 c=1 rs=1 cs=1] RenderTableRow {DIV} at (0,50) size 100x50 RenderTableCell {DIV} at (0,50) size 50x0 [bgcolor=#000000] [r=1 c=0 rs=1 cs=1] RenderTableCell {DIV} at (50,50) size 50x0 [bgcolor=#000000] [r=1 c=1 rs=1 cs=1] - RenderBlock {DIV} at (0,150) size 784x17 + RenderBlock {DIV} at (0,152) size 784x18 RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTable {DIV} at (0,167) size 100x100 + RenderTable {DIV} at (0,170) size 100x100 RenderTableSection (anonymous) at (0,0) size 100x100 RenderTableRow {DIV} at (0,0) size 100x50 RenderTableCell {DIV} at (0,0) size 50x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.png index 14c299bc17aa..abed75688a2e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.txt index aa5c2968c529..1c5696d8db36 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-caption-optional-002-expected.txt @@ -1,27 +1,27 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x177 - RenderBlock {HTML} at (0,0) size 800x177 - RenderBody {BODY} at (8,16) size 784x153 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x180 + RenderBlock {HTML} at (0,0) size 800x180 + RenderBody {BODY} at (8,16) size 784x156 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 665x17 text run at (0,0) width 665: "Test passes if the left square below has \"Filler Text\" directly above it and the square on the right does not." - RenderBlock {DIV} at (0,33) size 784x120 - RenderTable {SPAN} at (0,0) size 100x117 - RenderBlock {SPAN} at (0,0) size 100x17 + RenderBlock {DIV} at (0,34) size 784x122 + RenderTable {SPAN} at (0,0) size 100x118 + RenderBlock {SPAN} at (0,0) size 100x18 RenderText {#text} at (0,0) size 66x17 text run at (0,0) width 66: "Filler Text" - RenderTableSection (anonymous) at (0,17) size 100x100 + RenderTableSection (anonymous) at (0,18) size 100x100 RenderTableRow {SPAN} at (0,0) size 100x50 RenderTableCell {SPAN} at (0,0) size 50x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] RenderTableCell {SPAN} at (50,0) size 50x0 [bgcolor=#000000] [r=0 c=1 rs=1 cs=1] RenderTableRow {SPAN} at (0,50) size 100x50 RenderTableCell {SPAN} at (0,50) size 50x0 [bgcolor=#000000] [r=1 c=0 rs=1 cs=1] RenderTableCell {SPAN} at (50,50) size 50x0 [bgcolor=#000000] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (100,103) size 16x17 - text run at (100,103) width 4: " " - text run at (104,103) width 12: " " - RenderTable {SPAN} at (116,17) size 100x100 + RenderText {#text} at (100,104) size 16x17 + text run at (100,104) width 4: " " + text run at (104,104) width 12: " " + RenderTable {SPAN} at (116,18) size 100x100 RenderTableSection (anonymous) at (0,0) size 100x100 RenderTableRow {SPAN} at (0,0) size 100x50 RenderTableCell {SPAN} at (0,0) size 50x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.png index fdcaa8f54acc..669702f13d43 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.txt index 1d8dd0f58e7a..904e88b9d393 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-023-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x157 - RenderBlock {HTML} at (0,0) size 800x157 - RenderBody {BODY} at (8,16) size 784x133 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x158 + RenderBlock {HTML} at (0,0) size 800x158 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 390x17 text run at (0,0) width 390: "Test passes if the bottom of the \"Filler Text\" below is aligned." - RenderTable {TABLE} at (0,33) size 358x100 + RenderTable {TABLE} at (0,34) size 358x100 RenderTableSection {TBODY} at (0,0) size 358x100 RenderTableRow {TR} at (0,2) size 358x96 - RenderTableCell {TD} at (2,26) size 59x17 [r=0 c=0 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 57x15 + RenderTableCell {TD} at (2,27) size 59x18 [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 57x16 RenderText {#text} at (0,0) size 57x15 text run at (0,0) width 57: "Filler Text" - RenderTableCell {TD} at (63,14) size 120x32 [r=0 c=1 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 118x30 + RenderTableCell {TD} at (63,15) size 120x33 [r=0 c=1 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 118x31 RenderText {#text} at (0,0) size 118x30 text run at (0,0) width 118: "Filler Text" - RenderTableCell {TD} at (185,2) size 171x47 [r=0 c=2 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 169x45 - RenderText {#text} at (0,0) size 169x45 - text run at (0,0) width 169: "Filler Text" + RenderTableCell {TD} at (185,2) size 171x49 [r=0 c=2 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 169x47 + RenderText {#text} at (0,1) size 169x45 + text run at (0,1) width 169: "Filler Text" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.png index fdcaa8f54acc..669702f13d43 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.txt index 1d8dd0f58e7a..904e88b9d393 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/table-height-algorithm-024-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x157 - RenderBlock {HTML} at (0,0) size 800x157 - RenderBody {BODY} at (8,16) size 784x133 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x158 + RenderBlock {HTML} at (0,0) size 800x158 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 390x17 text run at (0,0) width 390: "Test passes if the bottom of the \"Filler Text\" below is aligned." - RenderTable {TABLE} at (0,33) size 358x100 + RenderTable {TABLE} at (0,34) size 358x100 RenderTableSection {TBODY} at (0,0) size 358x100 RenderTableRow {TR} at (0,2) size 358x96 - RenderTableCell {TD} at (2,26) size 59x17 [r=0 c=0 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 57x15 + RenderTableCell {TD} at (2,27) size 59x18 [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 57x16 RenderText {#text} at (0,0) size 57x15 text run at (0,0) width 57: "Filler Text" - RenderTableCell {TD} at (63,14) size 120x32 [r=0 c=1 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 118x30 + RenderTableCell {TD} at (63,15) size 120x33 [r=0 c=1 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 118x31 RenderText {#text} at (0,0) size 118x30 text run at (0,0) width 118: "Filler Text" - RenderTableCell {TD} at (185,2) size 171x47 [r=0 c=2 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 169x45 - RenderText {#text} at (0,0) size 169x45 - text run at (0,0) width 169: "Filler Text" + RenderTableCell {TD} at (185,2) size 171x49 [r=0 c=2 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 169x47 + RenderText {#text} at (0,1) size 169x45 + text run at (0,1) width 169: "Filler Text" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.png index 2e73f62c31c1..c99183cc0dd4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.txt index 985d52486b26..0ff8b9866b0c 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/width-non-replaced-inline-001-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x74 - RenderBlock {HTML} at (0,0) size 800x74 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x76 + RenderBlock {HTML} at (0,0) size 800x76 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 505x17 text run at (0,0) width 505: "Test passes if the left and right borders start and end where the 'Filler Text' does." - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 286x17 [border: none (5px solid #000000) none (5px solid #000000)] RenderText {#text} at (5,0) size 276x17 text run at (5,0) width 276: "Filler Text Filler Text Filler Text Filler Text" diff --git a/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.png b/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.png index 00df9bc1981c..41ca893d429b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.png and b/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.txt b/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.txt index bd4eb2b37a05..c1837c593358 100644 --- a/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/20110323/width-replaced-element-001-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x72 - RenderBlock {HTML} at (0,0) size 800x72 - RenderBody {BODY} at (8,16) size 784x48 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x73 + RenderBlock {HTML} at (0,0) size 800x73 + RenderBody {BODY} at (8,16) size 784x49 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 491x17 text run at (0,0) width 491: "Test passes if the blue square is the same size or larger than the orange square." -layer at (8,49) size 784x15 - RenderBlock (relative positioned) {DIV} at (0,33) size 784x15 -layer at (8,49) size 15x15 +layer at (8,50) size 784x15 + RenderBlock (relative positioned) {DIV} at (0,34) size 784x15 +layer at (8,50) size 15x15 RenderBlock (relative positioned) {DIV} at (0,0) size 15x15 [bgcolor=#FFA500] -layer at (32,49) size 96x96 +layer at (32,50) size 96x96 RenderImage {IMG} at (24,0) size 96x96 diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.png index 5f5888b000b9..558817b620e4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.txt index 83899d186747..70685db9d686 100644 --- a/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t010403-shand-border-00-c-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x55 - RenderBlock {HTML} at (0,0) size 800x55 - RenderBody {BODY} at (8,16) size 784x23 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 784x23 [color=#008000] [border: (3px solid #008000)] +layer at (0,0) size 800x56 + RenderBlock {HTML} at (0,0) size 800x56 + RenderBody {BODY} at (8,16) size 784x24 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 784x24 [color=#008000] [border: (3px solid #008000)] RenderInline {SPAN} at (0,0) size 234x17 [color=#000000] RenderText {#text} at (3,3) size 234x17 text run at (3,3) width 234: "This text should have a green border." diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.png index d2a22acdd4b3..e6b14bdf9b61 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.txt index dbe2627f89e2..f4a435f52dca 100644 --- a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-00-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "The following paragraphs should be identical:" - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 248x17 text run at (0,0) width 248: "This should be in a normal weight font." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 248x17 text run at (0,0) width 248: "This should be in a normal weight font." diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.png index d2a22acdd4b3..e6b14bdf9b61 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.txt index dbe2627f89e2..f4a435f52dca 100644 --- a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-01-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "The following paragraphs should be identical:" - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 248x17 text run at (0,0) width 248: "This should be in a normal weight font." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 248x17 text run at (0,0) width 248: "This should be in a normal weight font." diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.png b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.png index b638fccca574..ba57621f255f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.txt index cbbf9068f71b..1f24ec3304ac 100644 --- a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-02-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "The following paragraphs should be identical:" - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 197x17 text run at (0,0) width 197: "This should be in a bold font." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 197x17 text run at (0,0) width 197: "This should be in a bold font." diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.png index b638fccca574..ba57621f255f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.txt index cbbf9068f71b..1f24ec3304ac 100644 --- a/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t010403-shand-font-03-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "The following paragraphs should be identical:" - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 197x17 text run at (0,0) width 197: "This should be in a bold font." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 197x17 text run at (0,0) width 197: "This should be in a bold font." diff --git a/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040102-keywords-00-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.png index 7f31a8739df9..240b2db9b701 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.txt index 06a689ab9ec3..a5aa4a5d3c70 100644 --- a/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040102-keywords-01-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x127 - RenderBlock {HTML} at (0,0) size 800x127 - RenderBody {BODY} at (8,16) size 784x95 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x130 + RenderBlock {HTML} at (0,0) size 800x130 + RenderBody {BODY} at (8,16) size 784x98 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 296x17 text run at (0,0) width 296: "The next two paragraphs should look identical:" - RenderBlock {P} at (0,33) size 166x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,34) size 166x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 31x17 text run at (3,3) width 31: "Test." - RenderBlock {P} at (0,72) size 166x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,74) size 166x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 31x17 text run at (3,3) width 31: "Test." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-case-00-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.txt index 42e6a13ed629..39a3c3bf273c 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-case-01-c-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.png index 2a824aeef4f8..1be79861b56c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.txt index 77c4a59d1131..8290d159d2e3 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-00-b-expected.txt @@ -1,21 +1,21 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x148 - RenderBlock {HTML} at (0,0) size 800x148 - RenderBody {BODY} at (8,16) size 784x116 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 337x17 text run at (0,0) width 337: "The following three paragraphs should look identical:" - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 149x17 text run at (0,0) width 149: "This is a test paragraph." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderInline (generated) at (0,0) size 32x17 RenderText at (0,0) size 32x17 text run at (0,0) width 32: "This " RenderText {#text} at (32,0) size 117x17 text run at (32,0) width 117: "is a test paragraph." - RenderBlock {P} at (0,99) size 784x17 + RenderBlock {P} at (0,102) size 784x18 RenderInline (generated) at (0,0) size 32x17 RenderText at (0,0) size 32x17 text run at (0,0) width 32: "This " diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-01-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.png index 1e8f291fd992..63bc4bc0105b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.txt index 2fce61de974f..1f947b11524c 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-02-d-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 308x17 text run at (0,0) width 308: "This paragraph should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-03-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-04-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-05-c-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-06-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-07-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.png index aa1e01440284..0480ec9ea49a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.txt index 4ed3620b20b2..838e7309dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-escapes-08-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#FFFFFF] [bgcolor=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 241x17 text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-00-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-01-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-02-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.png index c572223f7d62..f479fdd78a53 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.txt index 301e330a40ed..bece79684760 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-03-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#FF0000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#FF0000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-04-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-05-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-06-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-07-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-08-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-09-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-10-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-11-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-12-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.png b/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.png index 1eea4018cbde..c1c0bfe313d0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.txt index 19cdc1d97494..ce22222f8a92 100644 --- a/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040103-ident-13-c-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-00-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-00-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-01-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-01-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-02-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atkeyw-02-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atrule-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atrule-00-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atrule-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atrule-00-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atrule-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atrule-01-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atrule-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atrule-01-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atrule-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atrule-02-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atrule-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atrule-02-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atrule-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atrule-03-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atrule-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atrule-03-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-atrule-04-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-atrule-04-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-atrule-04-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-atrule-04-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-import-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-import-00-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-import-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-import-00-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-import-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-import-01-b-expected.txt index ea64162acfd2..2de35c702074 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-import-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-import-01-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040105-import-10-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040105-import-10-b-expected.txt index 226e9f2c1f5c..bae1d6e4ac87 100644 --- a/LayoutTests/platform/gtk/css2.1/t040105-import-10-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040105-import-10-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 182x17 text run at (0,0) width 182: "This sentence must be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.png index b19eb2220b21..a46b8932c788 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.txt index 86e7c9561f57..74ace9968e4e 100644 --- a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-00-b-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x214 - RenderBlock {HTML} at (0,0) size 800x214 - RenderBody {BODY} at (8,16) size 784x182 [color=#FF0000] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x220 + RenderBlock {HTML} at (0,0) size 800x220 + RenderBody {BODY} at (8,16) size 784x188 [color=#FF0000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,99) size 784x17 [color=#008000] + RenderBlock {P} at (0,102) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,132) size 784x17 [color=#008000] + RenderBlock {P} at (0,136) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,165) size 784x17 [color=#008000] + RenderBlock {P} at (0,170) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.png index 39867cc4bce9..54d75963d2d8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.txt index 376ac33a2955..459a8ac2e0ba 100644 --- a/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040109-c17-comments-01-b-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.png index 7c3bff378fe1..185d1db32825 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt index 83ec7e8ac676..072db0a0c18f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt @@ -1,33 +1,33 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x313 - RenderBlock {HTML} at (0,0) size 800x313 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x322 + RenderBlock {HTML} at (0,0) size 800x322 + RenderBody {BODY} at (8,16) size 784x290 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {DIV} at (0,66) size 784x17 [color=#008000] [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {DIV} at (0,68) size 784x18 [color=#008000] [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,99) size 784x17 [color=#008000] + RenderBlock {P} at (0,102) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,132) size 784x17 [color=#008000] + RenderBlock {P} at (0,136) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,165) size 784x17 [color=#008000] + RenderBlock {P} at (0,170) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,198) size 784x17 [color=#008000] + RenderBlock {P} at (0,204) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,231) size 784x17 [color=#008000] + RenderBlock {P} at (0,238) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,264) size 784x17 [color=#008000] + RenderBlock {P} at (0,272) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.png index 6192f7fee9de..22b5d0ebba35 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt index a92e4ecca479..ba7952db7b64 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x205 - RenderBlock {HTML} at (0,0) size 800x205 - RenderBody {BODY} at (8,16) size 784x173 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x210 + RenderBlock {HTML} at (0,0) size 800x210 + RenderBody {BODY} at (8,16) size 784x178 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 348x17 text run at (0,0) width 348: "The next four blocks should look identical, to the pixel." - RenderBlock {P} at (0,33) size 784x23 [border: (3px solid #000080)] + RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 27x17 text run at (3,3) width 27: "Test" - RenderBlock {P} at (0,72) size 784x23 [border: (3px solid #000080)] + RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 27x17 text run at (3,3) width 27: "Test" - RenderBlock {P} at (0,111) size 784x23 [border: (3px solid #000080)] + RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 27x17 text run at (3,3) width 27: "Test" - RenderBlock {P} at (0,150) size 784x23 [border: (3px solid #000080)] + RenderBlock {P} at (0,154) size 784x24 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 27x17 text run at (3,3) width 27: "Test" diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.png index 4f8f812d5d1b..9b59b5a0c4e4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt index 2ae6e3aeeeb9..e7134baae3ba 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt @@ -1,62 +1,62 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x544 - RenderBlock {HTML} at (0,0) size 800x544 - RenderBody {BODY} at (8,16) size 784x512 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x560 + RenderBlock {HTML} at (0,0) size 800x560 + RenderBody {BODY} at (8,16) size 784x528 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,99) size 784x17 + RenderBlock {P} at (0,102) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {OL} at (0,132) size 784x17 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {OL} at (0,136) size 784x18 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-20,0) size 16x17: "1" RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,165) size 784x17 + RenderBlock {P} at (0,170) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {UL} at (0,198) size 784x17 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,204) size 784x18 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {BLOCKQUOTE} at (40,231) size 704x17 - RenderBlock {P} at (0,0) size 704x17 + RenderBlock {BLOCKQUOTE} at (40,238) size 704x18 + RenderBlock {P} at (0,0) size 704x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,264) size 784x17 + RenderBlock {P} at (0,272) size 784x18 RenderInline {ACRONYM} at (0,0) size 163x17 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 - RenderBlock {ADDRESS} at (0,297) size 784x17 + RenderBlock {ADDRESS} at (0,306) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,330) size 784x17 + RenderBlock {P} at (0,340) size 784x18 RenderInline {SPAN} at (0,0) size 163x17 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,363) size 784x17 + RenderBlock {P} at (0,374) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,396) size 784x17 + RenderBlock {P} at (0,408) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,429) size 784x17 + RenderBlock {P} at (0,442) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,462) size 784x17 + RenderBlock {P} at (0,476) size 784x18 RenderText {#text} at (48,0) size 163x17 text run at (48,0) width 163: "This line should be green." - RenderBlock {P} at (0,495) size 784x17 + RenderBlock {P} at (0,510) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.png index 01444c9c127a..d507b94c7b16 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt index 8a5a38c632d8..b024d9d657d4 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x148 - RenderBlock {HTML} at (0,0) size 800x148 - RenderBody {BODY} at (8,16) size 784x116 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "These four lines should look identical, to the pixel." - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "These four lines should look identical, to the pixel." - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "These four lines should look identical, to the pixel." - RenderBlock {P} at (0,99) size 784x17 + RenderBlock {P} at (0,102) size 784x18 RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "These four lines should look identical, to the pixel." diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.png index b9ce2985b494..dd142987a0cf 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt index 5c6014581e4d..45f5bd313b62 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [bgcolor=#00FF00] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [bgcolor=#00FF00] RenderText {#text} at (48,0) size 204x17 text run at (48,0) width 204: "This line should be bright green." diff --git a/LayoutTests/platform/gtk/css2.1/t0402-syntax-01-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-syntax-01-f-expected.txt index eeb2027373b1..7c08a13d7665 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-syntax-01-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-syntax-01-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0402-syntax-02-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-syntax-02-f-expected.txt index eeb2027373b1..7c08a13d7665 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-syntax-02-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-syntax-02-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0402-syntax-03-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-syntax-03-f-expected.txt index eeb2027373b1..7c08a13d7665 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-syntax-03-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-syntax-03-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0402-syntax-04-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-syntax-04-f-expected.txt index eeb2027373b1..7c08a13d7665 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-syntax-04-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-syntax-04-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0402-syntax-05-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-syntax-05-f-expected.txt index eeb2027373b1..7c08a13d7665 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-syntax-05-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-syntax-05-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0402-syntax-06-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0402-syntax-06-f-expected.txt index eeb2027373b1..7c08a13d7665 100644 --- a/LayoutTests/platform/gtk/css2.1/t0402-syntax-06-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0402-syntax-06-f-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.png index 572f4286046b..a447389dddaa 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.txt index 13af4fc8f4d4..dbfbdb458889 100644 --- a/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040302-c61-ex-len-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x85 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 327x17 text run at (0,0) width 327: "The two blocks below should have the same height." - RenderTable {TABLE} at (80,33) size 102x52 + RenderTable {TABLE} at (80,34) size 102x52 RenderTableSection {TBODY} at (0,0) size 102x52 RenderTableRow {TR} at (0,2) size 102x48 RenderTableCell {TD} at (2,2) size 48x48 [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.png index 8c667e281778..7cfed0895222 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.txt index 9561b21b2b29..17d96b2320f5 100644 --- a/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040302-c61-phys-len-00-b-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x203 - RenderBlock {HTML} at (0,0) size 800x203 - RenderBody {BODY} at (8,16) size 784x179 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x206 + RenderBlock {HTML} at (0,0) size 800x206 + RenderBody {BODY} at (8,16) size 784x182 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 321x17 text run at (0,0) width 321: "There should be two unbroken vertical bars below." - RenderBlock {P} at (0,33) size 784x34 [color=#000080] - RenderText {#text} at (0,0) size 754x34 + RenderBlock {P} at (0,34) size 784x36 [color=#000080] + RenderText {#text} at (0,0) size 754x35 text run at (0,0) width 403: "Hold up a credit card to your display. The distance between the " text run at (403,0) width 351: "two vertical bars should be exactly the length of a credit" - text run at (0,17) width 31: "card " - text run at (31,17) width 74: "(85.60mm)." - RenderBlock {DIV} at (0,83) size 784x96 [border: none (3px solid #000000)] + text run at (0,18) width 31: "card " + text run at (31,18) width 74: "(85.60mm)." + RenderBlock {DIV} at (0,86) size 784x96 [border: none (3px solid #000000)] RenderBlock {DIV} at (326,0) size 458x16 [border: none (3px solid #000000)] RenderBlock {DIV} at (326,16) size 458x16 [border: none (3px solid #000000)] RenderBlock {DIV} at (326,32) size 458x16 [border: none (3px solid #000000)] diff --git a/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.png index b00f67cf22e0..9ed59ad96e8a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt index 7d7eb747b545..ff18cc7958b6 100644 --- a/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 324x17 text run at (0,0) width 324: "There should be a solid vertical bar of green below." - RenderBlock {DIV} at (0,33) size 784x60 [color=#008000] + RenderBlock {DIV} at (0,34) size 784x60 [color=#008000] RenderBlock {DIV} at (0,0) size 784x15 RenderText {#text} at (0,0) size 60x15 text run at (0,0) width 60: " X" diff --git a/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.png index ef0b86ba99b6..4b52b2775f7e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.txt index 6fc672d5dbc3..f347a3ecd8e8 100644 --- a/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040303-c62-percent-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x333 - RenderBlock {HTML} at (0,0) size 800x333 - RenderBody {BODY} at (8,16) size 784x309 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x334 + RenderBlock {HTML} at (0,0) size 800x334 + RenderBody {BODY} at (8,16) size 784x310 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be a green box below." - RenderBlock {DIV} at (0,33) size 186x276 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 186x276 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (48,18) size 90x75 RenderBlock {P} at (0,0) size 90x75 RenderText {#text} at (0,0) size 75x75 diff --git a/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.png b/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.png index 37e9add25e06..b3b7dd540c49 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.txt index b7f17cb60ff2..47bf97e8168e 100644 --- a/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040304-c64-uri-00-a-g-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x148 - RenderBlock {HTML} at (0,0) size 800x148 - RenderBody {BODY} at (8,16) size 784x116 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 256x17 text run at (0,0) width 256: "There should be three green lines below." - RenderBlock {P} at (0,33) size 784x17 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FFFFFF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {P} at (0,68) size 784x18 [color=#FFFFFF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,99) size 784x17 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {P} at (0,102) size 784x18 [color=#FFFFFF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.png index abd047d18b1b..c17b22b1dcc9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.txt index f18da63a4869..2ab4152d1f76 100644 --- a/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040306-c63-color-00-b-ag-expected.txt @@ -1,77 +1,77 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x108 - RenderBlock {HTML} at (0,0) size 800x108 - RenderBody {BODY} at (8,16) size 784x84 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x112 + RenderBlock {HTML} at (0,0) size 800x112 + RenderBody {BODY} at (8,16) size 784x88 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 650x17 text run at (0,0) width 650: "There should be three solid bars of colour below, each longer than the last, each of the colour specified." - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderText {#text} at (0,0) size 38x17 text run at (0,0) width 38: "Blue: " RenderInline {SPAN} at (0,0) size 15x15 - RenderText {#text} at (38,2) size 15x15 - text run at (38,2) width 15: "X" + RenderText {#text} at (38,3) size 15x15 + text run at (38,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 - RenderText {#text} at (53,2) size 15x15 - text run at (53,2) width 15: "X" - RenderImage {IMG} at (68,2) size 15x15 [color=#FF0000] + RenderText {#text} at (53,3) size 15x15 + text run at (53,3) width 15: "X" + RenderImage {IMG} at (68,3) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 55x17 text run at (0,0) width 55: "Orange: " RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (55,2) size 15x15 - text run at (55,2) width 15: "X" + RenderText {#text} at (55,3) size 15x15 + text run at (55,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (70,2) size 15x15 - text run at (70,2) width 15: "X" + RenderText {#text} at (70,3) size 15x15 + text run at (70,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (85,2) size 15x15 - text run at (85,2) width 15: "X" + RenderText {#text} at (85,3) size 15x15 + text run at (85,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (100,2) size 15x15 - text run at (100,2) width 15: "X" - RenderImage {IMG} at (115,2) size 15x15 [color=#FF0000] + RenderText {#text} at (100,3) size 15x15 + text run at (100,3) width 15: "X" + RenderImage {IMG} at (115,3) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,67) size 784x17 + RenderBlock {DIV} at (0,70) size 784x18 RenderText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "Lime: " RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (41,2) size 15x15 - text run at (41,2) width 15: "X" + RenderText {#text} at (41,3) size 15x15 + text run at (41,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (56,2) size 15x15 - text run at (56,2) width 15: "X" + RenderText {#text} at (56,3) size 15x15 + text run at (56,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (71,2) size 15x15 - text run at (71,2) width 15: "X" + RenderText {#text} at (71,3) size 15x15 + text run at (71,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (86,2) size 15x15 - text run at (86,2) width 15: "X" + RenderText {#text} at (86,3) size 15x15 + text run at (86,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (101,2) size 15x15 - text run at (101,2) width 15: "X" + RenderText {#text} at (101,3) size 15x15 + text run at (101,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (116,2) size 15x15 - text run at (116,2) width 15: "X" + RenderText {#text} at (116,3) size 15x15 + text run at (116,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (131,2) size 15x15 - text run at (131,2) width 15: "X" + RenderText {#text} at (131,3) size 15x15 + text run at (131,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (146,2) size 15x15 - text run at (146,2) width 15: "X" + RenderText {#text} at (146,3) size 15x15 + text run at (146,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (161,2) size 15x15 - text run at (161,2) width 15: "X" + RenderText {#text} at (161,3) size 15x15 + text run at (161,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (176,2) size 15x15 - text run at (176,2) width 15: "X" + RenderText {#text} at (176,3) size 15x15 + text run at (176,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (191,2) size 15x15 - text run at (191,2) width 15: "X" + RenderText {#text} at (191,3) size 15x15 + text run at (191,3) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (206,2) size 15x15 - text run at (206,2) width 15: "X" - RenderImage {IMG} at (221,2) size 15x15 [color=#FF0000] + RenderText {#text} at (206,3) size 15x15 + text run at (206,3) width 15: "X" + RenderImage {IMG} at (221,3) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.png b/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.png index 69b87bdaf36e..f81d3f2a3003 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.txt index 8d7760ec73d8..e5e418532bfb 100644 --- a/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040306-syntax-01-f-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x313 - RenderBlock {HTML} at (0,0) size 800x313 - RenderBody {BODY} at (8,16) size 784x281 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x322 + RenderBlock {HTML} at (0,0) size 800x322 + RenderBody {BODY} at (8,16) size 784x290 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,99) size 784x17 [color=#008000] + RenderBlock {P} at (0,102) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,132) size 784x17 [color=#008000] + RenderBlock {P} at (0,136) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,165) size 784x17 [color=#008000] + RenderBlock {P} at (0,170) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,198) size 784x17 [color=#008000] + RenderBlock {P} at (0,204) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,231) size 784x17 [color=#008000] + RenderBlock {P} at (0,238) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" - RenderBlock {P} at (0,264) size 784x17 [color=#007F00] + RenderBlock {P} at (0,272) size 784x18 [color=#007F00] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t040307-syntax-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t040307-syntax-01-b-expected.txt index 82737b4a4b9e..80d453e33480 100644 --- a/LayoutTests/platform/gtk/css2.1/t040307-syntax-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t040307-syntax-01-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 132x17 text run at (0,0) width 132: "This should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.png index 0478d3cb9402..9ac3fc925734 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.txt index 542ecb05cd17..a753abbfccc6 100644 --- a/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t050201-c12-grouping-00-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.png index 9728c1b02f2c..829e1f0c9ffe 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.txt index ddb344bd2532..db5c031bb243 100644 --- a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-00-e-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x99 - RenderBlock {HTML} at (0,0) size 800x99 - RenderBody {BODY} at (8,16) size 784x67 [color=#FF0000] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x102 + RenderBlock {HTML} at (0,0) size 800x102 + RenderBody {BODY} at (8,16) size 784x70 [color=#FF0000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {UL} at (0,33) size 784x34 - RenderListItem {LI} at (40,0) size 744x34 - RenderBlock (anonymous) at (0,0) size 744x17 + RenderBlock {UL} at (0,34) size 784x36 + RenderListItem {LI} at (40,0) size 744x36 + RenderBlock (anonymous) at (0,0) size 744x18 RenderInline {SPAN} at (0,0) size 163x17 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 - RenderBlock {UL} at (0,17) size 744x17 - RenderListItem {LI} at (40,0) size 704x17 [color=#008000] + RenderBlock {UL} at (0,18) size 744x18 + RenderListItem {LI} at (40,0) size 704x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.png index 28d7d270acd6..3ea9b92d5da5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.txt index 9e318845a487..a9969eba157f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-01-e-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {DIV} at (0,0) size 784x17 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {DIV} at (0,0) size 784x18 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {UL} at (0,33) size 784x17 [color=#008000] - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,34) size 784x18 [color=#008000] + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderInline {SPAN} at (0,0) size 4x17 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 diff --git a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-02-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-02-e-expected.txt index 83c5f399111e..055d5a111e9c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-02-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0505-c16-descendant-02-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {DIV} at (0,0) size 784x17 [color=#FF0000] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {DIV} at (0,0) size 784x18 [color=#FF0000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.png b/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.png index 12bab32b1b00..cecae7535667 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.txt index 55e3656f5e8c..c64af8f8401f 100644 --- a/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t050803-c14-classes-00-e-expected.txt @@ -1,28 +1,28 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x212 - RenderBlock {HTML} at (0,0) size 800x212 - RenderBody {BODY} at (8,16) size 784x180 [color=#FF0000] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x217 + RenderBlock {HTML} at (0,0) size 800x217 + RenderBody {BODY} at (8,16) size 784x185 [color=#FF0000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {DIV} at (0,33) size 784x17 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,99) size 784x17 [color=#008000] + RenderBlock {P} at (0,102) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {DIV} at (0,132) size 784x15 [color=#008000] + RenderBlock {DIV} at (0,136) size 784x15 [color=#008000] RenderBlock {PRE} at (0,0) size 784x15 RenderText {#text} at (0,0) size 240x15 text run at (0,0) width 240: "This sentence should be green." - RenderBlock {DIV} at (0,163) size 784x17 [color=#008000] - RenderBlock {UL} at (0,0) size 784x17 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {DIV} at (0,167) size 784x18 [color=#008000] + RenderBlock {UL} at (0,0) size 784x18 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.png index cc8380aaf447..0eb21eb3b95c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.txt index 2e295a66266a..500a803fbf0c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-00-a-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 [color=#FF0000] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 [color=#FF0000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.png index c692cae66d45..c30f5a9514e0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.txt index 575aae39a7aa..b602ae715250 100644 --- a/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0509-c15-ids-01-e-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {HTML} at (0,0) size 800x113 - RenderBody {BODY} at (8,16) size 784x81 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 [color=#FF0000] +layer at (0,0) size 800x115 + RenderBlock {HTML} at (0,0) size 800x115 + RenderBody {BODY} at (8,16) size 784x83 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 [color=#FF0000] RenderInline {SPAN} at (0,0) size 163x17 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 - RenderBlock {PRE} at (0,33) size 784x15 + RenderBlock {PRE} at (0,34) size 784x15 RenderText {#text} at (0,0) size 224x15 text run at (0,0) width 224: " This line should be green. " - RenderBlock {UL} at (0,64) size 784x17 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,65) size 784x18 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-01-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-01-f-expected.txt index 46887d8b9ae7..738bc8359de0 100644 --- a/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-01-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-01-f-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {DIV} at (0,0) size 784x17 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {DIV} at (0,0) size 784x18 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-02-b-expected.txt index e121cf5dfbbd..32daf7a869cc 100644 --- a/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0509-id-sel-syntax-02-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {DIV} at (0,0) size 784x17 [color=#FF0000] - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {DIV} at (0,0) size 784x18 [color=#FF0000] + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png index d75c75b3a538..938fe8fc25bb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt index f895a03fde8e..087eb1cf5297 100644 --- a/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x107 - RenderBlock {HTML} at (0,0) size 800x107 - RenderBody {BODY} at (8,8) size 784x83 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,8) size 784x86 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 254x17 text run at (0,0) width 254: "There should be two lines of text below." - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 222x17 text run at (0,0) width 222: "This line should be white on green." - RenderBlock {P} at (0,66) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,68) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 222x17 text run at (0,0) width 222: "This line should be white on green." diff --git a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt index 8c10dc29de3d..086a1bfac8a9 100644 --- a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 194x17 [color=#008000] RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-00-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-00-e-expected.txt index 07f447c00f43..7ddf78962f1c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-00-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-00-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 164x17 [color=#008000] RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This link should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-01-e-expected.txt index 07f447c00f43..7ddf78962f1c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-01-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 164x17 [color=#008000] RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This link should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-02-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-02-e-expected.txt index 07f447c00f43..7ddf78962f1c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-02-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-02-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 164x17 [color=#008000] RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This link should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-03-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-03-e-expected.txt index 07f447c00f43..7ddf78962f1c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-03-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0511-c21-pseud-link-03-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 164x17 [color=#008000] RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This link should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.png b/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.png index 0b9ea79aa076..60e5d4f09549 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.png and b/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt b/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt index 497869faf296..e3415cb468e5 100644 --- a/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 333x17 [color=#0000FF] RenderText {#text} at (0,0) size 333x17 text run at (0,0) width 333: "While you are activating this link, it should go green." diff --git a/LayoutTests/platform/gtk/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt b/LayoutTests/platform/gtk/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt index e57afaa792d5..f29aacfa8b34 100644 --- a/LayoutTests/platform/gtk/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 255x17 [color=#0000FF] RenderText {#text} at (0,0) size 255x17 text run at (0,0) width 255: "If you focus this link, it should go green." diff --git a/LayoutTests/platform/gtk/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt b/LayoutTests/platform/gtk/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt index d3cc9f2c196d..9459c3bdf015 100644 --- a/LayoutTests/platform/gtk/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 360x17 [color=#0000FF] RenderText {#text} at (0,0) size 360x17 text run at (0,0) width 360: "While you are hovering over this link, it should go green." diff --git a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.png b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.png index e6080a1a7fd8..0f65edde7509 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.png and b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.txt b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.txt index 53f37f904c70..2e320d737561 100644 --- a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-01-c-io-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x50 - RenderBlock {HTML} at (0,0) size 800x50 - RenderBody {BODY} at (8,8) size 784x34 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x52 + RenderBlock {HTML} at (0,0) size 800x52 + RenderBody {BODY} at (8,8) size 784x36 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 496x17 text run at (0,0) width 101: "Hover this text, " text run at (101,0) width 168: "then wait till it disappears. " text run at (269,0) width 227: "At that point there should be no red." - RenderBlock {DIV} at (0,17) size 784x17 [color=#FF0000] + RenderBlock {DIV} at (0,18) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 164: "This should end up green." diff --git a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.png b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.png index 29351b38ea93..041a3740e606 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.png and b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.txt b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.txt index e79b86104f17..acafe07b35ea 100644 --- a/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051103-dom-hover-02-c-io-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x67 - RenderBlock {HTML} at (0,0) size 800x67 - RenderBody {BODY} at (8,8) size 784x51 - RenderBlock {DIV} at (0,0) size 784x34 - RenderBlock (anonymous) at (0,0) size 784x17 +layer at (0,0) size 800x70 + RenderBlock {HTML} at (0,0) size 800x70 + RenderBody {BODY} at (8,8) size 784x54 + RenderBlock {DIV} at (0,0) size 784x36 + RenderBlock (anonymous) at (0,0) size 784x18 RenderText {#text} at (0,0) size 170x17 text run at (0,0) width 170: "Dummy text. Dummy text." - RenderBlock {DIV} at (0,17) size 784x17 + RenderBlock {DIV} at (0,18) size 784x18 RenderInline {SPAN} at (0,0) size 496x17 RenderText {#text} at (0,0) size 496x17 text run at (0,0) width 101: "Hover this text, " text run at (101,0) width 168: "then wait till it disappears. " text run at (269,0) width 227: "At that point there should be no red." RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,34) size 784x17 [color=#008000] + RenderBlock {DIV} at (0,36) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 170x17 text run at (0,0) width 170: "Dummy text. Dummy text." diff --git a/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.png index a170e07d5918..88adb3cd2a11 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.txt index 6301e4543d03..c685f9625af1 100644 --- a/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051201-c23-first-line-00-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x389 - RenderBlock {HTML} at (0,0) size 800x389 - RenderBody {BODY} at (8,16) size 784x357 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x102 +layer at (0,0) size 800x407 + RenderBlock {HTML} at (0,0) size 800x407 + RenderBody {BODY} at (8,16) size 784x375 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x108 RenderText {#text} at (0,0) size 29x17 text run at (0,0) width 29: "The " RenderInline {STRONG} at (0,0) size 55x17 @@ -15,53 +15,53 @@ layer at (0,0) size 800x389 RenderInline {STRONG} at (0,0) size 38x17 RenderText {#text} at (384,0) size 38x17 text run at (384,0) width 38: "green" - RenderText {#text} at (422,0) size 780x102 + RenderText {#text} at (422,0) size 780x107 text run at (422,0) width 178: ". If this precise combination " text run at (600,0) width 180: "does not occur, then the user" - text run at (0,17) width 230: "agent has failed this test. Remember " - text run at (230,17) width 385: "that in order to ensure a complete test, the paragraph must be " - text run at (615,17) width 147: "displayed on more than" - text run at (0,34) width 288: "one line. Dummy text. Dummy text. Dummy " - text run at (288,34) width 462: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text." - text run at (0,51) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (491,51) width 288: "text. Dummy text. Dummy text. Dummy text." - text run at (0,68) width 174: "Dummy text. Dummy text. " - text run at (174,68) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (665,68) width 114: "text. Dummy text." - text run at (0,85) width 170: "Dummy text. Dummy text." - RenderBlock {P} at (0,118) size 784x121 + text run at (0,18) width 230: "agent has failed this test. Remember " + text run at (230,18) width 385: "that in order to ensure a complete test, the paragraph must be " + text run at (615,18) width 147: "displayed on more than" + text run at (0,36) width 288: "one line. Dummy text. Dummy text. Dummy " + text run at (288,36) width 462: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text." + text run at (0,54) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (491,54) width 288: "text. Dummy text. Dummy text. Dummy text." + text run at (0,72) width 174: "Dummy text. Dummy text. " + text run at (174,72) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (665,72) width 114: "text. Dummy text." + text run at (0,90) width 170: "Dummy text. Dummy text." + RenderBlock {P} at (0,124) size 784x127 RenderText {#text} at (0,0) size 58x36 text run at (0,0) width 58: "The " RenderInline {STRONG} at (0,0) size 115x36 RenderText {#text} at (58,0) size 115x36 text run at (58,0) width 115: "first line" - RenderText {#text} at (173,0) size 774x53 + RenderText {#text} at (173,0) size 774x54 text run at (173,0) width 416: " of this paragraph, and only that " text run at (589,0) width 185: "one, should be" - text run at (0,36) width 11: "a " + text run at (0,37) width 11: "a " RenderInline {STRONG} at (0,0) size 41x17 - RenderText {#text} at (11,36) size 41x17 - text run at (11,36) width 41: "larger" - RenderText {#text} at (52,36) size 126x17 - text run at (52,36) width 126: " font size as well as " + RenderText {#text} at (11,37) size 41x17 + text run at (11,37) width 41: "larger" + RenderText {#text} at (52,37) size 126x17 + text run at (52,37) width 126: " font size as well as " RenderInline {STRONG} at (0,0) size 38x17 - RenderText {#text} at (178,36) size 38x17 - text run at (178,36) width 38: "green" - RenderText {#text} at (216,36) size 779x85 - text run at (216,36) width 278: ". If this precise combination does not occur, " - text run at (494,36) width 237: "then the user agent has failed this test." - text run at (0,53) width 169: "Remember that in order to " - text run at (169,53) width 409: "ensure a complete test, the paragraph must be displayed on more " - text run at (578,53) width 172: "than one line. Dummy text." - text run at (0,70) width 261: "Dummy text. Dummy text. Dummy text. " - text run at (261,70) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (752,70) width 27: "text." - text run at (0,87) width 435: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " - text run at (435,87) width 344: "Dummy text. Dummy text. Dummy text. Dummy text." - text run at (0,104) width 143: "Dummy text. Dummy " - text run at (143,104) width 466: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " - text run at (609,104) width 170: "Dummy text. Dummy text." - RenderBlock {P} at (0,255) size 784x102 + RenderText {#text} at (178,37) size 38x17 + text run at (178,37) width 38: "green" + RenderText {#text} at (216,37) size 779x89 + text run at (216,37) width 278: ". If this precise combination does not occur, " + text run at (494,37) width 237: "then the user agent has failed this test." + text run at (0,55) width 169: "Remember that in order to " + text run at (169,55) width 409: "ensure a complete test, the paragraph must be displayed on more " + text run at (578,55) width 172: "than one line. Dummy text." + text run at (0,73) width 261: "Dummy text. Dummy text. Dummy text. " + text run at (261,73) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (752,73) width 27: "text." + text run at (0,91) width 435: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " + text run at (435,91) width 344: "Dummy text. Dummy text. Dummy text. Dummy text." + text run at (0,109) width 143: "Dummy text. Dummy " + text run at (143,109) width 466: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " + text run at (609,109) width 170: "Dummy text. Dummy text." + RenderBlock {P} at (0,267) size 784x108 RenderText {#text} at (0,0) size 29x17 text run at (0,0) width 29: "The " RenderInline {STRONG} at (0,0) size 62x17 @@ -79,17 +79,17 @@ layer at (0,0) size 800x389 RenderInline {STRONG} at (0,0) size 39x17 RenderText {#text} at (679,0) size 39x17 text run at (679,0) width 39: "green" - RenderText {#text} at (718,0) size 784x102 + RenderText {#text} at (718,0) size 784x107 text run at (718,0) width 58: ". Thus, if" - text run at (0,17) width 132: "the first line is not in " - text run at (132,17) width 341: "small-caps style, or if the entire paragraph turns out in " - text run at (473,17) width 311: "small-caps, then the user agent has failed this test." - text run at (0,34) width 87: "Dummy text. " - text run at (87,34) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (578,34) width 201: "text. Dummy text. Dummy text." - text run at (0,51) width 261: "Dummy text. Dummy text. Dummy text. " - text run at (261,51) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (752,51) width 27: "text." - text run at (0,68) width 435: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " - text run at (435,68) width 344: "Dummy text. Dummy text. Dummy text. Dummy text." - text run at (0,85) width 83: "Dummy text." + text run at (0,18) width 132: "the first line is not in " + text run at (132,18) width 341: "small-caps style, or if the entire paragraph turns out in " + text run at (473,18) width 311: "small-caps, then the user agent has failed this test." + text run at (0,36) width 87: "Dummy text. " + text run at (87,36) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (578,36) width 201: "text. Dummy text. Dummy text." + text run at (0,54) width 261: "Dummy text. Dummy text. Dummy text. " + text run at (261,54) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (752,54) width 27: "text." + text run at (0,72) width 435: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " + text run at (435,72) width 344: "Dummy text. Dummy text. Dummy text. Dummy text." + text run at (0,90) width 83: "Dummy text." diff --git a/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.png index 0963f2fb539f..4a0068709f14 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.txt index a37ae432244f..b8a6483692ef 100644 --- a/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051202-c24-first-lttr-00-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x247 - RenderBlock {HTML} at (0,0) size 800x247 - RenderBody {BODY} at (8,16) size 784x215 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x255 + RenderBlock {HTML} at (0,0) size 800x255 + RenderBody {BODY} at (8,16) size 784x223 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x36 RenderInline (generated) at (0,0) size 10x17 [color=#008000] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" @@ -18,11 +18,11 @@ layer at (0,0) size 800x247 RenderInline {STRONG} at (0,0) size 38x17 RenderText {#text} at (395,0) size 38x17 text run at (395,0) width 38: "green" - RenderText {#text} at (433,0) size 761x34 + RenderText {#text} at (433,0) size 761x35 text run at (433,0) width 178: ". If this precise combination " text run at (611,0) width 150: "does not occur, then the" - text run at (0,17) width 183: "user agent has failed this test." - RenderBlock {P} at (0,50) size 784x53 + text run at (0,18) width 183: "user agent has failed this test." + RenderBlock {P} at (0,52) size 784x55 RenderInline (generated) at (0,0) size 20x36 [color=#008000] RenderText {#text} at (0,0) size 20x36 text run at (0,0) width 20: "T" @@ -42,33 +42,33 @@ layer at (0,0) size 800x247 RenderInline {STRONG} at (0,0) size 38x17 RenderText {#text} at (603,15) size 38x17 text run at (603,15) width 38: "green" - RenderText {#text} at (641,15) size 733x38 + RenderText {#text} at (641,15) size 733x39 text run at (641,15) width 92: ". If this precise" - text run at (0,36) width 182: "combination does not occur, " - text run at (182,36) width 237: "then the user agent has failed this test." - RenderBlock {P} at (0,119) size 784x96 + text run at (0,37) width 182: "combination does not occur, " + text run at (182,37) width 237: "then the user agent has failed this test." + RenderBlock {P} at (0,123) size 784x100 RenderInline (generated) at (0,0) size 57x62 [color=#008000] - RenderText {#text} at (0,0) size 57x62 - text run at (0,0) width 57: "\"T" - RenderText {#text} at (57,36) size 19x17 - text run at (57,36) width 19: "he " + RenderText {#text} at (0,1) size 57x62 + text run at (0,1) width 57: "\"T" + RenderText {#text} at (57,37) size 19x17 + text run at (57,37) width 19: "he " RenderInline {STRONG} at (0,0) size 131x17 - RenderText {#text} at (76,36) size 131x17 - text run at (76,36) width 131: "first two characters" - RenderText {#text} at (207,36) size 452x17 - text run at (207,36) width 129: " in this paragraph (a " - text run at (336,36) width 323: "double-quote mark and a capital 'T') should be in a " + RenderText {#text} at (76,37) size 131x17 + text run at (76,37) width 131: "first two characters" + RenderText {#text} at (207,37) size 452x17 + text run at (207,37) width 129: " in this paragraph (a " + text run at (336,37) width 323: "double-quote mark and a capital 'T') should be in a " RenderInline {STRONG} at (0,0) size 83x17 - RenderText {#text} at (659,36) size 83x17 - text run at (659,36) width 42: "much " - text run at (701,36) width 41: "larger" - RenderText {#text} at (742,36) size 771x43 - text run at (742,36) width 29: " font" - text run at (0,62) width 246: "size than the rest of the paragraph, and " + RenderText {#text} at (659,37) size 83x17 + text run at (659,37) width 42: "much " + text run at (701,37) width 41: "larger" + RenderText {#text} at (742,37) size 771x44 + text run at (742,37) width 29: " font" + text run at (0,64) width 246: "size than the rest of the paragraph, and " RenderInline {STRONG} at (0,0) size 38x17 - RenderText {#text} at (246,62) size 38x17 - text run at (246,62) width 38: "green" - RenderText {#text} at (284,62) size 770x34 - text run at (284,62) width 278: ". If this precise combination does not occur, " - text run at (562,62) width 208: "then the user agent has failed this" - text run at (0,79) width 25: "test." + RenderText {#text} at (246,64) size 38x17 + text run at (246,64) width 38: "green" + RenderText {#text} at (284,64) size 770x35 + text run at (284,64) width 278: ". If this precise combination does not occur, " + text run at (562,64) width 208: "then the user agent has failed this" + text run at (0,82) width 25: "test." diff --git a/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.png index 759c149f2005..9b707f2b6480 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.txt index f9344ff792d5..92cfb1321580 100644 --- a/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t051202-c26-psudo-nest-00-c-expected.txt @@ -1,53 +1,53 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x437 - RenderBlock {HTML} at (0,0) size 800x437 - RenderBody {BODY} at (8,16) size 784x413 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x227 +layer at (0,0) size 800x454 + RenderBlock {HTML} at (0,0) size 800x454 + RenderBody {BODY} at (8,16) size 784x430 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x237 RenderInline (generated) at (0,0) size 88x159 [color=#00FFFF] - RenderText {#text} at (0,0) size 88x159 - text run at (0,0) width 88: "T" - RenderText {#text} at (88,85) size 57x53 - text run at (88,85) width 57: "he " + RenderText {#text} at (0,3) size 88x159 + text run at (0,3) width 88: "T" + RenderText {#text} at (88,88) size 57x53 + text run at (88,88) width 57: "he " RenderInline {STRONG} at (0,0) size 205x53 - RenderText {#text} at (145,85) size 205x53 - text run at (145,85) width 205: "first letter" - RenderText {#text} at (350,85) size 779x91 - text run at (350,85) width 429: " of this paragraph, and" - text run at (0,159) width 59: "only that " - text run at (59,159) width 96: "one, should be " + RenderText {#text} at (145,88) size 205x53 + text run at (145,88) width 205: "first letter" + RenderText {#text} at (350,88) size 779x94 + text run at (350,88) width 429: " of this paragraph, and" + text run at (0,165) width 59: "only that " + text run at (59,165) width 96: "one, should be " RenderInline {STRONG} at (0,0) size 87x17 - RenderText {#text} at (155,159) size 87x17 - text run at (155,159) width 87: "600% bigger" - RenderText {#text} at (242,159) size 513x17 - text run at (242,159) width 133: " than the normal text " - text run at (375,159) width 380: "(300% bigger than the rest of first line of this paragraph) and" + RenderText {#text} at (155,165) size 87x17 + text run at (155,165) width 87: "600% bigger" + RenderText {#text} at (242,165) size 513x17 + text run at (242,165) width 133: " than the normal text " + text run at (375,165) width 380: "(300% bigger than the rest of first line of this paragraph) and" RenderInline {STRONG} at (0,0) size 34x17 - RenderText {#text} at (0,176) size 34x17 - text run at (0,176) width 34: "aqua" - RenderText {#text} at (34,176) size 109x17 - text run at (34,176) width 109: ", while the entire " + RenderText {#text} at (0,183) size 34x17 + text run at (0,183) width 34: "aqua" + RenderText {#text} at (34,183) size 109x17 + text run at (34,183) width 109: ", while the entire " RenderInline {STRONG} at (0,0) size 55x17 - RenderText {#text} at (143,176) size 55x17 - text run at (143,176) width 55: "first line" - RenderText {#text} at (198,176) size 69x17 - text run at (198,176) width 4: " " - text run at (202,176) width 65: "should be " + RenderText {#text} at (143,183) size 55x17 + text run at (143,183) width 55: "first line" + RenderText {#text} at (198,183) size 69x17 + text run at (198,183) width 4: " " + text run at (202,183) width 65: "should be " RenderInline {STRONG} at (0,0) size 87x17 - RenderText {#text} at (267,176) size 87x17 - text run at (267,176) width 87: "300% bigger" - RenderText {#text} at (354,176) size 110x17 - text run at (354,176) width 110: " than normal and " + RenderText {#text} at (267,183) size 87x17 + text run at (267,183) width 87: "300% bigger" + RenderText {#text} at (354,183) size 110x17 + text run at (354,183) width 110: " than normal and " RenderInline {STRONG} at (0,0) size 24x17 - RenderText {#text} at (464,176) size 24x17 - text run at (464,176) width 24: "teal" - RenderText {#text} at (488,176) size 779x51 - text run at (488,176) width 274: ". If this precise combination does not occur," - text run at (0,193) width 410: "then the user agent has failed this test. Remember that in order to " - text run at (410,193) width 369: "ensure a complete test, the paragraph must be displayed on" - text run at (0,210) width 36: "more " - text run at (36,210) width 146: "than one line. (TEST1)" - RenderBlock {P} at (0,243) size 784x70 + RenderText {#text} at (464,183) size 24x17 + text run at (464,183) width 24: "teal" + RenderText {#text} at (488,183) size 779x53 + text run at (488,183) width 274: ". If this precise combination does not occur," + text run at (0,201) width 410: "then the user agent has failed this test. Remember that in order to " + text run at (410,201) width 369: "ensure a complete test, the paragraph must be displayed on" + text run at (0,219) width 36: "more " + text run at (36,219) width 146: "than one line. (TEST1)" + RenderBlock {P} at (0,253) size 784x73 RenderInline (generated) at (0,0) size 33x36 [color=#00FFFF] RenderText {#text} at (0,0) size 33x36 text run at (0,0) width 33: "\"T" @@ -63,28 +63,28 @@ layer at (0,0) size 800x437 RenderText {#text} at (687,15) size 88x17 text run at (687,15) width 44: "200% " text run at (731,15) width 44: "bigger" - RenderText {#text} at (0,36) size 218x17 - text run at (0,36) width 218: "than the rest of the paragraph, and " + RenderText {#text} at (0,37) size 218x17 + text run at (0,37) width 218: "than the rest of the paragraph, and " RenderInline {STRONG} at (0,0) size 34x17 - RenderText {#text} at (218,36) size 34x17 - text run at (218,36) width 34: "aqua" - RenderText {#text} at (252,36) size 146x17 - text run at (252,36) width 146: ". In addition, the entire " + RenderText {#text} at (218,37) size 34x17 + text run at (218,37) width 34: "aqua" + RenderText {#text} at (252,37) size 146x17 + text run at (252,37) width 146: ". In addition, the entire " RenderInline {STRONG} at (0,0) size 55x17 - RenderText {#text} at (398,36) size 55x17 - text run at (398,36) width 31: "first " - text run at (429,36) width 24: "line" - RenderText {#text} at (453,36) size 96x17 - text run at (453,36) width 96: " should be in a " + RenderText {#text} at (398,37) size 55x17 + text run at (398,37) width 31: "first " + text run at (429,37) width 24: "line" + RenderText {#text} at (453,37) size 96x17 + text run at (453,37) width 96: " should be in a " RenderInline {STRONG} at (0,0) size 159x17 - RenderText {#text} at (549,36) size 159x17 - text run at (549,36) width 135: "small-caps font and " - text run at (684,36) width 24: "teal" - RenderText {#text} at (708,36) size 724x34 - text run at (708,36) width 4: "." - text run at (0,53) width 315: "Remember that in order to ensure a complete test, " - text run at (315,53) width 409: "the paragraph must be displayed on more than one line. (TEST2)" - RenderBlock {P} at (0,329) size 784x51 + RenderText {#text} at (549,37) size 159x17 + text run at (549,37) width 135: "small-caps font and " + text run at (684,37) width 24: "teal" + RenderText {#text} at (708,37) size 724x35 + text run at (708,37) width 4: "." + text run at (0,55) width 315: "Remember that in order to ensure a complete test, " + text run at (315,55) width 409: "the paragraph must be displayed on more than one line. (TEST2)" + RenderBlock {P} at (0,342) size 784x54 RenderInline (generated) at (0,0) size 10x17 [color=#00FFFF] RenderText {#text} at (0,0) size 10x17 text run at (0,0) width 10: "T" @@ -109,14 +109,14 @@ layer at (0,0) size 800x437 RenderInline {STRONG} at (0,0) size 24x17 RenderText {#text} at (662,0) size 24x17 text run at (662,0) width 24: "teal" - RenderText {#text} at (686,0) size 778x51 + RenderText {#text} at (686,0) size 778x53 text run at (686,0) width 22: ". If " text run at (708,0) width 70: "this precise" - text run at (0,17) width 329: "combination does not occur, then the user agent has " - text run at (329,17) width 409: "failed this test. Remember that in order to ensure a complete test, " - text run at (738,17) width 19: "the" - text run at (0,34) width 386: "paragraph must be displayed on more than one line. (TEST3)" - RenderBlock {DIV} at (0,396) size 784x17 + text run at (0,18) width 329: "combination does not occur, then the user agent has " + text run at (329,18) width 409: "failed this test. Remember that in order to ensure a complete test, " + text run at (738,18) width 19: "the" + text run at (0,36) width 386: "paragraph must be displayed on more than one line. (TEST3)" + RenderBlock {DIV} at (0,412) size 784x18 RenderText {#text} at (0,0) size 168x17 text run at (0,0) width 168: "You should see the words " RenderInline {STRONG} at (0,0) size 68x17 diff --git a/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.png index 0db3dcaf67e4..13ca68993d89 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.txt index 6c03865d4370..cf2d6fc8a6fd 100644 --- a/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0602-c13-inh-underlin-00-e-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x149 - RenderBlock {HTML} at (0,0) size 800x149 - RenderBody {BODY} at (8,16) size 784x117 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "This should be blue and underlined." - RenderBlock {P} at (0,33) size 784x18 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "This sentence should be underlined, including " RenderInline {CODE} at (0,0) size 72x15 @@ -30,7 +30,7 @@ layer at (0,0) size 800x149 text run at (520,0) width 57: "this part" RenderText {#text} at (577,0) size 4x17 text run at (577,0) width 4: "." - RenderBlock {P} at (0,67) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 371x17 text run at (0,0) width 278: "This sentence should also be underlined, as " text run at (278,0) width 93: "well as italics, " @@ -39,7 +39,7 @@ layer at (0,0) size 800x149 text run at (371,0) width 119: "including this part" RenderText {#text} at (490,0) size 4x17 text run at (490,0) width 4: "." - RenderBlock {P} at (0,100) size 784x17 + RenderBlock {P} at (0,102) size 784x18 RenderText {#text} at (0,0) size 336x17 text run at (0,0) width 336: "This sentence should be blue but not underlined, like " RenderInline {STRONG} at (0,0) size 57x17 diff --git a/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.png index d158ac5fc855..70ff56482cb1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.txt index 7a4edc3732a7..ff216daa8b11 100644 --- a/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0602-c13-inheritance-00-e-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x148 - RenderBlock {HTML} at (0,0) size 800x148 - RenderBody {BODY} at (8,16) size 784x116 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 194x17 text run at (0,0) width 194: "This sentence should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#FFFFFF] [bgcolor=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#FFFFFF] [bgcolor=#008000] RenderText {#text} at (0,0) size 90x17 text run at (0,0) width 90: "This sentence " RenderInline {SPAN} at (0,0) size 61x17 @@ -14,7 +14,7 @@ layer at (0,0) size 800x148 text run at (90,0) width 61: "should be" RenderText {#text} at (151,0) size 102x17 text run at (151,0) width 102: " white on green." - RenderBlock {P} at (0,66) size 784x17 [color=#FFFFFF] + RenderBlock {P} at (0,68) size 784x18 [color=#FFFFFF] RenderInline {EM} at (0,0) size 36x17 [color=#008000] RenderText {#text} at (0,0) size 36x17 text run at (0,0) width 36: "PASS" @@ -24,7 +24,7 @@ layer at (0,0) size 800x148 RenderText {#text} at (40,0) size 39x17 text run at (40,0) width 39: "FAIL" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,99) size 784x17 + RenderBlock {P} at (0,102) size 784x18 RenderText {#text} at (0,0) size 43x17 text run at (0,0) width 43: "PASS " RenderInline {DFN} at (0,0) size 34x17 [color=#FFFFFF] diff --git a/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.png b/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.png index 789671d78f44..d85e9c4a16fd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.png and b/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt b/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt index 069b367274e7..eb2878f8c1f8 100644 --- a/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 239x17 text run at (0,0) width 239: "This sentence should have no border. " RenderInline {SPAN} at (0,0) size 275x27 [border: (5px solid #00FF00)] RenderText {#text} at (244,0) size 265x17 text run at (244,0) width 265: "This sentence should have a green border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 374x33 [bgcolor=#FF0000] RenderInline {SPAN} at (0,0) size 374x33 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 374x17 diff --git a/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.png index 01e1e464324e..446872dff096 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.txt index 8938a7850b47..e8fdd1329650 100644 --- a/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0603-c11-import-00-b-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x148 - RenderBlock {HTML} at (0,0) size 800x148 - RenderBody {BODY} at (8,16) size 784x116 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,99) size 784x17 [color=#008000] + RenderBlock {P} at (0,102) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.png index f006fbdd1a5d..b42b2fa34659 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.txt index bc8ee184d8d8..8077d5adf819 100644 --- a/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t060401-c32-cascading-00-b-expected.txt @@ -1,57 +1,57 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x203 - RenderBlock {HTML} at (0,0) size 800x203 - RenderBody {BODY} at (8,8) size 784x187 - RenderBlock {UL} at (0,0) size 784x136 [color=#FF0000] - RenderListItem {LI} at (0,0) size 784x17 +layer at (0,0) size 800x214 + RenderBlock {HTML} at (0,0) size 800x214 + RenderBody {BODY} at (8,8) size 784x198 + RenderBlock {UL} at (0,0) size 784x144 [color=#FF0000] + RenderListItem {LI} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (0,17) size 784x68 - RenderBlock (anonymous) at (0,0) size 784x17 + RenderListItem {LI} at (0,18) size 784x72 + RenderBlock (anonymous) at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderBlock {UL} at (0,17) size 784x51 - RenderListItem {LI} at (0,0) size 784x17 + RenderBlock {UL} at (0,18) size 784x54 + RenderListItem {LI} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (0,17) size 784x17 + RenderListItem {LI} at (0,18) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (0,34) size 784x17 + RenderListItem {LI} at (0,36) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (0,85) size 784x17 + RenderListItem {LI} at (0,90) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (0,102) size 784x17 + RenderListItem {LI} at (0,108) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderListItem {LI} at (0,119) size 784x17 + RenderListItem {LI} at (0,126) size 784x18 RenderInline {SPAN} at (0,0) size 136x17 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,136) size 784x17 [color=#008000] + RenderBlock {P} at (0,144) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,153) size 784x17 [color=#008000] + RenderBlock {P} at (0,162) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." - RenderBlock {P} at (0,170) size 784x17 [color=#008000] + RenderBlock {P} at (0,180) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 136x17 text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.png index cc8380aaf447..0eb21eb3b95c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.txt index 17b73619c427..d7aa179b8f8c 100644 --- a/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t060402-c31-important-00-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,66) size 784x17 [color=#008000] + RenderBlock {P} at (0,68) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png index 360bdd076b99..db1a5ad10bde 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png and b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt index a3c7d9f0881f..a41e6e451bd8 100644 --- a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 313x17 [color=#008000] RenderText {#text} at (0,0) size 313x17 text run at (0,0) width 313: "Whatever you do to this link, it should stay green." diff --git a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.png b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.png index 360bdd076b99..db1a5ad10bde 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.png and b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt index a3c7d9f0881f..a41e6e451bd8 100644 --- a/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 + RenderBlock {P} at (0,0) size 784x18 RenderInline {A} at (0,0) size 313x17 [color=#008000] RenderText {#text} at (0,0) size 313x17 text run at (0,0) width 313: "Whatever you do to this link, it should stay green." diff --git a/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.png index fe6d9495b84f..55a55a02bc2e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.txt index ddb2d2c4efda..4a795d24b8c4 100644 --- a/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0801-c412-hz-box-00-b-a-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x164 - RenderBlock {HTML} at (0,0) size 800x164 - RenderBody {BODY} at (8,16) size 784x132 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x166 + RenderBlock {HTML} at (0,0) size 800x166 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 283x17 text run at (0,0) width 283: "The two diagrams below should be identical." - RenderBlock {DIV} at (0,33) size 784x99 + RenderBlock {DIV} at (0,34) size 784x100 RenderBlock {P} at (40,0) size 520x40 [color=#0000FF] [bgcolor=#00FFFF] [border: none (40px solid #FF00FF) none (40px solid #FF00FF)] RenderText {#text} at (80,0) size 360x40 text run at (80,0) width 360: "X X X X X" - RenderBlock {P} at (0,56) size 784x43 + RenderBlock {P} at (0,56) size 784x44 RenderImage {OBJECT} at (0,0) size 600x40 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png index 72999d4135fb..f7b39686d8fe 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt index 1e36752a11cc..e02eadb64cc3 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x236 - RenderBlock {HTML} at (0,0) size 800x236 - RenderBody {BODY} at (8,16) size 784x212 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 290x17 text run at (0,0) width 290: "The three diagrams below should be identical:" - RenderBlock {P} at (0,33) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] + RenderBlock {P} at (0,34) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 112x16 text run at (0,0) width 112: "xxx xxx" RenderInline {SPAN} at (0,0) size 112x16 [bgcolor=#00FF00] @@ -14,7 +14,7 @@ layer at (0,0) size 800x236 text run at (0,16) width 112: "xxx xxx" RenderText {#text} at (0,32) size 112x16 text run at (0,32) width 112: "xxx xxx" - RenderBlock {P} at (0,97) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] + RenderBlock {P} at (0,98) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 112x16 text run at (0,0) width 112: "xxx xxx" RenderInline {SPAN} at (0,0) size 112x16 [bgcolor=#00FF00] @@ -22,7 +22,7 @@ layer at (0,0) size 800x236 text run at (0,16) width 112: "xxx xxx" RenderText {#text} at (0,32) size 112x16 text run at (0,32) width 112: "xxx xxx" - RenderBlock {DIV} at (0,161) size 784x51 + RenderBlock {DIV} at (0,162) size 784x52 RenderImage {IMG} at (0,0) size 48x48 RenderImage {IMG} at (48,0) size 16x48 [border: (16px solid #FFFF00) none (16px solid #FFFF00) none] RenderImage {IMG} at (64,0) size 48x48 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png index a8356cfc1319..8cf04910a7cb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt index 2bc020114cf8..2d9fc2546643 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x323 - RenderBlock {HTML} at (0,0) size 800x323 - RenderBody {BODY} at (8,8) size 784x307 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x324 + RenderBlock {HTML} at (0,0) size 800x324 + RenderBody {BODY} at (8,8) size 784x308 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 412x17 text run at (0,0) width 412: "The two diagrams below should be identical, with no red present." - RenderTable {TABLE} at (0,17) size 218x290 + RenderTable {TABLE} at (0,18) size 218x290 RenderTableSection {TBODY} at (0,0) size 218x290 RenderTableRow {TR} at (0,2) size 218x286 RenderTableCell {TD} at (2,2) size 106x286 [color=#FFA500] [bgcolor=#FFFF00] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png index 4cabbe5ac533..6bc9c5929e09 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt index d7928ee538d4..0fb99278b464 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x94 - RenderBlock {HTML} at (0,0) size 800x94 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x95 + RenderBlock {HTML} at (0,0) size 800x95 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 273x17 text run at (0,0) width 273: "There should be a green vertical bar below:" - RenderBlock {DIV} at (15,33) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png index 18c3d8a09550..842eea113681 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt index 7aff819ae694..36ca847d855c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 290x17 text run at (0,0) width 290: "There should be a green horizontal bar below:" - RenderBlock {DIV} at (15,33) size 195x45 [bgcolor=#008000] + RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 text run at (0,0) width 30: "x " diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png index c83f9fc5bb6e..eec854a3c583 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt index f9b4370320b7..619e0f26b133 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x124 - RenderBlock {HTML} at (0,0) size 800x124 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x125 + RenderBlock {HTML} at (0,0) size 800x125 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 244x17 text run at (0,0) width 244: "There should be a green square below:" - RenderBlock {DIV} at (15,33) size 75x60 [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 75x60 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 75x60 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 75x15 text run at (0,0) width 75: "xx xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png index b5acaf560917..ea30ddc022e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt index bf747913d2aa..2bf334f007e3 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x139 - RenderBlock {HTML} at (0,0) size 800x139 - RenderBody {BODY} at (8,16) size 784x108 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x140 + RenderBlock {HTML} at (0,0) size 800x140 + RenderBody {BODY} at (8,16) size 784x109 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 162x17 text run at (0,0) width 162: "It should say \"HI\" below:" - RenderBlock {DIV} at (15,33) size 165x75 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 135x15 text run at (0,0) width 135: "xx xx xx " RenderInline {SPAN} at (0,0) size 165x45 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png index b311bf125b32..443f0d960c0e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt index bdfc92f2232f..b4bbd6aeecf1 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (15,33) size 120x45 [bgcolor=#008000] + RenderBlock {DIV} at (15,34) size 120x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 120x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 105x15 text run at (0,0) width 105: "x x x x" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png index 085dcb8bad50..074b067bbae9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt index 12fd5cfb71a9..bdc70a89c9f4 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x112 - RenderBlock {HTML} at (0,0) size 800x112 - RenderBody {BODY} at (8,16) size 784x81 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x113 + RenderBlock {HTML} at (0,0) size 800x113 + RenderBody {BODY} at (8,16) size 784x82 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 274x17 text run at (0,0) width 274: "The following two bars should be identical:" - RenderBlock {DIV} at (15,33) size 180x15 + RenderBlock {DIV} at (15,34) size 180x15 RenderBlock {P} at (0,0) size 180x15 [color=#00FF00] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 45x15 text run at (0,0) width 45: "xx " @@ -15,7 +15,7 @@ layer at (0,0) size 800x112 text run at (45,0) width 135: "xx xx xx " RenderText {#text} at (120,0) size 30x15 text run at (120,0) width 30: "xx" - RenderBlock {DIV} at (15,63) size 754x18 + RenderBlock {DIV} at (15,64) size 754x18 RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png index 2b6d01c12012..8f45073d4286 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt index 4713aea827c2..2edb2c224497 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {HTML} at (0,0) size 800x105 - RenderBody {BODY} at (8,16) size 784x81 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x107 + RenderBlock {HTML} at (0,0) size 800x107 + RenderBody {BODY} at (8,16) size 784x83 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 274x17 text run at (0,0) width 274: "The following two bars should be identical:" - RenderBlock {DIV} at (30,33) size 75x15 + RenderBlock {DIV} at (30,34) size 75x15 RenderBlock {P} at (0,0) size 75x15 [color=#00FF00] [bgcolor=#FFFF00] RenderInline {SPAN} at (0,0) size 30x15 [color=#FFA500] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 30x15 text run at (0,0) width 30: "xx" RenderText {#text} at (-30,0) size 45x15 text run at (-30,0) width 45: " xx" - RenderBlock {DIV} at (0,63) size 784x18 + RenderBlock {DIV} at (0,64) size 784x19 RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png index 3f4b27428e8a..49e1c53478c3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt index 48a8d8756a3f..3ae8c9c25c4a 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x149 - RenderBlock {HTML} at (0,0) size 800x149 - RenderBody {BODY} at (8,16) size 784x123 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x150 + RenderBlock {HTML} at (0,0) size 800x150 + RenderBody {BODY} at (8,16) size 784x124 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 291x17 text run at (0,0) width 291: "The five \"matches\" below should be identical." - RenderBlock {DIV} at (0,33) size 200x90 [color=#FFA500] + RenderBlock {DIV} at (0,34) size 200x90 [color=#FFA500] RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A] RenderText {#text} at (142,0) size 10x10 text run at (142,0) width 10: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png index 1cbb8ca3c094..5b00d1050ccd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt index 180ce28275a1..12d0540dfa3f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x181 - RenderBlock {HTML} at (0,0) size 800x181 - RenderBody {BODY} at (8,8) size 784x157 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x182 + RenderBlock {HTML} at (0,0) size 800x182 + RenderBody {BODY} at (8,8) size 784x158 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "The following two diagrams should look identical." - RenderBlock {DIV} at (16,33) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 128x48 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 RenderText {#text} at (112,0) size 16x16 @@ -17,7 +17,7 @@ layer at (0,0) size 800x181 RenderListItem {LI} at (0,32) size 128x16 RenderText {#text} at (112,0) size 16x16 text run at (112,0) width 16: "-" - RenderBlock {DIV} at (16,103) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 160x16 [border: none (32px solid #FFA500) none (112px solid #FFFF00)] RenderBlock {DIV} at (112,0) size 16x16 [border: none (16px solid #008080) none none] RenderBlock {DIV} at (3,19) size 160x16 [border: none (32px solid #FFA500) none (80px solid #00FFFF)] diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt index a0996d3313f7..97afe0f64859 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 802x585 RenderView at (0,0) size 800x585 -layer at (0,0) size 800x65 - RenderBlock {HTML} at (0,0) size 800x65 - RenderBody {BODY} at (8,24) size 784x17 - RenderBlock {P} at (0,0) size 794x17 [color=#000080] +layer at (0,0) size 800x66 + RenderBlock {HTML} at (0,0) size 800x66 + RenderBody {BODY} at (8,24) size 784x18 + RenderBlock {P} at (0,0) size 794x18 [color=#000080] RenderText {#text} at (0,0) size 286x17 text run at (0,0) width 286: "This page should have a horizontal scroll bar." diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.png index e551b9513977..d56ca878dc67 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt index a312daf61acd..f2ce978bf37b 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x107 - RenderBlock {HTML} at (0,0) size 800x107 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 240x17 text run at (0,0) width 240: "The next two bars should be identical:" - RenderBlock {DIV} at (0,33) size 160x17 - RenderBlock {P} at (0,0) size 240x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (0,34) size 160x18 + RenderBlock {P} at (0,0) size 240x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "TEST" - RenderBlock {DIV} at (0,66) size 240x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (0,68) size 240x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "TEST" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png index 72999d4135fb..f7b39686d8fe 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt index 1e36752a11cc..e02eadb64cc3 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x236 - RenderBlock {HTML} at (0,0) size 800x236 - RenderBody {BODY} at (8,16) size 784x212 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 290x17 text run at (0,0) width 290: "The three diagrams below should be identical:" - RenderBlock {P} at (0,33) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] + RenderBlock {P} at (0,34) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 112x16 text run at (0,0) width 112: "xxx xxx" RenderInline {SPAN} at (0,0) size 112x16 [bgcolor=#00FF00] @@ -14,7 +14,7 @@ layer at (0,0) size 800x236 text run at (0,16) width 112: "xxx xxx" RenderText {#text} at (0,32) size 112x16 text run at (0,32) width 112: "xxx xxx" - RenderBlock {P} at (0,97) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] + RenderBlock {P} at (0,98) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 112x16 text run at (0,0) width 112: "xxx xxx" RenderInline {SPAN} at (0,0) size 112x16 [bgcolor=#00FF00] @@ -22,7 +22,7 @@ layer at (0,0) size 800x236 text run at (0,16) width 112: "xxx xxx" RenderText {#text} at (0,32) size 112x16 text run at (0,32) width 112: "xxx xxx" - RenderBlock {DIV} at (0,161) size 784x51 + RenderBlock {DIV} at (0,162) size 784x52 RenderImage {IMG} at (0,0) size 48x48 RenderImage {IMG} at (48,0) size 16x48 [border: (16px solid #FFFF00) none (16px solid #FFFF00) none] RenderImage {IMG} at (64,0) size 48x48 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png index dca1e1eb7f25..32405055d330 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt index d5b9ce65af9f..d31d595ee4ba 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x343 - RenderBlock {HTML} at (0,0) size 800x343 - RenderBody {BODY} at (8,8) size 784x327 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x344 + RenderBlock {HTML} at (0,0) size 800x344 + RenderBody {BODY} at (8,8) size 784x328 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 412x17 text run at (0,0) width 412: "The two diagrams below should be identical, with no red present." - RenderTable {TABLE} at (0,17) size 218x310 + RenderTable {TABLE} at (0,18) size 218x310 RenderTableSection {TBODY} at (0,0) size 218x310 RenderTableRow {TR} at (0,2) size 218x306 RenderTableCell {TD} at (2,2) size 106x306 [color=#FFA500] [bgcolor=#FFFF00] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png index 4cabbe5ac533..6bc9c5929e09 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt index c7f0056eb9de..7a9bc52fc0ed 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x94 - RenderBlock {HTML} at (0,0) size 800x94 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x95 + RenderBlock {HTML} at (0,0) size 800x95 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 273x17 text run at (0,0) width 273: "There should be a green vertical bar below:" - RenderBlock {DIV} at (15,33) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png index 18c3d8a09550..842eea113681 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt index ba1cf94b87ec..880ffbfeaf74 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 290x17 text run at (0,0) width 290: "There should be a green horizontal bar below:" - RenderBlock {DIV} at (15,33) size 195x45 [bgcolor=#008000] + RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 text run at (0,0) width 30: "x " diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png index c2e74e40e054..2a220edef64f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt index fb082065783d..ab3ca174581c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 313x17 text run at (0,0) width 313: "There should be a small light green square below:" - RenderBlock {DIV} at (15,33) size 754x45 + RenderBlock {DIV} at (15,34) size 754x45 RenderBlock {P} at (0,0) size 75x45 [color=#FFFFFF] RenderText {#text} at (0,0) size 30x30 text run at (0,0) width 30: "xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png index b5acaf560917..ea30ddc022e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt index 4b313a9a5631..649b80721c43 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x139 - RenderBlock {HTML} at (0,0) size 800x139 - RenderBody {BODY} at (8,16) size 784x108 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x140 + RenderBlock {HTML} at (0,0) size 800x140 + RenderBody {BODY} at (8,16) size 784x109 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 162x17 text run at (0,0) width 162: "It should say \"HI\" below:" - RenderBlock {DIV} at (15,33) size 165x75 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 165x45 text run at (0,0) width 165: "xx xx xx xx" text run at (0,15) width 165: "xx xx xx xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png index b311bf125b32..443f0d960c0e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt index f8ad0f144909..38aba7d9fc19 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (15,33) size 120x45 [bgcolor=#008000] + RenderBlock {DIV} at (15,34) size 120x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 120x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 105x15 text run at (0,0) width 105: "x x x x" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png index 85b4c56303f4..94108c6cc118 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt index dca71ab0011f..2135a5337ae8 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x112 - RenderBlock {HTML} at (0,0) size 800x112 - RenderBody {BODY} at (8,16) size 784x81 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x113 + RenderBlock {HTML} at (0,0) size 800x113 + RenderBody {BODY} at (8,16) size 784x82 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 274x17 text run at (0,0) width 274: "The following two bars should be identical:" - RenderBlock {DIV} at (15,33) size 195x15 + RenderBlock {DIV} at (15,34) size 195x15 RenderBlock {P} at (0,0) size 195x15 [color=#00FF00] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 135x15 text run at (0,0) width 135: "xx xx xx " @@ -15,7 +15,7 @@ layer at (0,0) size 800x112 text run at (75,0) width 90: "xx xx " RenderText {#text} at (165,0) size 30x15 text run at (165,0) width 30: "xx" - RenderBlock {DIV} at (15,63) size 754x18 + RenderBlock {DIV} at (15,64) size 754x18 RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png index 080f260c3ddd..8c2dfd807326 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt index 45b6bf1eeded..092dbb798128 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {HTML} at (0,0) size 800x105 - RenderBody {BODY} at (8,16) size 784x81 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x107 + RenderBlock {HTML} at (0,0) size 800x107 + RenderBody {BODY} at (8,16) size 784x83 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 274x17 text run at (0,0) width 274: "The following two bars should be identical:" - RenderBlock {DIV} at (30,33) size 75x15 + RenderBlock {DIV} at (30,34) size 75x15 RenderBlock {P} at (0,0) size 75x15 [color=#00FF00] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 45x15 text run at (0,0) width 45: "xx " RenderInline {SPAN} at (0,0) size 30x15 [color=#FFA500] [bgcolor=#FF0000] RenderText {#text} at (-15,0) size 30x15 text run at (-15,0) width 30: "xx" - RenderBlock {DIV} at (0,63) size 784x18 + RenderBlock {DIV} at (0,64) size 784x19 RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png index f80ca57ae3b6..e3f5a05fe198 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt index 4d433d0e7d0c..3ec7fd111a3b 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x149 - RenderBlock {HTML} at (0,0) size 800x149 - RenderBody {BODY} at (8,16) size 784x123 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x150 + RenderBlock {HTML} at (0,0) size 800x150 + RenderBody {BODY} at (8,16) size 784x124 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 291x17 text run at (0,0) width 291: "The five \"matches\" below should be identical." - RenderBlock {DIV} at (0,33) size 200x90 [color=#FFA500] + RenderBlock {DIV} at (0,34) size 200x90 [color=#FFA500] RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A] RenderImage {IMG} at (0,0) size 48x10 RenderText {#text} at (48,0) size 10x10 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png index 71f7d9a5a8ea..045e21a0be63 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt index fdc3cfb762ca..303c9ccae735 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x181 - RenderBlock {HTML} at (0,0) size 800x181 - RenderBody {BODY} at (8,8) size 784x157 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x182 + RenderBlock {HTML} at (0,0) size 800x182 + RenderBody {BODY} at (8,8) size 784x158 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "The following two diagrams should look identical." - RenderBlock {DIV} at (16,33) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (35,3) size 128x48 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 RenderText {#text} at (0,0) size 16x16 @@ -17,7 +17,7 @@ layer at (0,0) size 800x181 RenderListItem {LI} at (0,32) size 128x16 RenderText {#text} at (0,0) size 16x16 text run at (0,0) width 16: "-" - RenderBlock {DIV} at (16,103) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 160x16 [border: none (112px solid #FFFF00) none (32px solid #FFA500)] RenderBlock {DIV} at (32,0) size 16x16 [border: none none none (16px solid #008080)] RenderBlock {DIV} at (3,19) size 160x16 [border: none (80px solid #00FFFF) none (32px solid #FFA500)] diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt index 2995489ee121..5ccbbd67e98f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x65 - RenderBlock {HTML} at (0,0) size 800x65 - RenderBody {BODY} at (8,24) size 784x17 - RenderBlock {P} at (-10,0) size 794x17 [color=#000080] +layer at (0,0) size 800x66 + RenderBlock {HTML} at (0,0) size 800x66 + RenderBody {BODY} at (8,24) size 784x18 + RenderBlock {P} at (-10,0) size 794x18 [color=#000080] RenderText {#text} at (0,0) size 294x17 text run at (0,0) width 294: " This page should have a horizontal scroll bar." diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.png index 164de2226e10..29510199da88 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt index 18f48784e1de..a465c2a3fd87 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 240x17 text run at (0,0) width 240: "The next two bars should be identical:" - RenderBlock {DIV} at (160,33) size 160x17 - RenderBlock {P} at (-80,0) size 240x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (160,34) size 160x18 + RenderBlock {P} at (-80,0) size 240x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "TEST" - RenderBlock {DIV} at (80,66) size 240x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (80,68) size 240x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "TEST" diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png index f4e13e841fa2..ced8ce5f4262 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt index 03011c5b7c05..a9bebcde0d0d 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x114 - RenderBlock {HTML} at (0,0) size 800x114 - RenderBody {BODY} at (8,16) size 784x82 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x116 + RenderBlock {HTML} at (0,0) size 800x116 + RenderBody {BODY} at (8,16) size 784x84 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 252x17 text run at (0,0) width 252: "The two bars below should be identical:" - RenderBlock {DIV} at (15,33) size 105x15 [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 105x15 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 105x15 [color=#008000] [bgcolor=#00FF00] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" @@ -15,7 +15,7 @@ layer at (0,0) size 800x114 text run at (30,0) width 45: " x " RenderText {#text} at (90,0) size 15x15 text run at (90,0) width 15: "x" - RenderBlock {DIV} at (16,64) size 752x18 + RenderBlock {DIV} at (16,65) size 752x19 RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png index 0ac28cc16710..cbdab11723c1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt index d03e9091487e..130ab8d85a9e 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 291x17 text run at (0,0) width 291: "The five \"matches\" below should be identical " RenderInline {STRONG} at (0,0) size 129x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x237 text run at (291,0) width 129: "and equally spaced" RenderText {#text} at (420,0) size 4x17 text run at (420,0) width 4: "." - RenderBlock {DIV} at (0,33) size 200x180 [color=#FFA500] + RenderBlock {DIV} at (0,34) size 200x180 [color=#FFA500] RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A] RenderImage {IMG} at (0,0) size 24x10 RenderText {#text} at (24,0) size 10x10 diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.png index 1ecbe76273cf..772c1e8c5119 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt index db0dd2d0f712..f1f107e29faa 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x309 - RenderBlock {HTML} at (0,0) size 800x309 - RenderBody {BODY} at (8,8) size 784x285 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x310 + RenderBlock {HTML} at (0,0) size 800x310 + RenderBody {BODY} at (8,8) size 784x286 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "The following two diagrams should look identical." - RenderBlock {DIV} at (16,33) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (19,19) size 128x80 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 RenderText {#text} at (0,0) size 16x16 @@ -17,7 +17,7 @@ layer at (0,0) size 800x309 RenderListItem {LI} at (0,64) size 128x16 RenderText {#text} at (0,0) size 16x16 text run at (0,0) width 16: "-" - RenderBlock {DIV} at (16,167) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,168) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 160x112 [bgcolor=#FFFF00] [border: (16px solid #FFA500)] RenderBlock {DIV} at (16,16) size 16x16 [bgcolor=#008080] RenderBlock {DIV} at (16,32) size 128x48 [bgcolor=#00FFFF] [border: (16px solid #FFFF00)] diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png index 6431544d113c..a50bd7644f8b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.txt index c22acf3de5c0..1651980ecfe6 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-02-c-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 802x585 RenderView at (0,0) size 800x585 -layer at (0,0) size 800x30 - RenderBlock {HTML} at (0,0) size 800x30 - RenderBody {BODY} at (8,-2) size 784x34 - RenderBlock {P} at (-10,0) size 804x34 [color=#000080] +layer at (0,0) size 800x32 + RenderBlock {HTML} at (0,0) size 800x32 + RenderBody {BODY} at (8,-2) size 784x36 + RenderBlock {P} at (-10,0) size 804x36 [color=#000080] RenderBR {BR} at (0,0) size 0x17 - RenderText {#text} at (0,17) size 294x17 - text run at (0,17) width 294: " This page should have a horizontal scroll bar." + RenderText {#text} at (0,18) size 294x17 + text run at (0,18) width 294: " This page should have a horizontal scroll bar." diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png index a1262b81b5a9..78f37aadecfd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt index 50597d91655a..4b47ce9fc077 100644 --- a/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x125 - RenderBlock {HTML} at (0,0) size 800x125 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x126 + RenderBlock {HTML} at (0,0) size 800x126 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 240x17 text run at (0,0) width 240: "The next two bars should be identical:" - RenderBlock {DIV} at (16,33) size 134x22 [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 134x22 [border: (3px solid #000000)] RenderBlock {P} at (3,3) size 128x16 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 64x16 text run at (0,0) width 64: "TEST" - RenderBlock {DIV} at (16,71) size 134x22 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,72) size 134x22 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 64x16 RenderImage {IMG} at (67,3) size 64x16 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png index 2f6a2b9f07ec..1ed2392dfbf0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt index 5c7285156596..6b27c8979b13 100644 --- a/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt @@ -1,113 +1,113 @@ -layer at (0,0) size 785x855 +layer at (0,0) size 785x869 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x855 - RenderBlock {HTML} at (0,0) size 785x855 - RenderBody {BODY} at (8,16) size 769x831 - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x869 + RenderBlock {HTML} at (0,0) size 785x869 + RenderBody {BODY} at (8,16) size 769x845 + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "The two columns below should be identical." - RenderTable {TABLE} at (0,33) size 178x798 - RenderTableSection {TBODY} at (0,0) size 178x798 - RenderTableRow {TR} at (0,2) size 178x794 - RenderTableCell {TD} at (2,2) size 86x794 [bgcolor=#008080] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] - RenderBlock {P} at (3,3) size 80x17 [bgcolor=#FFFF00] + RenderTable {TABLE} at (0,34) size 178x811 + RenderTableSection {TBODY} at (0,0) size 178x811 + RenderTableRow {TR} at (0,2) size 178x807 + RenderTableCell {TD} at (2,2) size 86x807 [bgcolor=#008080] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {P} at (3,3) size 80x18 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,95) size 80x18 [bgcolor=#FF00FF] + RenderBlock {P} at (3,96) size 80x19 [bgcolor=#FF00FF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,112) size 80x18 [bgcolor=#FFFF00] + RenderBlock {P} at (3,114) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,205) size 80x18 [bgcolor=#00FF00] + RenderBlock {P} at (3,208) size 80x19 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,222) size 80x18 [bgcolor=#FFFF00] + RenderBlock {P} at (3,226) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,276) size 80x18 [bgcolor=#FFFFFF] + RenderBlock {P} at (3,281) size 80x19 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,331) size 80x94 [bgcolor=#00FFFF] - RenderBlock {P} at (0,75) size 80x18 [bgcolor=#FFA500] + RenderBlock {DIV} at (3,337) size 80x95 [bgcolor=#00FFFF] + RenderBlock {P} at (0,75) size 80x19 [bgcolor=#FFA500] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,462) size 80x18 [bgcolor=#FFFF00] + RenderBlock {P} at (3,469) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,479) size 80x93 [bgcolor=#FF00FF] + RenderBlock {P} at (3,487) size 80x94 [bgcolor=#FF00FF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,533) size 80x56 [bgcolor=#00FF00] + RenderBlock {P} at (3,542) size 80x57 [bgcolor=#00FF00] RenderText {#text} at (0,38) size 5x17 text run at (0,38) width 5: "-" - RenderBlock (floating) {P} at (3,664) size 40x18 [bgcolor=#FFFFFF] + RenderBlock (floating) {P} at (3,674) size 40x19 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,626) size 80x18 [bgcolor=#00FFFF] + RenderBlock {P} at (3,636) size 80x19 [bgcolor=#00FFFF] RenderText {#text} at (40,0) size 5x17 text run at (40,0) width 5: "-" - RenderBlock {P} at (3,681) size 80x55 [bgcolor=#FFA500] + RenderBlock {P} at (3,692) size 80x56 [bgcolor=#FFA500] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {P} at (3,736) size 80x55 [bgcolor=#FFFF00] + RenderBlock {P} at (3,748) size 80x56 [bgcolor=#FFFF00] RenderText {#text} at (0,38) size 5x17 text run at (0,38) width 5: "-" - RenderTableCell {TD} at (90,2) size 86x794 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1] - RenderBlock {DIV} at (3,3) size 80x17 [bgcolor=#FFFF00] + RenderTableCell {TD} at (90,2) size 86x807 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1] + RenderBlock {DIV} at (3,3) size 80x18 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,20) size 80x76 [bgcolor=#008080] - RenderBlock {DIV} at (3,95) size 80x18 [bgcolor=#FF00FF] + RenderBlock {DIV} at (3,21) size 80x76 [bgcolor=#008080] + RenderBlock {DIV} at (3,96) size 80x19 [bgcolor=#FF00FF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,112) size 80x18 [bgcolor=#FFFF00] + RenderBlock {DIV} at (3,114) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,129) size 80x77 [bgcolor=#008080] - RenderBlock {DIV} at (3,205) size 80x18 [bgcolor=#00FF00] + RenderBlock {DIV} at (3,132) size 80x77 [bgcolor=#008080] + RenderBlock {DIV} at (3,208) size 80x19 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,222) size 80x18 [bgcolor=#FFFF00] + RenderBlock {DIV} at (3,226) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,239) size 80x38 [bgcolor=#008080] - RenderBlock {DIV} at (3,276) size 80x18 [bgcolor=#FFFFFF] + RenderBlock {DIV} at (3,244) size 80x38 [bgcolor=#008080] + RenderBlock {DIV} at (3,281) size 80x19 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,293) size 80x39 [bgcolor=#008080] - RenderBlock {DIV} at (3,331) size 80x77 [bgcolor=#00FFFF] - RenderBlock {DIV} at (3,407) size 80x18 [bgcolor=#FFA500] + RenderBlock {DIV} at (3,299) size 80x39 [bgcolor=#008080] + RenderBlock {DIV} at (3,337) size 80x77 [bgcolor=#00FFFF] + RenderBlock {DIV} at (3,413) size 80x19 [bgcolor=#FFA500] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,424) size 80x39 [bgcolor=#008080] - RenderBlock {DIV} at (3,462) size 80x18 [bgcolor=#FFFF00] + RenderBlock {DIV} at (3,431) size 80x39 [bgcolor=#008080] + RenderBlock {DIV} at (3,469) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,479) size 80x18 [bgcolor=#FF00FF] + RenderBlock {DIV} at (3,487) size 80x19 [bgcolor=#FF00FF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,496) size 80x38 [bgcolor=#FF00FF] - RenderBlock {DIV} at (3,533) size 80x39 [bgcolor=#00FF00] - RenderBlock {DIV} at (3,571) size 80x18 [bgcolor=#00FF00] + RenderBlock {DIV} at (3,505) size 80x38 [bgcolor=#FF00FF] + RenderBlock {DIV} at (3,542) size 80x39 [bgcolor=#00FF00] + RenderBlock {DIV} at (3,580) size 80x19 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,588) size 80x39 [bgcolor=#008080] - RenderBlock {DIV} at (3,626) size 80x18 [bgcolor=#00FFFF] - RenderBlock {DIV} at (40,0) size 40x17 + RenderBlock {DIV} at (3,598) size 80x39 [bgcolor=#008080] + RenderBlock {DIV} at (3,636) size 80x19 [bgcolor=#00FFFF] + RenderBlock {DIV} at (40,0) size 40x18 RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,681) size 80x18 [bgcolor=#FFA500] + RenderBlock {DIV} at (3,692) size 80x19 [bgcolor=#FFA500] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" - RenderBlock {DIV} at (3,698) size 80x38 [bgcolor=#FFA500] - RenderBlock {DIV} at (3,735) size 80x39 [bgcolor=#FFFF00] - RenderBlock {DIV} at (3,773) size 80x18 [bgcolor=#FFFF00] + RenderBlock {DIV} at (3,710) size 80x38 [bgcolor=#FFA500] + RenderBlock {DIV} at (3,747) size 80x39 [bgcolor=#FFFF00] + RenderBlock {DIV} at (3,785) size 80x19 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" -layer at (101,694) size 80x38 - RenderBlock (relative positioned) {DIV} at (3,643) size 80x39 [bgcolor=#008080] -layer at (101,715) size 40x17 - RenderBlock (positioned) {DIV} at (0,20) size 40x18 [bgcolor=#FFFFFF] +layer at (101,706) size 80x38 + RenderBlock (relative positioned) {DIV} at (3,654) size 80x39 [bgcolor=#008080] +layer at (101,726) size 40x18 + RenderBlock (positioned) {DIV} at (0,19) size 40x19 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 5x17 text run at (0,0) width 5: "-" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png index 66aa9df7b898..9b3533db4f78 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt index b4a663520197..82b0bcfd4a09 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (0,33) size 120x60 [color=#FFFFFF] + RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" RenderInline {SPAN} at (0,0) size 40x20 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png index 66aa9df7b898..9b3533db4f78 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt index b5f29a61f7e2..e3125850987c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (0,33) size 120x60 [color=#FFFFFF] + RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" RenderInline {SPAN} at (0,0) size 40x20 [color=#008000] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png index 492dffd31681..ddb5c72ef8dd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt index c3b17076a0d4..3f90cbdc249b 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x85 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (0,65) size 120x20 [color=#FFFFFF] + RenderBlock {DIV} at (0,66) size 120x20 [color=#FFFFFF] RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#008000] RenderText {#text} at (0,0) size 40x20 text run at (0,0) width 40: "xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.png index 8c09e78eafaf..6351ef0ab8af 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt index 627e8e70934b..7ddda4a3959e 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x163 - RenderBlock {HTML} at (0,0) size 800x163 - RenderBody {BODY} at (8,8) size 784x147 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x164 + RenderBlock {HTML} at (0,0) size 800x164 + RenderBody {BODY} at (8,8) size 784x148 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "The next two columns should be identical." - RenderTable {TABLE} at (0,17) size 138x130 + RenderTable {TABLE} at (0,18) size 138x130 RenderTableSection {TBODY} at (0,0) size 138x130 RenderTableRow {TR} at (0,2) size 138x126 RenderTableCell {TD} at (2,2) size 66x126 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png index 4cabbe5ac533..6bc9c5929e09 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt index d47535ad7570..35451e14869a 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x94 - RenderBlock {HTML} at (0,0) size 800x94 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x95 + RenderBlock {HTML} at (0,0) size 800x95 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 273x17 text run at (0,0) width 273: "There should be a green vertical bar below:" - RenderBlock {DIV} at (15,33) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png index 8e2f13feb2aa..dec052c55a88 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt index d2b0c105dbcc..152f3b934e59 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (15,33) size 195x45 [bgcolor=#008000] + RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 text run at (0,0) width 30: "x " diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png index c83f9fc5bb6e..eec854a3c583 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt index bd392b7c3136..88a85d685954 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x124 - RenderBlock {HTML} at (0,0) size 800x124 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x125 + RenderBlock {HTML} at (0,0) size 800x125 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 244x17 text run at (0,0) width 244: "There should be a green square below:" - RenderBlock {DIV} at (15,33) size 754x60 + RenderBlock {DIV} at (15,34) size 754x60 RenderBlock {DIV} at (0,0) size 75x60 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 75x60 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 75x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png index b5acaf560917..ea30ddc022e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt index bf747913d2aa..2bf334f007e3 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x139 - RenderBlock {HTML} at (0,0) size 800x139 - RenderBody {BODY} at (8,16) size 784x108 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x140 + RenderBlock {HTML} at (0,0) size 800x140 + RenderBody {BODY} at (8,16) size 784x109 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 162x17 text run at (0,0) width 162: "It should say \"HI\" below:" - RenderBlock {DIV} at (15,33) size 165x75 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 135x15 text run at (0,0) width 135: "xx xx xx " RenderInline {SPAN} at (0,0) size 165x45 diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png index 79b5c2645bba..15492fb63150 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt index 6330b557d9b3..df797dfaaf4d 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x114 - RenderBlock {HTML} at (0,0) size 800x114 - RenderBody {BODY} at (8,16) size 784x82 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x116 + RenderBlock {HTML} at (0,0) size 800x116 + RenderBody {BODY} at (8,16) size 784x84 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "The following two blocks should be identical:" - RenderBlock {DIV} at (15,33) size 135x15 [color=#FFFF00] [bgcolor=#FFA500] + RenderBlock {DIV} at (15,34) size 135x15 [color=#FFFF00] [bgcolor=#FFA500] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" RenderInline {SPAN} at (0,0) size 60x15 @@ -14,7 +14,7 @@ layer at (0,0) size 800x114 text run at (15,0) width 15: "x" RenderText {#text} at (75,0) size 15x15 text run at (75,0) width 15: "x" - RenderBlock {P} at (0,64) size 784x18 [color=#000080] + RenderBlock {P} at (0,65) size 784x19 [color=#000080] RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png index 7f225c3ac5d6..1370bcdad7cb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt index 8535f8035f8b..4867aed8b9c5 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x149 - RenderBlock {HTML} at (0,0) size 800x149 - RenderBody {BODY} at (8,16) size 784x123 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x150 + RenderBlock {HTML} at (0,0) size 800x150 + RenderBody {BODY} at (8,16) size 784x124 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 252x17 text run at (0,0) width 252: "The five bars below should be identical." - RenderBlock {DIV} at (0,33) size 106x90 [color=#0000FF] + RenderBlock {DIV} at (0,34) size 106x90 [color=#0000FF] RenderBlock {P} at (0,0) size 106x10 [bgcolor=#000080] RenderText {#text} at (48,0) size 10x10 text run at (48,0) width 10: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.png index 71951f682132..3d79af72d8df 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt index 7174a069c363..fd01b638cbfc 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x181 - RenderBlock {HTML} at (0,0) size 800x181 - RenderBody {BODY} at (8,8) size 784x157 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x182 + RenderBlock {HTML} at (0,0) size 800x182 + RenderBody {BODY} at (8,8) size 784x158 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "The following two diagrams should look identical." - RenderBlock {DIV} at (16,33) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 RenderText {#text} at (112,0) size 16x16 @@ -17,7 +17,7 @@ layer at (0,0) size 800x181 RenderListItem {LI} at (0,32) size 128x16 RenderText {#text} at (112,0) size 16x16 text run at (112,0) width 16: "-" - RenderBlock {DIV} at (16,103) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 160x16 [border: none (32px solid #FFFF00) none (112px solid #FFFF00)] RenderBlock {DIV} at (112,0) size 16x16 [border: none (16px solid #008080) none none] RenderBlock {DIV} at (3,19) size 160x16 [border: none (32px solid #FFFF00) none (80px solid #00FFFF)] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.png index 08cc6d474066..94d60f0a43a9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.txt index 584d69e6910d..befb5935a97a 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-02-f-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x83 - RenderBlock {HTML} at (0,0) size 800x83 - RenderBody {BODY} at (8,16) size 784x51 - RenderBlock {P} at (0,0) size 176x51 [bgcolor=#FFFFFF] [border: none (16px solid #008000) none] - RenderText {#text} at (0,0) size 152x51 +layer at (0,0) size 800x86 + RenderBlock {HTML} at (0,0) size 800x86 + RenderBody {BODY} at (8,16) size 784x54 + RenderBlock {P} at (0,0) size 176x54 [bgcolor=#FFFFFF] [border: none (16px solid #008000) none] + RenderText {#text} at (0,0) size 152x53 text run at (0,0) width 152: "There should be a green" - text run at (0,17) width 150: "block to the right of this" - text run at (0,34) width 27: "text." + text run at (0,18) width 150: "block to the right of this" + text run at (0,36) width 27: "text." diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.png index 1b9f6c9612e2..f9b9f99f1d4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.txt index 6b18b5b28e6b..9b28a576bf16 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5507-padn-r-03-f-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 240x17 text run at (0,0) width 240: "The next two bars should be identical:" - RenderBlock {DIV} at (16,33) size 192x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (16,34) size 192x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "TEST" - RenderBlock {DIV} at (16,66) size 192x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (16,68) size 192x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 39x17 text run at (0,0) width 39: "TEST" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png index 493d3713b817..8252b86ea89a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt index f1fc620783c4..231a1d26cf09 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (0,33) size 120x60 [color=#FFFFFF] + RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png index 493d3713b817..8252b86ea89a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt index 183f506e7d2d..c805cca10469 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (0,33) size 120x60 [color=#FFFFFF] + RenderBlock {DIV} at (0,34) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" RenderInline {SPAN} at (0,0) size 40x20 [bgcolor=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png index a9a87984b1b5..97c0db2f4655 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt index c3b17076a0d4..3f90cbdc249b 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x85 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (0,65) size 120x20 [color=#FFFFFF] + RenderBlock {DIV} at (0,66) size 120x20 [color=#FFFFFF] RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#008000] RenderText {#text} at (0,0) size 40x20 text run at (0,0) width 40: "xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png index 9bcab47f8526..2e1c2393a198 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt index bcf9dc39c0e1..7f3699fbc8c6 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x163 - RenderBlock {HTML} at (0,0) size 800x163 - RenderBody {BODY} at (8,8) size 784x147 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x164 + RenderBlock {HTML} at (0,0) size 800x164 + RenderBody {BODY} at (8,8) size 784x148 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "The next two columns should be identical." - RenderTable {TABLE} at (0,17) size 138x130 + RenderTable {TABLE} at (0,18) size 138x130 RenderTableSection {TBODY} at (0,0) size 138x130 RenderTableRow {TR} at (0,2) size 138x126 RenderTableCell {TD} at (2,2) size 66x126 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png index 4cabbe5ac533..6bc9c5929e09 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt index a41c8c6e014d..7ca66ff44059 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x94 - RenderBlock {HTML} at (0,0) size 800x94 - RenderBody {BODY} at (8,16) size 784x63 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x95 + RenderBlock {HTML} at (0,0) size 800x95 + RenderBody {BODY} at (8,16) size 784x64 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 273x17 text run at (0,0) width 273: "There should be a green vertical bar below:" - RenderBlock {DIV} at (15,33) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png index 8e2f13feb2aa..dec052c55a88 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt index 77ed751bbc48..faabff19536c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 223x17 text run at (0,0) width 223: "There should be a green bar below:" - RenderBlock {DIV} at (15,33) size 195x45 [bgcolor=#008000] + RenderBlock {DIV} at (15,34) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 text run at (0,0) width 30: "x " diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png index c2e74e40e054..2a220edef64f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt index 1eb64b3063d5..c5f26a9c7648 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x109 - RenderBlock {HTML} at (0,0) size 800x109 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x110 + RenderBlock {HTML} at (0,0) size 800x110 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 313x17 text run at (0,0) width 313: "There should be a small light green square below:" - RenderBlock {DIV} at (15,33) size 754x45 + RenderBlock {DIV} at (15,34) size 754x45 RenderBlock {P} at (0,0) size 75x45 [color=#FFFFFF] RenderText {#text} at (0,0) size 30x30 text run at (0,0) width 30: "xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png index b5acaf560917..ea30ddc022e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt index 4b313a9a5631..649b80721c43 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x139 - RenderBlock {HTML} at (0,0) size 800x139 - RenderBody {BODY} at (8,16) size 784x108 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x140 + RenderBlock {HTML} at (0,0) size 800x140 + RenderBody {BODY} at (8,16) size 784x109 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 162x17 text run at (0,0) width 162: "It should say \"HI\" below:" - RenderBlock {DIV} at (15,33) size 165x75 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock {DIV} at (15,34) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 165x45 text run at (0,0) width 165: "xx xx xx xx" text run at (0,15) width 165: "xx xx xx xx" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png index 634f68621d2a..0b9187cc5c9b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt index 6250ba9cead0..9fc6ad3df8f0 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x114 - RenderBlock {HTML} at (0,0) size 800x114 - RenderBody {BODY} at (8,16) size 784x82 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x116 + RenderBlock {HTML} at (0,0) size 800x116 + RenderBody {BODY} at (8,16) size 784x84 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 289x17 text run at (0,0) width 289: "The following two blocks should be identical:" - RenderBlock {DIV} at (15,33) size 135x15 [color=#FFFF00] [bgcolor=#FFA500] + RenderBlock {DIV} at (15,34) size 135x15 [color=#FFFF00] [bgcolor=#FFA500] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" RenderInline {SPAN} at (0,0) size 60x15 @@ -14,7 +14,7 @@ layer at (0,0) size 800x114 text run at (60,0) width 15: "x" RenderText {#text} at (75,0) size 15x15 text run at (75,0) width 15: "x" - RenderBlock {P} at (0,64) size 784x18 [color=#000080] + RenderBlock {P} at (0,65) size 784x19 [color=#000080] RenderImage {IMG} at (0,0) size 15x15 RenderImage {IMG} at (15,0) size 15x15 RenderImage {IMG} at (30,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png index 7f225c3ac5d6..1370bcdad7cb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt index 8802868b769c..bd4b9266b562 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x149 - RenderBlock {HTML} at (0,0) size 800x149 - RenderBody {BODY} at (8,16) size 784x123 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x150 + RenderBlock {HTML} at (0,0) size 800x150 + RenderBody {BODY} at (8,16) size 784x124 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 252x17 text run at (0,0) width 252: "The five bars below should be identical." - RenderBlock {DIV} at (0,33) size 106x90 [color=#0000FF] + RenderBlock {DIV} at (0,34) size 106x90 [color=#0000FF] RenderBlock {P} at (0,0) size 106x10 [bgcolor=#000080] RenderText {#text} at (48,0) size 10x10 text run at (48,0) width 10: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.png index 44d67d668b92..259f104b0396 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt index ca430ec57dde..97e028de336e 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x181 - RenderBlock {HTML} at (0,0) size 800x181 - RenderBody {BODY} at (8,8) size 784x157 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x182 + RenderBlock {HTML} at (0,0) size 800x182 + RenderBody {BODY} at (8,8) size 784x158 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "The following two diagrams should look identical." - RenderBlock {DIV} at (16,33) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00] RenderListItem {LI} at (32,0) size 128x16 RenderText {#text} at (0,0) size 16x16 @@ -17,7 +17,7 @@ layer at (0,0) size 800x181 RenderListItem {LI} at (32,32) size 128x16 RenderText {#text} at (0,0) size 16x16 text run at (0,0) width 16: "-" - RenderBlock {DIV} at (16,103) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,104) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 160x16 [border: none (112px solid #FFFF00) none (32px solid #FFFF00)] RenderBlock {DIV} at (32,0) size 16x16 [border: none none none (16px solid #008080)] RenderBlock {DIV} at (3,19) size 160x16 [border: none (80px solid #00FFFF) none (32px solid #FFFF00)] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.png index 799f3d84850e..a1277e9fed8a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.txt index 50519f45e38c..55e3d4de78b9 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-02-f-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x83 - RenderBlock {HTML} at (0,0) size 800x83 - RenderBody {BODY} at (8,16) size 784x51 - RenderBlock {P} at (0,0) size 176x51 [bgcolor=#FFFFFF] [border: none (16px solid #008000)] - RenderText {#text} at (16,0) size 152x51 +layer at (0,0) size 800x86 + RenderBlock {HTML} at (0,0) size 800x86 + RenderBody {BODY} at (8,16) size 784x54 + RenderBlock {P} at (0,0) size 176x54 [bgcolor=#FFFFFF] [border: none (16px solid #008000)] + RenderText {#text} at (16,0) size 152x53 text run at (16,0) width 152: "There should be a green" - text run at (16,17) width 141: "block to the left of this" - text run at (16,34) width 27: "text." + text run at (16,18) width 141: "block to the left of this" + text run at (16,36) width 27: "text." diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.png index 6a3348a47a9b..b364831d0d79 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt index 79539b694aab..a83450f5f9be 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 240x17 text run at (0,0) width 240: "The next two bars should be identical:" - RenderBlock {DIV} at (16,33) size 192x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (16,34) size 192x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (32,0) size 39x17 text run at (32,0) width 39: "TEST" - RenderBlock {DIV} at (16,66) size 192x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (16,68) size 192x18 [color=#FFFF00] [bgcolor=#000080] RenderImage {IMG} at (0,13) size 32x2 RenderText {#text} at (32,0) size 39x17 text run at (32,0) width 39: "TEST" diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png index b8022e2aa588..7c6077171290 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt index f597146c1ef9..d31427580c97 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x190 - RenderBlock {HTML} at (0,0) size 800x190 - RenderBody {BODY} at (8,16) size 784x142 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x192 + RenderBlock {HTML} at (0,0) size 800x192 + RenderBody {BODY} at (8,16) size 784x144 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "The two sweets below should be identical:" - RenderBlock {DIV} at (0,47) size 105x15 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,48) size 105x15 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x15 [color=#008000] [bgcolor=#00FF00] RenderText {#text} at (0,0) size 30x15 text run at (0,0) width 30: "x " @@ -15,5 +15,5 @@ layer at (0,0) size 800x190 text run at (45,0) width 15: "x" RenderText {#text} at (75,0) size 30x15 text run at (75,0) width 30: " x" - RenderBlock {DIV} at (0,94) size 784x48 + RenderBlock {DIV} at (0,95) size 784x49 RenderImage {IMG} at (0,0) size 105x45 diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.png index 2e4745120724..cdb1e37c7f92 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.txt index a6db117dd813..13da48fe8c98 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x389 - RenderBlock {HTML} at (0,0) size 800x389 - RenderBody {BODY} at (8,16) size 784x363 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x390 + RenderBlock {HTML} at (0,0) size 800x390 + RenderBody {BODY} at (8,16) size 784x364 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 283x17 text run at (0,0) width 283: "The five diagrams below should be identical." - RenderBlock {DIV} at (0,33) size 138x330 [color=#FFA500] + RenderBlock {DIV} at (0,34) size 138x330 [color=#FFA500] RenderBlock {P} at (0,0) size 138x58 [bgcolor=#FF0000] [border: (24px solid #FFFF00)] RenderImage {IMG} at (24,24) size 10x10 RenderImage {IMG} at (34,24) size 10x10 diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.png index 12f5eccbefeb..e0e6fd600b76 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.txt index 559853d03923..eeebaba6ff38 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-01-e-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x309 - RenderBlock {HTML} at (0,0) size 800x309 - RenderBody {BODY} at (8,8) size 784x285 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x310 + RenderBlock {HTML} at (0,0) size 800x310 + RenderBody {BODY} at (8,8) size 784x286 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 318x17 text run at (0,0) width 318: "The following two diagrams should look identical." - RenderBlock {DIV} at (16,33) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,34) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 160x112 [bgcolor=#FFFF00] RenderListItem {LI} at (16,16) size 128x16 RenderText {#text} at (0,0) size 16x16 @@ -17,7 +17,7 @@ layer at (0,0) size 800x309 RenderListItem {LI} at (16,80) size 128x16 RenderText {#text} at (0,0) size 16x16 text run at (0,0) width 16: "-" - RenderBlock {DIV} at (16,167) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (16,168) size 166x118 [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 160x112 [bgcolor=#FFFF00] [border: (16px solid #FFFF00)] RenderBlock {DIV} at (16,16) size 16x16 [bgcolor=#008080] RenderBlock {DIV} at (16,32) size 128x48 [bgcolor=#00FFFF] [border: (16px solid #00FFFF)] diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.png b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.png index 5d9bf03829cf..144f3b7b25d9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.txt index 8a7f29b48aa8..b32fea4749eb 100644 --- a/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0804-c5510-padn-02-f-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x179 - RenderBlock {HTML} at (0,0) size 800x179 - RenderBody {BODY} at (8,16) size 784x147 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x182 + RenderBlock {HTML} at (0,0) size 800x182 + RenderBody {BODY} at (8,16) size 784x150 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 240x17 text run at (0,0) width 240: "The next two bars should be identical:" - RenderBlock {DIV} at (16,33) size 192x49 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (16,34) size 192x50 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (16,16) size 39x17 text run at (16,16) width 39: "TEST" - RenderBlock {DIV} at (16,98) size 192x49 [color=#FFFF00] [bgcolor=#000080] [border: (16px solid #000080)] + RenderBlock {DIV} at (16,100) size 192x50 [color=#FFFF00] [bgcolor=#000080] [border: (16px solid #000080)] RenderText {#text} at (16,16) size 39x17 text run at (16,16) width 39: "TEST" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.png index 45174fe12c4a..148a14a644ea 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt index 9666408b5613..b6577482ca41 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x120 - RenderBlock {HTML} at (0,0) size 800x120 - RenderBody {BODY} at (8,16) size 784x96 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x122 + RenderBlock {HTML} at (0,0) size 800x122 + RenderBody {BODY} at (8,16) size 784x98 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 439x17 text run at (0,0) width 439: "The three boxes below should have progressively thinner top borders." - RenderTable {TABLE} at (0,33) size 66x63 [color=#000080] - RenderTableSection {TBODY} at (0,0) size 66x63 - RenderTableRow {TR} at (0,2) size 66x59 - RenderTableCell {TD} at (2,2) size 20x59 [r=0 c=0 rs=1 cs=1] - RenderBlock {P} at (1,17) size 18x25 [border: (5px solid #000080) (3px solid #000080)] + RenderTable {TABLE} at (0,34) size 66x64 [color=#000080] + RenderTableSection {TBODY} at (0,0) size 66x64 + RenderTableRow {TR} at (0,2) size 66x60 + RenderTableCell {TD} at (2,2) size 20x60 [r=0 c=0 rs=1 cs=1] + RenderBlock {P} at (1,17) size 18x26 [border: (5px solid #000080) (3px solid #000080)] RenderText {#text} at (3,5) size 12x17 text run at (3,5) width 12: "A" - RenderTableCell {TD} at (24,4) size 19x57 [r=0 c=1 rs=1 cs=1] - RenderBlock {P} at (1,17) size 17x23 [border: (3px solid #000080)] + RenderTableCell {TD} at (24,4) size 19x58 [r=0 c=1 rs=1 cs=1] + RenderBlock {P} at (1,17) size 17x24 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "B" - RenderTableCell {TD} at (45,6) size 19x55 [r=0 c=2 rs=1 cs=1] - RenderBlock {P} at (1,17) size 17x21 [border: (1px solid #000080) (3px solid #000080)] + RenderTableCell {TD} at (45,6) size 19x56 [r=0 c=2 rs=1 cs=1] + RenderBlock {P} at (1,17) size 17x22 [border: (1px solid #000080) (3px solid #000080)] RenderText {#text} at (3,1) size 11x17 text run at (3,1) width 11: "C" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png index 37fe1cf993d9..50ca1c305e8a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt index cfbb540f5694..3d48414d679f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x51 - RenderBlock {HTML} at (0,0) size 800x51 - RenderBody {BODY} at (8,8) size 784x35 - RenderBlock {DIV} at (0,0) size 784x35 - RenderBlock {DIV} at (0,0) size 784x35 [color=#008000] [border: (15px solid #008000) (3px solid #008000)] +layer at (0,0) size 800x52 + RenderBlock {HTML} at (0,0) size 800x52 + RenderBody {BODY} at (8,8) size 784x36 + RenderBlock {DIV} at (0,0) size 784x36 + RenderBlock {DIV} at (0,0) size 784x36 [color=#008000] [border: (15px solid #008000) (3px solid #008000)] RenderText {#text} at (3,15) size 230x17 text run at (3,15) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt index 21eb8a90164d..ceb09d1c705f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page:" - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.png index 1815625df84e..1e913db2b3b5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt index 628232e12e66..6cac005a5d2a 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x36 - RenderBlock {HTML} at (0,0) size 800x36 - RenderBody {BODY} at (8,8) size 784x20 - RenderBlock {DIV} at (0,0) size 784x20 [color=#000080] - RenderBlock {DIV} at (0,0) size 784x20 [border: none (3px solid #000080)] +layer at (0,0) size 800x37 + RenderBlock {HTML} at (0,0) size 800x37 + RenderBody {BODY} at (8,8) size 784x21 + RenderBlock {DIV} at (0,0) size 784x21 [color=#000080] + RenderBlock {DIV} at (0,0) size 784x21 [border: none (3px solid #000080)] RenderText {#text} at (3,0) size 264x17 text run at (3,0) width 264: "This box should be open ended at the top." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png index 26c97edfc585..b600b3185e9f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt index 9cce67b17647..a52ba5640fc9 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 254x21 [border: (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,0) size 248x17 text run at (3,0) width 248: "This box should have a thin top border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x17 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.png index 052f365a9dd7..af535a899149 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt index 5b7a1114fb91..2d6d41144ad8 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x166 - RenderBlock {HTML} at (0,0) size 800x166 - RenderBody {BODY} at (8,16) size 784x134 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x170 + RenderBlock {HTML} at (0,0) size 800x170 + RenderBody {BODY} at (8,16) size 784x138 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 448x17 text run at (0,0) width 448: "The three boxes below should have progressively thinner right borders." - RenderBlock {P} at (0,33) size 784x23 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 12x17 text run at (3,3) width 12: "A" - RenderBlock {P} at (0,72) size 784x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "B" - RenderBlock {P} at (0,111) size 784x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "C" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png index f7b5b45c7a15..83d85dc19958 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt index 000683f93f17..a90b65a6b500 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x39 - RenderBlock {HTML} at (0,0) size 800x39 - RenderBody {BODY} at (8,8) size 784x23 - RenderBlock {DIV} at (0,0) size 784x23 - RenderBlock {DIV} at (0,0) size 784x23 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)] +layer at (0,0) size 800x40 + RenderBlock {HTML} at (0,0) size 800x40 + RenderBody {BODY} at (8,8) size 784x24 + RenderBlock {DIV} at (0,0) size 784x24 + RenderBlock {DIV} at (0,0) size 784x24 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)] RenderText {#text} at (3,3) size 230x17 text run at (3,3) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt index 21eb8a90164d..ceb09d1c705f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page:" - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.png index 44865ca5f597..e63bbd077293 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt index 822383f84f25..4b99d93e9539 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x39 - RenderBlock {HTML} at (0,0) size 800x39 - RenderBody {BODY} at (8,8) size 784x23 - RenderBlock {DIV} at (0,0) size 784x23 [color=#000080] - RenderBlock {DIV} at (0,0) size 784x23 [border: (3px solid #000080) none (3px solid #000080)] +layer at (0,0) size 800x40 + RenderBlock {HTML} at (0,0) size 800x40 + RenderBody {BODY} at (8,8) size 784x24 + RenderBlock {DIV} at (0,0) size 784x24 [color=#000080] + RenderBlock {DIV} at (0,0) size 784x24 [border: (3px solid #000080) none (3px solid #000080)] RenderText {#text} at (3,3) size 273x17 text run at (3,3) width 273: "This box should be open ended at the right." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png index fdc989c245bc..cd8a2f7d4389 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt index b02823e0efc8..a173e6e4f550 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 261x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,0) size 257x17 text run at (3,0) width 257: "This box should have a thin right border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x17 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.png index 6c94bf923e50..08ae81192c79 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt index 86037448c6be..4936f2af4cd0 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x120 - RenderBlock {HTML} at (0,0) size 800x120 - RenderBody {BODY} at (8,16) size 784x96 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x122 + RenderBlock {HTML} at (0,0) size 800x122 + RenderBody {BODY} at (8,16) size 784x98 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 463x17 text run at (0,0) width 463: "The three boxes below should have progressively thinner bottom borders." - RenderTable {TABLE} at (0,33) size 66x63 [color=#000080] - RenderTableSection {TBODY} at (0,0) size 66x63 - RenderTableRow {TR} at (0,2) size 66x59 - RenderTableCell {TD} at (2,2) size 20x59 [r=0 c=0 rs=1 cs=1] - RenderBlock {P} at (1,17) size 18x25 [border: (3px solid #000080) (5px solid #000080) (3px solid #000080)] + RenderTable {TABLE} at (0,34) size 66x64 [color=#000080] + RenderTableSection {TBODY} at (0,0) size 66x64 + RenderTableRow {TR} at (0,2) size 66x60 + RenderTableCell {TD} at (2,2) size 20x60 [r=0 c=0 rs=1 cs=1] + RenderBlock {P} at (1,17) size 18x26 [border: (3px solid #000080) (5px solid #000080) (3px solid #000080)] RenderText {#text} at (3,3) size 12x17 text run at (3,3) width 12: "A" - RenderTableCell {TD} at (24,2) size 19x57 [r=0 c=1 rs=1 cs=1] - RenderBlock {P} at (1,17) size 17x23 [border: (3px solid #000080)] + RenderTableCell {TD} at (24,2) size 19x58 [r=0 c=1 rs=1 cs=1] + RenderBlock {P} at (1,17) size 17x24 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "B" - RenderTableCell {TD} at (45,2) size 19x55 [r=0 c=2 rs=1 cs=1] - RenderBlock {P} at (1,17) size 17x21 [border: (3px solid #000080) (1px solid #000080) (3px solid #000080)] + RenderTableCell {TD} at (45,2) size 19x56 [r=0 c=2 rs=1 cs=1] + RenderBlock {P} at (1,17) size 17x22 [border: (3px solid #000080) (1px solid #000080) (3px solid #000080)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "C" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png index 6f917fa38cd0..12b5596594be 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt index f86a82e4fab1..9bc0feb17e31 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x51 - RenderBlock {HTML} at (0,0) size 800x51 - RenderBody {BODY} at (8,8) size 784x35 - RenderBlock {DIV} at (0,0) size 784x35 - RenderBlock {DIV} at (0,0) size 784x35 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)] +layer at (0,0) size 800x52 + RenderBlock {HTML} at (0,0) size 800x52 + RenderBody {BODY} at (8,8) size 784x36 + RenderBlock {DIV} at (0,0) size 784x36 + RenderBlock {DIV} at (0,0) size 784x36 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)] RenderText {#text} at (3,3) size 230x17 text run at (3,3) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt index 21eb8a90164d..ceb09d1c705f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page:" - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.png index 18e37ee35def..555f8b691724 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt index 81fba7980bfc..88e9b7295a08 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x36 - RenderBlock {HTML} at (0,0) size 800x36 - RenderBody {BODY} at (8,8) size 784x20 - RenderBlock {DIV} at (0,0) size 784x20 [color=#000080] - RenderBlock {DIV} at (0,0) size 784x20 [border: (3px solid #000080) none (3px solid #000080)] +layer at (0,0) size 800x37 + RenderBlock {HTML} at (0,0) size 800x37 + RenderBody {BODY} at (8,8) size 784x21 + RenderBlock {DIV} at (0,0) size 784x21 [color=#000080] + RenderBlock {DIV} at (0,0) size 784x21 [border: (3px solid #000080) none (3px solid #000080)] RenderText {#text} at (3,3) size 288x17 text run at (3,3) width 288: "This box should be open ended at the bottom." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png index 4075f8fb96f2..70648c496f35 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt index 48822da98023..9fe4dae7d303 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 278x21 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] RenderText {#text} at (3,0) size 272x17 text run at (3,0) width 272: "This box should have a thin bottom border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x17 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.png index 4d0b8b56537e..2a4535dfa6a8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt index 9a8ef2720423..653ab0897ea7 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x166 - RenderBlock {HTML} at (0,0) size 800x166 - RenderBody {BODY} at (8,16) size 784x134 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x170 + RenderBlock {HTML} at (0,0) size 800x170 + RenderBody {BODY} at (8,16) size 784x138 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 439x17 text run at (0,0) width 439: "The three boxes below should have progressively thinner left borders." - RenderBlock {P} at (0,33) size 784x23 [border: (3px solid #000000) (5px solid #000000)] + RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000000) (5px solid #000000)] RenderText {#text} at (5,3) size 12x17 text run at (5,3) width 12: "A" - RenderBlock {P} at (0,72) size 784x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "B" - RenderBlock {P} at (0,111) size 784x23 [border: (3px solid #000000) (1px solid #000000)] + RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000000) (1px solid #000000)] RenderText {#text} at (1,3) size 11x17 text run at (1,3) width 11: "C" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png index b7c380900d81..f94be9831310 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt index 01377f89421d..1c64d65b75e2 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x39 - RenderBlock {HTML} at (0,0) size 800x39 - RenderBody {BODY} at (8,8) size 784x23 - RenderBlock {DIV} at (0,0) size 784x23 - RenderBlock {DIV} at (0,0) size 784x23 [color=#008000] [border: (3px solid #008000) (15px solid #008000)] +layer at (0,0) size 800x40 + RenderBlock {HTML} at (0,0) size 800x40 + RenderBody {BODY} at (8,8) size 784x24 + RenderBlock {DIV} at (0,0) size 784x24 + RenderBlock {DIV} at (0,0) size 784x24 [color=#008000] [border: (3px solid #008000) (15px solid #008000)] RenderText {#text} at (15,3) size 230x17 text run at (15,3) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt index 21eb8a90164d..ceb09d1c705f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page:" - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.png index bc7d4b526c0c..7d7feb87a9b0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt index e392d9233af6..613c8056796b 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x39 - RenderBlock {HTML} at (0,0) size 800x39 - RenderBody {BODY} at (8,8) size 784x23 - RenderBlock {DIV} at (0,0) size 784x23 [color=#000080] - RenderBlock {DIV} at (0,0) size 784x23 [border: (3px solid #000080) none] +layer at (0,0) size 800x40 + RenderBlock {HTML} at (0,0) size 800x40 + RenderBody {BODY} at (8,8) size 784x24 + RenderBlock {DIV} at (0,0) size 784x24 [color=#000080] + RenderBlock {DIV} at (0,0) size 784x24 [border: (3px solid #000080) none] RenderText {#text} at (0,3) size 264x17 text run at (0,3) width 264: "This box should be open ended at the left." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png index d2e788ad454f..6f2bf70fa1c5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt index 72aaa3926f34..bccfc615babf 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 252x23 [border: (3px solid #000000) (1px solid #000000)] RenderText {#text} at (1,0) size 248x17 text run at (1,0) width 248: "This box should have a thin left border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x17 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.png index d8fdb80e96ee..a472ea3d0e82 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.txt index a42b243d861b..1bb3464b3f05 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-00-a-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x166 - RenderBlock {HTML} at (0,0) size 800x166 - RenderBody {BODY} at (8,16) size 784x134 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x170 + RenderBlock {HTML} at (0,0) size 800x170 + RenderBody {BODY} at (8,16) size 784x138 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 415x17 text run at (0,0) width 415: "The three boxes below should have progressively thinner borders." - RenderBlock {P} at (0,33) size 784x27 [border: (5px solid #000000)] + RenderBlock {P} at (0,34) size 784x28 [border: (5px solid #000000)] RenderText {#text} at (5,5) size 12x17 text run at (5,5) width 12: "A" - RenderBlock {P} at (0,76) size 784x23 [border: (3px solid #000000)] + RenderBlock {P} at (0,78) size 784x24 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 11x17 text run at (3,3) width 11: "B" - RenderBlock {P} at (0,115) size 784x19 [border: (1px solid #000000)] + RenderBlock {P} at (0,118) size 784x20 [border: (1px solid #000000)] RenderText {#text} at (1,1) size 11x17 text run at (1,1) width 11: "C" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png index b0628443e6cf..484a0f885a37 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt index 812ea04d906b..1f6c733ae4b4 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x63 - RenderBlock {HTML} at (0,0) size 800x63 - RenderBody {BODY} at (8,8) size 784x47 - RenderBlock {DIV} at (0,0) size 784x47 - RenderBlock {DIV} at (0,0) size 784x47 [color=#008000] [border: (15px solid #008000)] - RenderBlock {P} at (15,15) size 754x17 [color=#000000] [bgcolor=#FFFFFF] +layer at (0,0) size 800x64 + RenderBlock {HTML} at (0,0) size 800x64 + RenderBody {BODY} at (8,8) size 784x48 + RenderBlock {DIV} at (0,0) size 784x48 + RenderBlock {DIV} at (0,0) size 784x48 [color=#008000] [border: (15px solid #008000)] + RenderBlock {P} at (15,15) size 754x18 [color=#000000] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-02-b-expected.txt index 4c0b9b173ab0..79d73466d9c9 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5515-brdr-w-02-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page:" - RenderBlock {P} at (0,33) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderBlock {P} at (0,66) size 784x17 [color=#FF0000] + RenderBlock {P} at (0,68) size 784x18 [color=#FF0000] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.png index 2729e2fc5322..e23161efd58f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.txt index ffc6b673a6f4..58b7a72b585d 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5515-ibrdr-00-b-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderInline {SPAN} at (0,0) size 226x19 [border: (1px solid #000000)] RenderText {#text} at (1,0) size 224x17 text run at (1,0) width 224: "This box should have a thin border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x17 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.png index af62e5340114..a6928bee2a88 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.txt index 7fbb24dc2fad..cc555a1b7f39 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5516-brdr-c-00-a-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x191 - RenderBlock {HTML} at (0,0) size 800x191 - RenderBody {BODY} at (8,16) size 784x159 - RenderBlock {P} at (0,0) size 784x23 [border: (3px solid #008000)] +layer at (0,0) size 800x194 + RenderBlock {HTML} at (0,0) size 800x194 + RenderBody {BODY} at (8,16) size 784x162 + RenderBlock {P} at (0,0) size 784x24 [border: (3px solid #008000)] RenderText {#text} at (3,3) size 235x17 text run at (3,3) width 235: "This box should have a green border." - RenderBlock {P} at (0,39) size 784x23 [border: (3px solid #008000)] + RenderBlock {P} at (0,40) size 784x24 [border: (3px solid #008000)] RenderText {#text} at (3,3) size 300x17 text run at (3,3) width 300: "This box should have an identical green border." - RenderBlock {P} at (0,78) size 784x81 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)] + RenderBlock {P} at (0,80) size 784x82 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)] RenderText {#text} at (32,32) size 532x17 text run at (32,32) width 532: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png index 474e799ab2f3..7eac89181a5f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt index 4ff5f22ec4ef..041b951845d8 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x243 - RenderBlock {HTML} at (0,0) size 800x243 - RenderBody {BODY} at (8,48) size 784x147 - RenderBlock {P} at (48,0) size 688x17 +layer at (0,0) size 800x246 + RenderBlock {HTML} at (0,0) size 800x246 + RenderBody {BODY} at (8,48) size 784x150 + RenderBlock {P} at (48,0) size 688x18 RenderInline {SPAN} at (0,0) size 241x23 [border: (3px solid #008000)] RenderText {#text} at (3,0) size 235x17 text run at (3,0) width 235: "This box should have a green border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (48,65) size 688x17 + RenderBlock {P} at (48,66) size 688x18 RenderInline {SPAN} at (0,0) size 241x23 [border: (3px solid #008000)] RenderText {#text} at (3,0) size 235x17 text run at (3,0) width 235: "This box should have a green border." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (48,130) size 688x17 + RenderBlock {P} at (48,132) size 688x18 RenderInline {SPAN} at (0,0) size 596x81 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)] RenderText {#text} at (32,0) size 532x17 text run at (32,0) width 532: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.png index af615ae89509..2bce19996827 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.txt index 917df0f67b15..e905afa79187 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5517-brdr-s-00-c-expected.txt @@ -1,41 +1,41 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x512 - RenderBlock {HTML} at (0,0) size 800x512 - RenderBody {BODY} at (8,16) size 784x480 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x524 + RenderBlock {HTML} at (0,0) size 800x524 + RenderBody {BODY} at (8,16) size 784x492 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 269x17 text run at (0,0) width 269: "The borders below should be as described:" - RenderBlock {P} at (0,33) size 784x27 [border: (5px dotted #000080)] + RenderBlock {P} at (0,34) size 784x28 [border: (5px dotted #000080)] RenderText {#text} at (5,5) size 104x17 text run at (5,5) width 104: "Blue and dotted." - RenderBlock {P} at (0,76) size 784x27 [border: (5px dashed #000080)] + RenderBlock {P} at (0,78) size 784x28 [border: (5px dashed #000080)] RenderText {#text} at (5,5) size 109x17 text run at (5,5) width 109: "Blue and dashed." - RenderBlock {P} at (0,119) size 784x27 [border: (5px solid #000080)] + RenderBlock {P} at (0,122) size 784x28 [border: (5px solid #000080)] RenderText {#text} at (5,5) size 95x17 text run at (5,5) width 95: "Blue and solid." - RenderBlock {P} at (0,162) size 784x27 [border: (5px double #000080)] + RenderBlock {P} at (0,166) size 784x28 [border: (5px double #000080)] RenderText {#text} at (5,5) size 108x17 text run at (5,5) width 108: "Blue and double." - RenderBlock {P} at (0,205) size 784x27 [border: (5px groove #FFA500)] + RenderBlock {P} at (0,210) size 784x28 [border: (5px groove #FFA500)] RenderText {#text} at (5,5) size 126x17 text run at (5,5) width 126: "Orange and groove." - RenderBlock {P} at (0,248) size 784x27 [border: (5px ridge #FFA500)] + RenderBlock {P} at (0,254) size 784x28 [border: (5px ridge #FFA500)] RenderText {#text} at (5,5) size 114x17 text run at (5,5) width 114: "Orange and ridge." - RenderBlock {P} at (0,291) size 784x27 [border: (5px inset #FFA500)] + RenderBlock {P} at (0,298) size 784x28 [border: (5px inset #FFA500)] RenderText {#text} at (5,5) size 111x17 text run at (5,5) width 111: "Orange and inset." - RenderBlock {P} at (0,334) size 784x27 [border: (5px outset #FFA500)] + RenderBlock {P} at (0,342) size 784x28 [border: (5px outset #FFA500)] RenderText {#text} at (5,5) size 119x17 text run at (5,5) width 119: "Orange and outset." - RenderBlock {P} at (0,377) size 784x27 [border: (5px double #0000FF) (5px groove #0000FF) (5px double #0000FF) (5px groove #0000FF)] + RenderBlock {P} at (0,386) size 784x28 [border: (5px double #0000FF) (5px groove #0000FF) (5px double #0000FF) (5px groove #0000FF)] RenderText {#text} at (5,5) size 475x17 text run at (5,5) width 475: "Blue and double on top and bottom; Blue and grooved on the left and right." - RenderBlock {P} at (0,420) size 784x27 [border: (5px dotted #0000FF) (5px double #0000FF) (5px dashed #0000FF) (5px solid #0000FF)] + RenderBlock {P} at (0,430) size 784x28 [border: (5px dotted #0000FF) (5px double #0000FF) (5px dashed #0000FF) (5px solid #0000FF)] RenderText {#text} at (5,5) size 521x17 text run at (5,5) width 521: "Blue borders which are, in clockwise order from top: dotted, double, dashed, solid." - RenderBlock {P} at (0,463) size 784x17 + RenderBlock {P} at (0,474) size 784x18 RenderText {#text} at (0,0) size 278x17 text run at (0,0) width 278: "This paragraph should have no border at all." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png index 74c492b2ed47..b6baa08d7589 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt index 48a1c3966cb3..a552e4241944 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt @@ -1,22 +1,22 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x148 - RenderBlock {HTML} at (0,0) size 800x148 - RenderBody {BODY} at (8,16) size 784x116 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x152 + RenderBlock {HTML} at (0,0) size 800x152 + RenderBody {BODY} at (8,16) size 784x120 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 269x17 text run at (0,0) width 269: "The borders below should be as described:" - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 126x27 [border: (5px dashed #000000)] RenderText {#text} at (5,0) size 116x17 text run at (5,0) width 116: "Black and dashed." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderInline {SPAN} at (0,0) size 144x27 [border: (5px groove #FFA500)] RenderText {#text} at (5,0) size 134x17 text run at (5,0) width 134: "Orange and grooved." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,99) size 784x17 + RenderBlock {P} at (0,102) size 784x18 RenderInline {SPAN} at (0,0) size 69x17 RenderText {#text} at (0,0) size 69x17 text run at (0,0) width 69: "No border." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.png index 05dd63a55aaa..4f5d639b7719 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.txt index e0a81c67062c..5ea25f9b2f92 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-00-a-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x93 - RenderBlock {HTML} at (0,0) size 800x93 - RenderBody {BODY} at (8,16) size 784x61 - RenderBlock {P} at (0,0) size 784x27 [color=#0000FF] [border: (10px double #0000FF) none] +layer at (0,0) size 800x95 + RenderBlock {HTML} at (0,0) size 800x95 + RenderBody {BODY} at (8,16) size 784x63 + RenderBlock {P} at (0,0) size 784x28 [color=#0000FF] [border: (10px double #0000FF) none] RenderText {#text} at (0,10) size 376x17 text run at (0,10) width 376: "This paragraph should have two blue lines directly above it." - RenderBlock {P} at (0,43) size 784x18 [color=#0000FF] [border: (1px solid #0000FF) none] + RenderBlock {P} at (0,44) size 784x19 [color=#0000FF] [border: (1px solid #0000FF) none] RenderText {#text} at (0,1) size 422x17 text run at (0,1) width 422: "This paragraph should have a single thin blue line directly above it." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.png index 56ecc2b69e02..b909532d9641 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.txt index 40152ab9a1d4..fc0b9c1b989a 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5518-brdr-t-01-e-expected.txt @@ -1,61 +1,61 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x279 - RenderBlock {HTML} at (0,0) size 800x279 - RenderBody {BODY} at (8,16) size 784x247 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x290 + RenderBlock {HTML} at (0,0) size 800x290 + RenderBody {BODY} at (8,16) size 784x258 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x36 RenderText {#text} at (0,0) size 483x17 text run at (0,0) width 483: "There should be a solid blue line directly over every occurance of the word \"" RenderInline {SPAN} at (0,0) size 60x19 [border: (2px solid #0000FF) none] RenderText {#text} at (483,0) size 60x17 text run at (483,0) width 60: "HERE \x{21E7}" - RenderText {#text} at (543,0) size 776x34 + RenderText {#text} at (543,0) size 776x35 text run at (543,0) width 233: "\". (So there should be 8 blue lines on" - text run at (0,17) width 65: "this page.)" - RenderTable {TABLE} at (0,50) size 136x73 - RenderTableSection {TBODY} at (0,0) size 136x73 - RenderTableRow {TR} at (0,2) size 136x21 - RenderTableCell {TD} at (2,2) size 132x21 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 65: "this page.)" + RenderTable {TABLE} at (0,52) size 136x76 + RenderTableSection {TBODY} at (0,0) size 136x76 + RenderTableRow {TR} at (0,2) size 136x22 + RenderTableCell {TD} at (2,2) size 132x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] RenderText {#text} at (36,3) size 60x17 text run at (36,3) width 60: "HERE \x{21E7}" - RenderTableRow {TR} at (0,25) size 136x46 - RenderTableCell {TD} at (2,37) size 62x22 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,3) size 60x18 - text run at (1,4) width 60: "HERE \x{21E7}" - RenderTableCell {TD} at (66,25) size 68x46 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (1,3) size 66x17 + RenderTableRow {TR} at (0,26) size 136x48 + RenderTableCell {TD} at (2,39) size 62x22 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,3) size 60x17 + text run at (1,3) width 60: "HERE \x{21E7}" + RenderTableCell {TD} at (66,26) size 68x48 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (1,3) size 66x18 RenderText {#text} at (3,0) size 60x17 text run at (3,0) width 60: "HERE \x{21E7}" - RenderTable {TABLE} at (1,20) size 66x25 - RenderTableSection {TBODY} at (0,0) size 66x25 - RenderTableRow {TR} at (0,2) size 66x21 - RenderTableCell {TD} at (2,2) size 62x21 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (1,21) size 66x26 + RenderTableSection {TBODY} at (0,0) size 66x26 + RenderTableRow {TR} at (0,2) size 66x22 + RenderTableCell {TD} at (2,2) size 62x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,3) size 60x17 text run at (1,3) width 60: "HERE \x{21E7}" - RenderBlock {UL} at (0,139) size 784x108 - RenderListItem {LI} at (40,0) size 744x70 [border: (2px solid #0000FF) none] - RenderBlock (anonymous) at (0,2) size 744x17 + RenderBlock {UL} at (0,144) size 784x114 + RenderListItem {LI} at (40,0) size 744x74 [border: (2px solid #0000FF) none] + RenderBlock (anonymous) at (0,2) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 60x17 text run at (0,0) width 60: "HERE \x{21E7}" - RenderBlock {UL} at (0,19) size 744x51 - RenderListItem {LI} at (40,0) size 704x17 + RenderBlock {UL} at (0,20) size 744x54 + RenderListItem {LI} at (40,0) size 704x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 75x17 text run at (0,0) width 75: "dummy text" - RenderListItem {LI} at (40,17) size 704x17 + RenderListItem {LI} at (40,18) size 704x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 75x17 text run at (0,0) width 75: "dummy text" - RenderListItem {LI} at (40,34) size 704x17 + RenderListItem {LI} at (40,36) size 704x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 75x17 text run at (0,0) width 75: "dummy text" - RenderListItem {LI} at (40,70) size 744x19 [border: (2px solid #0000FF) none] + RenderListItem {LI} at (40,74) size 744x20 [border: (2px solid #0000FF) none] RenderListMarker at (-17,2) size 7x17: bullet RenderText {#text} at (0,2) size 60x17 text run at (0,2) width 60: "HERE \x{21E7}" - RenderListItem {LI} at (40,89) size 744x19 [border: (2px solid #0000FF) none] + RenderListItem {LI} at (40,94) size 744x20 [border: (2px solid #0000FF) none] RenderListMarker at (-17,2) size 7x17: bullet RenderText {#text} at (0,2) size 60x17 text run at (0,2) width 60: "HERE \x{21E7}" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png index 90706bc8c661..add970f2a26e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt index 51cb4109afb1..cf6197927c2c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt @@ -1,54 +1,54 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x303 - RenderBlock {HTML} at (0,0) size 800x303 - RenderBody {BODY} at (8,8) size 784x287 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,8) size 784x302 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,33) size 784x221 [color=#C0C0C0] - RenderText {#text} at (0,0) size 759x68 + RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x71 text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " text run at (474,0) width 285: "dummy text dummy text dummy text dummy" - text run at (0,17) width 185: "text dummy text dummy text " - text run at (185,17) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,17) width 75: "dummy text" - text run at (0,34) width 395: "dummy text dummy text dummy text dummy text dummy text " - text run at (395,34) width 364: "dummy text dummy text dummy text dummy text dummy" - text run at (0,51) width 106: "text dummy text " - text run at (106,51) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (0,18) width 185: "text dummy text dummy text " + text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,18) width 75: "dummy text" + text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,36) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,54) width 106: "text dummy text " + text run at (106,54) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 130x27 [color=#0000FF] [border: (10px double #0000FF) none] - RenderText {#text} at (580,51) size 130x17 - text run at (580,51) width 130: "two blue lines above" - RenderText {#text} at (710,51) size 762x102 - text run at (710,51) width 52: " dummy" - text run at (0,68) width 106: "text dummy text " - text run at (106,68) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (580,68) width 154: "dummy text dummy text" - text run at (0,85) width 316: "dummy text dummy text dummy text dummy text " - text run at (316,85) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,102) width 27: "text " - text run at (27,102) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (501,102) width 233: "dummy text dummy text dummy text" - text run at (0,119) width 237: "dummy text dummy text dummy text " - text run at (237,119) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (711,119) width 48: "dummy" - text run at (0,136) width 106: "text dummy text " + RenderText {#text} at (580,54) size 130x17 + text run at (580,54) width 130: "two blue lines above" + RenderText {#text} at (710,54) size 762x107 + text run at (710,54) width 52: " dummy" + text run at (0,72) width 106: "text dummy text " + text run at (106,72) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,72) width 154: "dummy text dummy text" + text run at (0,90) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,90) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,108) width 27: "text " + text run at (27,108) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,108) width 233: "dummy text dummy text dummy text" + text run at (0,126) width 237: "dummy text dummy text dummy text " + text run at (237,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (711,126) width 48: "dummy" + text run at (0,144) width 106: "text dummy text " RenderInline {SPAN} at (0,0) size 151x18 [color=#0000FF] [border: (1px solid #0000FF) none] - RenderText {#text} at (106,136) size 151x17 - text run at (106,136) width 113: "one thin blue line " - text run at (219,136) width 38: "above" - RenderText {#text} at (257,136) size 783x85 - text run at (257,136) width 399: " dummy text dummy text dummy text dummy text dummy text " - text run at (656,136) width 127: "dummy text dummy" - text run at (0,153) width 343: "text dummy text dummy text dummy text dummy text " - text run at (343,153) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,170) width 79: "dummy text " - text run at (79,170) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (553,170) width 206: "dummy text dummy text dummy" - text run at (0,187) width 264: "text dummy text dummy text dummy text " - text run at (264,187) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (0,204) width 312: "dummy text dummy text dummy text dummy text" - RenderBlock {DIV} at (0,270) size 784x17 + RenderText {#text} at (106,144) size 151x17 + text run at (106,144) width 113: "one thin blue line " + text run at (219,144) width 38: "above" + RenderText {#text} at (257,144) size 783x89 + text run at (257,144) width 399: " dummy text dummy text dummy text dummy text dummy text " + text run at (656,144) width 127: "dummy text dummy" + text run at (0,162) width 343: "text dummy text dummy text dummy text dummy text " + text run at (343,162) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,180) width 79: "dummy text " + text run at (79,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (553,180) width 206: "dummy text dummy text dummy" + text run at (0,198) width 264: "text dummy text dummy text dummy text " + text run at (264,198) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (0,216) width 312: "dummy text dummy text dummy text dummy text" + RenderBlock {DIV} at (0,284) size 784x18 RenderText {#text} at (0,0) size 416x17 text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.png index 846744820a3a..cfbe0b8f385f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.txt index 3a9fefb15d76..35f5d99ed312 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-00-a-expected.txt @@ -1,37 +1,37 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x218 - RenderBlock {HTML} at (0,0) size 800x218 - RenderBody {BODY} at (8,16) size 784x186 - RenderBlock {P} at (0,0) size 764x85 [color=#0000FF] [border: none (10px double #0000FF) none] +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x196 + RenderBlock {P} at (0,0) size 764x90 [color=#0000FF] [border: none (10px double #0000FF) none] RenderText {#text} at (0,0) size 363x17 text run at (0,0) width 363: "This paragraph should have two blue lines on its right. \x{21E8} " - RenderInline {SPAN} at (0,0) size 754x85 [color=#C0C0C0] - RenderText {#text} at (363,0) size 754x85 + RenderInline {SPAN} at (0,0) size 754x89 [color=#C0C0C0] + RenderText {#text} at (363,0) size 754x89 text run at (363,0) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,17) width 52: "dummy " - text run at (52,17) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,17) width 181: "text dummy text dummy text" - text run at (0,34) width 289: "dummy text dummy text dummy text dummy " - text run at (289,34) width 418: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,51) width 52: "dummy " - text run at (52,51) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,51) width 181: "text dummy text dummy text" - text run at (0,68) width 154: "dummy text dummy text" + text run at (0,18) width 52: "dummy " + text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,18) width 181: "text dummy text dummy text" + text run at (0,36) width 289: "dummy text dummy text dummy text dummy " + text run at (289,36) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,54) width 52: "dummy " + text run at (52,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,54) width 181: "text dummy text dummy text" + text run at (0,72) width 154: "dummy text dummy text" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,101) size 764x85 [color=#0000FF] [border: none (1px solid #0000FF) none] + RenderBlock {P} at (0,106) size 764x90 [color=#0000FF] [border: none (1px solid #0000FF) none] RenderText {#text} at (0,0) size 368x17 text run at (0,0) width 368: "This paragraph should have a thin blue line on its right. \x{21E8} " - RenderInline {SPAN} at (0,0) size 759x85 [color=#C0C0C0] - RenderText {#text} at (368,0) size 759x85 + RenderInline {SPAN} at (0,0) size 759x89 [color=#C0C0C0] + RenderText {#text} at (368,0) size 759x89 text run at (368,0) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,17) width 52: "dummy " - text run at (52,17) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,17) width 233: "text dummy text dummy text dummy" - text run at (0,34) width 237: "text dummy text dummy text dummy " - text run at (237,34) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (711,34) width 23: "text" - text run at (0,51) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (447,51) width 312: "text dummy text dummy text dummy text dummy" - text run at (0,68) width 23: "text" + text run at (0,18) width 52: "dummy " + text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,18) width 233: "text dummy text dummy text dummy" + text run at (0,36) width 237: "text dummy text dummy text dummy " + text run at (237,36) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (711,36) width 23: "text" + text run at (0,54) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (447,54) width 312: "text dummy text dummy text dummy text dummy" + text run at (0,72) width 23: "text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.png index 8077fa4115f0..0574b8b1a56f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.txt index 32a502062bc1..c41560effd8f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-01-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x241 - RenderBlock {HTML} at (0,0) size 800x241 - RenderBody {BODY} at (8,16) size 784x209 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x36 +layer at (0,0) size 800x246 + RenderBlock {HTML} at (0,0) size 800x246 + RenderBody {BODY} at (8,16) size 784x214 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x37 RenderText {#text} at (0,15) size 489x17 text run at (0,15) width 489: "There should be a solid blue line to the right of every occurance of the word \"" RenderInline {SPAN} at (0,0) size 141x36 [border: none (2px solid #0000FF) none] @@ -11,26 +11,26 @@ layer at (0,0) size 800x241 text run at (489,0) width 139: "THERE \x{2799}" RenderText {#text} at (630,15) size 11x17 text run at (630,15) width 11: "\"." - RenderTable {TABLE} at (0,52) size 300x124 - RenderTableSection {TBODY} at (0,0) size 300x124 - RenderTableRow {TR} at (0,2) size 300x38 - RenderTableCell {TD} at (2,2) size 296x38 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,53) size 300x127 + RenderTableSection {TBODY} at (0,0) size 300x127 + RenderTableRow {TR} at (0,2) size 300x39 + RenderTableCell {TD} at (2,2) size 296x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] RenderText {#text} at (154,1) size 139x36 text run at (154,1) width 139: "THERE \x{2799}" - RenderTableRow {TR} at (0,42) size 300x80 - RenderTableCell {TD} at (2,63) size 143x38 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 139x36 - text run at (1,1) width 139: "THERE \x{2799}" - RenderTableCell {TD} at (147,42) size 151x80 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (1,1) size 147x36 + RenderTableRow {TR} at (0,43) size 300x82 + RenderTableCell {TD} at (2,64) size 143x40 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 139x37 + text run at (1,2) width 139: "THERE \x{2799}" + RenderTableCell {TD} at (147,43) size 151x82 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (1,1) size 147x37 RenderText {#text} at (8,0) size 139x36 text run at (8,0) width 139: "THERE \x{2798}" - RenderTable {TABLE} at (1,37) size 147x42 - RenderTableSection {TBODY} at (0,0) size 147x42 - RenderTableRow {TR} at (0,2) size 147x38 - RenderTableCell {TD} at (2,2) size 143x38 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (1,38) size 147x43 + RenderTableSection {TBODY} at (0,0) size 147x43 + RenderTableRow {TR} at (0,2) size 147x39 + RenderTableCell {TD} at (2,2) size 143x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 139x36 text run at (1,1) width 139: "THERE \x{2799}" - RenderBlock {P} at (0,192) size 784x17 + RenderBlock {P} at (0,196) size 784x18 RenderText {#text} at (0,0) size 337x17 text run at (0,0) width 337: "There should be 3 short lines and 2 long lines in total." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.png index debb85272721..bf55974a463f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.txt index e7fc884f7e84..fa89d0a5e804 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5519-brdr-r-02-e-expected.txt @@ -1,55 +1,55 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x320 - RenderBlock {HTML} at (0,0) size 800x320 - RenderBody {BODY} at (8,16) size 784x288 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x336 + RenderBlock {HTML} at (0,0) size 800x336 + RenderBody {BODY} at (8,16) size 784x304 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 748x17 text run at (0,0) width 364: "There should be a solid line to the right of the text below, " text run at (364,0) width 384: "having three segments each of a different colour as indicated." - RenderBlock {UL} at (0,33) size 588x255 - RenderListItem {LI} at (40,0) size 548x68 [border: none (3px solid #FFA500) none] - RenderBlock (anonymous) at (0,0) size 545x17 + RenderBlock {UL} at (0,34) size 588x270 + RenderListItem {LI} at (40,0) size 548x72 [border: none (3px solid #FFA500) none] + RenderBlock (anonymous) at (0,0) size 545x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "Orange orange..." - RenderBlock {UL} at (0,17) size 409x51 - RenderListItem {LI} at (40,0) size 369x17 + RenderBlock {UL} at (0,18) size 409x54 + RenderListItem {LI} at (40,0) size 369x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 114x17 text run at (0,0) width 114: "...orange orange..." - RenderListItem {LI} at (40,17) size 369x17 + RenderListItem {LI} at (40,18) size 369x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 114x17 text run at (0,0) width 114: "...orange orange..." - RenderListItem {LI} at (40,34) size 369x17 + RenderListItem {LI} at (40,36) size 369x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "...orange orange." - RenderListItem {LI} at (40,68) size 548x17 [border: none (3px solid #00FF00) none] + RenderListItem {LI} at (40,72) size 548x18 [border: none (3px solid #00FF00) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 37x17 text run at (0,0) width 37: "Lime." - RenderListItem {LI} at (40,85) size 548x170 [border: none (3px solid #FFFF00) none] + RenderListItem {LI} at (40,90) size 548x180 [border: none (3px solid #FFFF00) none] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (0,0) size 517x170 + RenderText {#text} at (0,0) size 517x179 text run at (0,0) width 333: "Yellow yellow yellow yellow yellow yellow yellow " text run at (333,0) width 184: "yellow yellow yellow yellow" - text run at (0,17) width 235: "yellow yellow yellow yellow yellow " - text run at (235,17) width 278: "yellow yellow yellow yellow yellow yellow" - text run at (0,34) width 141: "yellow yellow yellow " - text run at (141,34) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (0,51) width 47: "yellow " - text run at (47,51) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (470,51) width 43: "yellow" - text run at (0,68) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (376,68) width 137: "yellow yellow yellow" - text run at (0,85) width 282: "yellow yellow yellow yellow yellow yellow " - text run at (282,85) width 231: "yellow yellow yellow yellow yellow" - text run at (0,102) width 188: "yellow yellow yellow yellow " - text run at (188,102) width 325: "yellow yellow yellow yellow yellow yellow yellow" - text run at (0,119) width 94: "yellow yellow " - text run at (94,119) width 419: "yellow yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (0,136) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (423,136) width 90: "yellow yellow" - text run at (0,153) width 282: "yellow yellow yellow yellow yellow yellow." + text run at (0,18) width 235: "yellow yellow yellow yellow yellow " + text run at (235,18) width 278: "yellow yellow yellow yellow yellow yellow" + text run at (0,36) width 141: "yellow yellow yellow " + text run at (141,36) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (0,54) width 47: "yellow " + text run at (47,54) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (470,54) width 43: "yellow" + text run at (0,72) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (376,72) width 137: "yellow yellow yellow" + text run at (0,90) width 282: "yellow yellow yellow yellow yellow yellow " + text run at (282,90) width 231: "yellow yellow yellow yellow yellow" + text run at (0,108) width 188: "yellow yellow yellow yellow " + text run at (188,108) width 325: "yellow yellow yellow yellow yellow yellow yellow" + text run at (0,126) width 94: "yellow yellow " + text run at (94,126) width 419: "yellow yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (0,144) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (423,144) width 90: "yellow yellow" + text run at (0,162) width 282: "yellow yellow yellow yellow yellow yellow." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png index 6f0bdb77853c..5a6ecce6acaf 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt index cde407a83e64..338b06270102 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt @@ -1,56 +1,56 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x303 - RenderBlock {HTML} at (0,0) size 800x303 - RenderBody {BODY} at (8,8) size 784x287 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,8) size 784x302 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,33) size 784x221 [color=#C0C0C0] - RenderText {#text} at (0,0) size 759x51 + RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x53 text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " text run at (474,0) width 285: "dummy text dummy text dummy text dummy" - text run at (0,17) width 185: "text dummy text dummy text " - text run at (185,17) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,17) width 75: "dummy text" - text run at (0,34) width 395: "dummy text dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 759x34 [color=#0000FF] [border: none (10px double #0000FF) none] - RenderInline {SPAN} at (0,0) size 759x34 [color=#C0C0C0] - RenderText {#text} at (395,34) size 759x34 - text run at (395,34) width 316: "dummy text dummy text dummy text dummy text " - text run at (711,34) width 48: "dummy" - text run at (0,51) width 422: "text dummy text dummy text dummy text dummy text dummy text " - text run at (422,51) width 154: "dummy text dummy text" - RenderText {#text} at (576,51) size 131x17 - text run at (576,51) width 131: " two blue lines here: " - RenderText {#text} at (717,51) size 765x102 - text run at (717,51) width 48: "dummy" - text run at (0,68) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (474,68) width 260: "text dummy text dummy text dummy text" - text run at (0,85) width 210: "dummy text dummy text dummy " - text run at (210,85) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (684,85) width 75: "text dummy" - text run at (0,102) width 395: "text dummy text dummy text dummy text dummy text dummy " - text run at (395,102) width 339: "text dummy text dummy text dummy text dummy text" - text run at (0,119) width 131: "dummy text dummy " - text run at (131,119) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (605,119) width 154: "text dummy text dummy" - text run at (0,136) width 106: "text dummy text " + text run at (0,18) width 185: "text dummy text dummy text " + text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,18) width 75: "dummy text" + text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 759x35 [color=#0000FF] [border: none (10px double #0000FF) none] + RenderInline {SPAN} at (0,0) size 759x35 [color=#C0C0C0] + RenderText {#text} at (395,36) size 759x35 + text run at (395,36) width 316: "dummy text dummy text dummy text dummy text " + text run at (711,36) width 48: "dummy" + text run at (0,54) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (422,54) width 154: "dummy text dummy text" + RenderText {#text} at (576,54) size 131x17 + text run at (576,54) width 131: " two blue lines here: " + RenderText {#text} at (717,54) size 765x107 + text run at (717,54) width 48: "dummy" + text run at (0,72) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (474,72) width 260: "text dummy text dummy text dummy text" + text run at (0,90) width 210: "dummy text dummy text dummy " + text run at (210,90) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (684,90) width 75: "text dummy" + text run at (0,108) width 395: "text dummy text dummy text dummy text dummy text dummy " + text run at (395,108) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,126) width 131: "dummy text dummy " + text run at (131,126) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (605,126) width 154: "text dummy text dummy" + text run at (0,144) width 106: "text dummy text " RenderInline {SPAN} at (0,0) size 149x17 [color=#0000FF] [border: none (1px solid #0000FF) none] - RenderText {#text} at (106,136) size 148x17 - text run at (106,136) width 55: "one thin " - text run at (161,136) width 93: "blue line here: " - RenderText {#text} at (255,136) size 777x85 - text run at (255,136) width 316: "dummy text dummy text dummy text dummy text " - text run at (571,136) width 206: "dummy text dummy text dummy" - text run at (0,153) width 264: "text dummy text dummy text dummy text " - text run at (264,153) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (0,170) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (474,170) width 285: "dummy text dummy text dummy text dummy" - text run at (0,187) width 185: "text dummy text dummy text " - text run at (185,187) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,187) width 75: "dummy text" - text run at (0,204) width 312: "dummy text dummy text dummy text dummy text" - RenderBlock {DIV} at (0,270) size 784x17 + RenderText {#text} at (106,144) size 148x17 + text run at (106,144) width 55: "one thin " + text run at (161,144) width 93: "blue line here: " + RenderText {#text} at (255,144) size 777x89 + text run at (255,144) width 316: "dummy text dummy text dummy text dummy text " + text run at (571,144) width 206: "dummy text dummy text dummy" + text run at (0,162) width 264: "text dummy text dummy text dummy text " + text run at (264,162) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (0,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,180) width 285: "dummy text dummy text dummy text dummy" + text run at (0,198) width 185: "text dummy text dummy text " + text run at (185,198) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,198) width 75: "dummy text" + text run at (0,216) width 312: "dummy text dummy text dummy text dummy text" + RenderBlock {DIV} at (0,284) size 784x18 RenderText {#text} at (0,0) size 416x17 text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.png index b773ef552ac7..38fe922a2e3e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.txt index 0855aeaab26e..a1ceb7d1b483 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-00-a-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x93 - RenderBlock {HTML} at (0,0) size 800x93 - RenderBody {BODY} at (8,16) size 784x61 - RenderBlock {P} at (0,0) size 784x27 [color=#0000FF] [border: none (10px double #0000FF) none] +layer at (0,0) size 800x95 + RenderBlock {HTML} at (0,0) size 800x95 + RenderBody {BODY} at (8,16) size 784x63 + RenderBlock {P} at (0,0) size 784x28 [color=#0000FF] [border: none (10px double #0000FF) none] RenderText {#text} at (0,0) size 374x17 text run at (0,0) width 374: "This paragraph should have two blue lines directly under it." - RenderBlock {P} at (0,43) size 784x18 [color=#0000FF] [border: none (1px solid #0000FF) none] + RenderBlock {P} at (0,44) size 784x19 [color=#0000FF] [border: none (1px solid #0000FF) none] RenderText {#text} at (0,0) size 420x17 text run at (0,0) width 420: "This paragraph should have a single thin blue line directly under it." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.png index 6eff0dbc2fc1..5685d4651a04 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.txt index dfcf397e9d27..967925469d40 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5520-brdr-b-01-e-expected.txt @@ -1,61 +1,61 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x279 - RenderBlock {HTML} at (0,0) size 800x279 - RenderBody {BODY} at (8,16) size 784x247 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x34 +layer at (0,0) size 800x290 + RenderBlock {HTML} at (0,0) size 800x290 + RenderBody {BODY} at (8,16) size 784x258 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x36 RenderText {#text} at (0,0) size 496x17 text run at (0,0) width 496: "There should be a solid blue line directly under every occurrence of the word \"" RenderInline {SPAN} at (0,0) size 60x19 [border: none (2px solid #0000FF) none] RenderText {#text} at (496,0) size 60x17 text run at (496,0) width 60: "HERE \x{21E9}" - RenderText {#text} at (556,0) size 769x34 + RenderText {#text} at (556,0) size 769x35 text run at (556,0) width 213: "\". (So there should be 8 blue lines" - text run at (0,17) width 85: "on this page.)" - RenderTable {TABLE} at (0,50) size 136x73 - RenderTableSection {TBODY} at (0,0) size 136x73 - RenderTableRow {TR} at (0,2) size 136x21 - RenderTableCell {TD} at (2,2) size 132x21 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] + text run at (0,18) width 85: "on this page.)" + RenderTable {TABLE} at (0,52) size 136x76 + RenderTableSection {TBODY} at (0,0) size 136x76 + RenderTableRow {TR} at (0,2) size 136x22 + RenderTableCell {TD} at (2,2) size 132x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] RenderText {#text} at (36,1) size 60x17 text run at (36,1) width 60: "HERE \x{21E9}" - RenderTableRow {TR} at (0,25) size 136x46 - RenderTableCell {TD} at (2,37) size 62x22 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 60x18 - text run at (1,2) width 60: "HERE \x{21E9}" - RenderTableCell {TD} at (66,25) size 68x46 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] - RenderTable {TABLE} at (1,1) size 66x25 - RenderTableSection {TBODY} at (0,0) size 66x25 - RenderTableRow {TR} at (0,2) size 66x21 - RenderTableCell {TD} at (2,2) size 62x21 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 136x48 + RenderTableCell {TD} at (2,39) size 62x22 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 60x17 + text run at (1,1) width 60: "HERE \x{21E9}" + RenderTableCell {TD} at (66,26) size 68x48 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] + RenderTable {TABLE} at (1,1) size 66x26 + RenderTableSection {TBODY} at (0,0) size 66x26 + RenderTableRow {TR} at (0,2) size 66x22 + RenderTableCell {TD} at (2,2) size 62x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 60x17 text run at (1,1) width 60: "HERE \x{21E9}" - RenderBlock (anonymous) at (1,26) size 66x17 + RenderBlock (anonymous) at (1,27) size 66x18 RenderText {#text} at (3,0) size 60x17 text run at (3,0) width 60: "HERE \x{21E9}" - RenderBlock {UL} at (0,139) size 784x108 - RenderListItem {LI} at (40,0) size 744x70 [border: none (2px solid #0000FF) none] - RenderBlock {UL} at (0,0) size 744x51 - RenderListItem {LI} at (40,0) size 704x17 + RenderBlock {UL} at (0,144) size 784x114 + RenderListItem {LI} at (40,0) size 744x74 [border: none (2px solid #0000FF) none] + RenderBlock {UL} at (0,0) size 744x54 + RenderListItem {LI} at (40,0) size 704x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderListMarker at (-57,0) size 7x17: bullet RenderText {#text} at (0,0) size 75x17 text run at (0,0) width 75: "dummy text" - RenderListItem {LI} at (40,17) size 704x17 + RenderListItem {LI} at (40,18) size 704x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 75x17 text run at (0,0) width 75: "dummy text" - RenderListItem {LI} at (40,34) size 704x17 + RenderListItem {LI} at (40,36) size 704x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 75x17 text run at (0,0) width 75: "dummy text" - RenderBlock (anonymous) at (0,51) size 744x17 + RenderBlock (anonymous) at (0,54) size 744x18 RenderText {#text} at (0,0) size 60x17 text run at (0,0) width 60: "HERE \x{21E9}" - RenderListItem {LI} at (40,70) size 744x19 [border: none (2px solid #0000FF) none] + RenderListItem {LI} at (40,74) size 744x20 [border: none (2px solid #0000FF) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 60x17 text run at (0,0) width 60: "HERE \x{21E9}" - RenderListItem {LI} at (40,89) size 744x19 [border: none (2px solid #0000FF) none] + RenderListItem {LI} at (40,94) size 744x20 [border: none (2px solid #0000FF) none] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 60x17 text run at (0,0) width 60: "HERE \x{21E9}" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png index ffba6da14a34..77ed1814520a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt index a9eb990a0735..90ae93332422 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt @@ -1,54 +1,54 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x303 - RenderBlock {HTML} at (0,0) size 800x303 - RenderBody {BODY} at (8,8) size 784x287 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,8) size 784x302 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,33) size 784x221 [color=#C0C0C0] - RenderText {#text} at (0,0) size 759x68 + RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x71 text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " text run at (474,0) width 285: "dummy text dummy text dummy text dummy" - text run at (0,17) width 185: "text dummy text dummy text " - text run at (185,17) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,17) width 75: "dummy text" - text run at (0,34) width 395: "dummy text dummy text dummy text dummy text dummy text " - text run at (395,34) width 364: "dummy text dummy text dummy text dummy text dummy" - text run at (0,51) width 106: "text dummy text " - text run at (106,51) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (0,18) width 185: "text dummy text dummy text " + text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,18) width 75: "dummy text" + text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,36) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,54) width 106: "text dummy text " + text run at (106,54) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 131x27 [color=#0000FF] [border: none (10px double #0000FF) none] - RenderText {#text} at (580,51) size 131x17 - text run at (580,51) width 131: "two blue lines below" - RenderText {#text} at (711,51) size 763x102 - text run at (711,51) width 52: " dummy" - text run at (0,68) width 106: "text dummy text " - text run at (106,68) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (580,68) width 154: "dummy text dummy text" - text run at (0,85) width 316: "dummy text dummy text dummy text dummy text " - text run at (316,85) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,102) width 27: "text " - text run at (27,102) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (501,102) width 233: "dummy text dummy text dummy text" - text run at (0,119) width 237: "dummy text dummy text dummy text " - text run at (237,119) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (711,119) width 48: "dummy" - text run at (0,136) width 106: "text dummy text " + RenderText {#text} at (580,54) size 131x17 + text run at (580,54) width 131: "two blue lines below" + RenderText {#text} at (711,54) size 763x107 + text run at (711,54) width 52: " dummy" + text run at (0,72) width 106: "text dummy text " + text run at (106,72) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,72) width 154: "dummy text dummy text" + text run at (0,90) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,90) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,108) width 27: "text " + text run at (27,108) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,108) width 233: "dummy text dummy text dummy text" + text run at (0,126) width 237: "dummy text dummy text dummy text " + text run at (237,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (711,126) width 48: "dummy" + text run at (0,144) width 106: "text dummy text " RenderInline {SPAN} at (0,0) size 152x18 [color=#0000FF] [border: none (1px solid #0000FF) none] - RenderText {#text} at (106,136) size 152x17 - text run at (106,136) width 113: "one thin blue line " - text run at (219,136) width 39: "below" - RenderText {#text} at (258,136) size 784x85 - text run at (258,136) width 399: " dummy text dummy text dummy text dummy text dummy text " - text run at (657,136) width 127: "dummy text dummy" - text run at (0,153) width 343: "text dummy text dummy text dummy text dummy text " - text run at (343,153) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,170) width 79: "dummy text " - text run at (79,170) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (553,170) width 206: "dummy text dummy text dummy" - text run at (0,187) width 264: "text dummy text dummy text dummy text " - text run at (264,187) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (0,204) width 312: "dummy text dummy text dummy text dummy text" - RenderBlock {DIV} at (0,270) size 784x17 + RenderText {#text} at (106,144) size 152x17 + text run at (106,144) width 113: "one thin blue line " + text run at (219,144) width 39: "below" + RenderText {#text} at (258,144) size 784x89 + text run at (258,144) width 399: " dummy text dummy text dummy text dummy text dummy text " + text run at (657,144) width 127: "dummy text dummy" + text run at (0,162) width 343: "text dummy text dummy text dummy text dummy text " + text run at (343,162) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,180) width 79: "dummy text " + text run at (79,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (553,180) width 206: "dummy text dummy text dummy" + text run at (0,198) width 264: "text dummy text dummy text dummy text " + text run at (264,198) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (0,216) width 312: "dummy text dummy text dummy text dummy text" + RenderBlock {DIV} at (0,284) size 784x18 RenderText {#text} at (0,0) size 416x17 text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.png index 3dd6fc8d59a9..b504c3096c42 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.txt index 5a05b5f35025..19cab5a14215 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-00-a-expected.txt @@ -1,37 +1,37 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x218 - RenderBlock {HTML} at (0,0) size 800x218 - RenderBody {BODY} at (8,16) size 784x186 - RenderBlock {P} at (20,0) size 764x85 [color=#0000FF] [border: none (10px double #0000FF)] +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x196 + RenderBlock {P} at (20,0) size 764x90 [color=#0000FF] [border: none (10px double #0000FF)] RenderText {#text} at (10,0) size 354x17 text run at (10,0) width 354: "\x{21E6} This paragraph should have two blue lines on its left. " - RenderInline {SPAN} at (0,0) size 745x85 [color=#C0C0C0] - RenderText {#text} at (364,0) size 745x85 + RenderInline {SPAN} at (0,0) size 745x89 [color=#C0C0C0] + RenderText {#text} at (364,0) size 745x89 text run at (364,0) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (10,17) width 52: "dummy " - text run at (62,17) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (536,17) width 181: "text dummy text dummy text" - text run at (10,34) width 289: "dummy text dummy text dummy text dummy " - text run at (299,34) width 418: "text dummy text dummy text dummy text dummy text dummy text" - text run at (10,51) width 52: "dummy " - text run at (62,51) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (536,51) width 181: "text dummy text dummy text" - text run at (10,68) width 154: "dummy text dummy text" + text run at (10,18) width 52: "dummy " + text run at (62,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (536,18) width 181: "text dummy text dummy text" + text run at (10,36) width 289: "dummy text dummy text dummy text dummy " + text run at (299,36) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (10,54) width 52: "dummy " + text run at (62,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (536,54) width 181: "text dummy text dummy text" + text run at (10,72) width 154: "dummy text dummy text" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (20,101) size 764x85 [color=#0000FF] [border: none (1px solid #0000FF)] + RenderBlock {P} at (20,106) size 764x90 [color=#0000FF] [border: none (1px solid #0000FF)] RenderText {#text} at (1,0) size 359x17 text run at (1,0) width 359: "\x{21E6} This paragraph should have a thin blue line on its left. " - RenderInline {SPAN} at (0,0) size 759x85 [color=#C0C0C0] - RenderText {#text} at (360,0) size 759x85 + RenderInline {SPAN} at (0,0) size 759x89 [color=#C0C0C0] + RenderText {#text} at (360,0) size 759x89 text run at (360,0) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (1,17) width 52: "dummy " - text run at (53,17) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (527,17) width 233: "text dummy text dummy text dummy" - text run at (1,34) width 237: "text dummy text dummy text dummy " - text run at (238,34) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (712,34) width 23: "text" - text run at (1,51) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (448,51) width 312: "text dummy text dummy text dummy text dummy" - text run at (1,68) width 23: "text" + text run at (1,18) width 52: "dummy " + text run at (53,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (527,18) width 233: "text dummy text dummy text dummy" + text run at (1,36) width 237: "text dummy text dummy text dummy " + text run at (238,36) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (712,36) width 23: "text" + text run at (1,54) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (448,54) width 312: "text dummy text dummy text dummy text dummy" + text run at (1,72) width 23: "text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.png index 32845530b8ea..6275b9dd4d7c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.txt index bc8d1d368de8..3ef0b71114d6 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-01-e-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x241 - RenderBlock {HTML} at (0,0) size 800x241 - RenderBody {BODY} at (8,16) size 784x209 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x36 +layer at (0,0) size 800x246 + RenderBlock {HTML} at (0,0) size 800x246 + RenderBody {BODY} at (8,16) size 784x214 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x37 RenderText {#text} at (0,15) size 480x17 text run at (0,15) width 480: "There should be a solid blue line to the left of every occurance of the word \"" RenderInline {SPAN} at (0,0) size 133x36 [border: none (2px solid #0000FF)] @@ -11,26 +11,26 @@ layer at (0,0) size 800x241 text run at (482,0) width 131: "\x{21E6}THERE" RenderText {#text} at (613,15) size 11x17 text run at (613,15) width 11: "\"." - RenderTable {TABLE} at (0,52) size 284x124 - RenderTableSection {TBODY} at (0,0) size 284x124 - RenderTableRow {TR} at (0,2) size 284x38 - RenderTableCell {TD} at (2,2) size 280x38 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] + RenderTable {TABLE} at (0,53) size 284x127 + RenderTableSection {TBODY} at (0,0) size 284x127 + RenderTableRow {TR} at (0,2) size 284x39 + RenderTableCell {TD} at (2,2) size 280x39 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] RenderText {#text} at (3,1) size 131x36 text run at (3,1) width 131: "\x{21E6}THERE" - RenderTableRow {TR} at (0,42) size 284x80 - RenderTableCell {TD} at (2,63) size 135x38 [border: none (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,1) size 131x36 - text run at (3,1) width 131: "\x{21E6}THERE" - RenderTableCell {TD} at (139,42) size 143x80 [border: none (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,1) size 139x36 + RenderTableRow {TR} at (0,43) size 284x82 + RenderTableCell {TD} at (2,64) size 135x40 [border: none (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,1) size 131x37 + text run at (3,2) width 131: "\x{21E6}THERE" + RenderTableCell {TD} at (139,43) size 143x82 [border: none (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,1) size 139x37 RenderText {#text} at (0,0) size 131x36 text run at (0,0) width 131: "\x{21E6}THERE" - RenderTable {TABLE} at (3,37) size 139x42 - RenderTableSection {TBODY} at (0,0) size 139x42 - RenderTableRow {TR} at (0,2) size 139x38 - RenderTableCell {TD} at (2,2) size 135x38 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (3,38) size 139x43 + RenderTableSection {TBODY} at (0,0) size 139x43 + RenderTableRow {TR} at (0,2) size 139x39 + RenderTableCell {TD} at (2,2) size 135x39 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (3,1) size 131x36 text run at (3,1) width 131: "\x{21E6}THERE" - RenderBlock {P} at (0,192) size 784x17 + RenderBlock {P} at (0,196) size 784x18 RenderText {#text} at (0,0) size 337x17 text run at (0,0) width 337: "There should be 3 short lines and 2 long lines in total." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.png index d4bb55a0d336..99b48deb4ca3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.txt index 59ba2ee3c111..dc96f0e8a934 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5521-brdr-l-02-e-expected.txt @@ -1,53 +1,53 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x269 - RenderBlock {HTML} at (0,0) size 800x269 - RenderBody {BODY} at (8,16) size 784x237 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x282 + RenderBlock {HTML} at (0,0) size 800x282 + RenderBody {BODY} at (8,16) size 784x250 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 739x17 text run at (0,0) width 355: "There should be a solid line to the left of the text below, " text run at (355,0) width 384: "having three segments each of a different colour as indicated." - RenderBlock {UL} at (0,33) size 784x204 - RenderListItem {LI} at (40,0) size 744x68 [border: none (3px solid #FFA500)] - RenderBlock (anonymous) at (3,0) size 741x17 + RenderBlock {UL} at (0,34) size 784x216 + RenderListItem {LI} at (40,0) size 744x72 [border: none (3px solid #FFA500)] + RenderBlock (anonymous) at (3,0) size 741x18 RenderListMarker at (-20,0) size 7x17: bullet RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "Orange orange..." - RenderBlock {UL} at (3,17) size 741x51 - RenderListItem {LI} at (40,0) size 701x17 + RenderBlock {UL} at (3,18) size 741x54 + RenderListItem {LI} at (40,0) size 701x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 114x17 text run at (0,0) width 114: "...orange orange..." - RenderListItem {LI} at (40,17) size 701x17 + RenderListItem {LI} at (40,18) size 701x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 114x17 text run at (0,0) width 114: "...orange orange..." - RenderListItem {LI} at (40,34) size 701x17 + RenderListItem {LI} at (40,36) size 701x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 106x17 text run at (0,0) width 106: "...orange orange." - RenderListItem {LI} at (40,68) size 744x17 [border: none (3px solid #00FF00)] + RenderListItem {LI} at (40,72) size 744x18 [border: none (3px solid #00FF00)] RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (3,0) size 37x17 text run at (3,0) width 37: "Lime." - RenderListItem {LI} at (40,85) size 744x119 [border: none (3px solid #FFFF00)] + RenderListItem {LI} at (40,90) size 744x126 [border: none (3px solid #FFFF00)] RenderListMarker at (-17,0) size 7x17: bullet - RenderText {#text} at (3,0) size 705x119 + RenderText {#text} at (3,0) size 705x125 text run at (3,0) width 333: "Yellow yellow yellow yellow yellow yellow yellow " text run at (336,0) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (3,17) width 47: "yellow " - text run at (50,17) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (473,17) width 231: "yellow yellow yellow yellow yellow" - text run at (3,34) width 188: "yellow yellow yellow yellow " - text run at (191,34) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (614,34) width 90: "yellow yellow" - text run at (3,51) width 329: "yellow yellow yellow yellow yellow yellow yellow " - text run at (332,51) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (3,68) width 47: "yellow " - text run at (50,68) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (473,68) width 231: "yellow yellow yellow yellow yellow" - text run at (3,85) width 188: "yellow yellow yellow yellow " - text run at (191,85) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (614,85) width 90: "yellow yellow" - text run at (3,102) width 329: "yellow yellow yellow yellow yellow yellow yellow " - text run at (332,102) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow." + text run at (3,18) width 47: "yellow " + text run at (50,18) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (473,18) width 231: "yellow yellow yellow yellow yellow" + text run at (3,36) width 188: "yellow yellow yellow yellow " + text run at (191,36) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (614,36) width 90: "yellow yellow" + text run at (3,54) width 329: "yellow yellow yellow yellow yellow yellow yellow " + text run at (332,54) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (3,72) width 47: "yellow " + text run at (50,72) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (473,72) width 231: "yellow yellow yellow yellow yellow" + text run at (3,90) width 188: "yellow yellow yellow yellow " + text run at (191,90) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (614,90) width 90: "yellow yellow" + text run at (3,108) width 329: "yellow yellow yellow yellow yellow yellow yellow " + text run at (332,108) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png index 235240a89646..f2faeaa9b63c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt index a5391600e7d1..7fe7b69f5a29 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt @@ -1,57 +1,57 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x303 - RenderBlock {HTML} at (0,0) size 800x303 - RenderBody {BODY} at (8,8) size 784x287 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,8) size 784x302 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,33) size 784x221 [color=#C0C0C0] - RenderText {#text} at (0,0) size 759x51 + RenderBlock {P} at (0,34) size 784x234 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x53 text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " text run at (474,0) width 285: "dummy text dummy text dummy text dummy" - text run at (0,17) width 185: "text dummy text dummy text " - text run at (185,17) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,17) width 75: "dummy text" - text run at (0,34) width 395: "dummy text dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 783x34 [color=#0000FF] [border: none (10px double #0000FF)] - RenderText {#text} at (405,34) size 172x17 - text run at (405,34) width 172: "\x{21E6} two blue lines to the left " - RenderInline {SPAN} at (0,0) size 783x34 [color=#C0C0C0] - RenderText {#text} at (577,34) size 783x34 - text run at (577,34) width 52: "dummy " - text run at (629,34) width 154: "text dummy text dummy" - text run at (0,51) width 316: "text dummy text dummy text dummy text dummy " - text run at (316,51) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,18) width 185: "text dummy text dummy text " + text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,18) width 75: "dummy text" + text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 783x35 [color=#0000FF] [border: none (10px double #0000FF)] + RenderText {#text} at (405,36) size 172x17 + text run at (405,36) width 172: "\x{21E6} two blue lines to the left " + RenderInline {SPAN} at (0,0) size 783x35 [color=#C0C0C0] + RenderText {#text} at (577,36) size 783x35 + text run at (577,36) width 52: "dummy " + text run at (629,36) width 154: "text dummy text dummy" + text run at (0,54) width 316: "text dummy text dummy text dummy text dummy " + text run at (316,54) width 418: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,68) size 759x85 - text run at (0,68) width 395: "dummy text dummy text dummy text dummy text dummy text " - text run at (395,68) width 364: "dummy text dummy text dummy text dummy text dummy" - text run at (0,85) width 106: "text dummy text " - text run at (106,85) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (580,85) width 154: "dummy text dummy text" - text run at (0,102) width 316: "dummy text dummy text dummy text dummy text " - text run at (316,102) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,119) width 27: "text " - text run at (27,119) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (501,119) width 233: "dummy text dummy text dummy text" - text run at (0,136) width 158: "dummy text dummy text " + RenderText {#text} at (0,72) size 759x89 + text run at (0,72) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,72) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,90) width 106: "text dummy text " + text run at (106,90) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,90) width 154: "dummy text dummy text" + text run at (0,108) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,108) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,126) width 27: "text " + text run at (27,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,126) width 233: "dummy text dummy text dummy text" + text run at (0,144) width 158: "dummy text dummy text " RenderInline {SPAN} at (0,0) size 194x17 [color=#0000FF] [border: none (1px solid #0000FF)] - RenderText {#text} at (159,136) size 193x17 - text run at (159,136) width 193: "\x{21E6} one thin blue line to the left " - RenderText {#text} at (352,136) size 759x85 - text run at (352,136) width 52: "dummy " - text run at (404,136) width 339: "text dummy text dummy text dummy text dummy text" - text run at (0,153) width 131: "dummy text dummy " - text run at (131,153) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (605,153) width 154: "text dummy text dummy" - text run at (0,170) width 316: "text dummy text dummy text dummy text dummy " - text run at (316,170) width 418: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,187) width 52: "dummy " - text run at (52,187) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,187) width 233: "text dummy text dummy text dummy" - text run at (0,204) width 237: "text dummy text dummy text dummy " - text run at (237,204) width 181: "text dummy text dummy text" - RenderBlock {DIV} at (0,270) size 784x17 + RenderText {#text} at (159,144) size 193x17 + text run at (159,144) width 193: "\x{21E6} one thin blue line to the left " + RenderText {#text} at (352,144) size 759x89 + text run at (352,144) width 52: "dummy " + text run at (404,144) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,162) width 131: "dummy text dummy " + text run at (131,162) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (605,162) width 154: "text dummy text dummy" + text run at (0,180) width 316: "text dummy text dummy text dummy text dummy " + text run at (316,180) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,198) width 52: "dummy " + text run at (52,198) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,198) width 233: "text dummy text dummy text dummy" + text run at (0,216) width 237: "text dummy text dummy text dummy " + text run at (237,216) width 181: "text dummy text dummy text" + RenderBlock {DIV} at (0,284) size 784x18 RenderText {#text} at (0,0) size 416x17 text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.png index 32015a3c1dea..018a20cf6382 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.txt index ad2ad1b31b88..1459321dae0e 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-00-b-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x379 - RenderBlock {HTML} at (0,0) size 800x379 - RenderBody {BODY} at (8,16) size 784x347 - RenderBlock {P} at (0,0) size 784x17 [color=#0000FF] +layer at (0,0) size 800x388 + RenderBlock {HTML} at (0,0) size 800x388 + RenderBody {BODY} at (8,16) size 784x356 + RenderBlock {P} at (0,0) size 784x18 [color=#0000FF] RenderText {#text} at (0,0) size 226x17 text run at (0,0) width 226: "The borders should be as described." - RenderBlock {P} at (0,33) size 784x23 [color=#0000FF] [border: (3px solid #FFA500)] + RenderBlock {P} at (0,34) size 784x24 [color=#0000FF] [border: (3px solid #FFA500)] RenderText {#text} at (3,3) size 112x17 text run at (3,3) width 112: "Orange and solid." - RenderBlock {P} at (0,72) size 784x27 [color=#0000FF] [border: (5px outset #FFA500)] + RenderBlock {P} at (0,74) size 784x28 [color=#0000FF] [border: (5px outset #FFA500)] RenderText {#text} at (5,5) size 119x17 text run at (5,5) width 119: "Orange and outset." - RenderBlock {P} at (0,115) size 784x27 [color=#0000FF] [border: (5px inset #FFA500)] + RenderBlock {P} at (0,118) size 784x28 [color=#0000FF] [border: (5px inset #FFA500)] RenderText {#text} at (5,5) size 111x17 text run at (5,5) width 111: "Orange and inset." - RenderBlock {P} at (0,158) size 784x37 [color=#0000FF] [border: (10px ridge #FFA500)] + RenderBlock {P} at (0,162) size 784x38 [color=#0000FF] [border: (10px ridge #FFA500)] RenderText {#text} at (10,10) size 122x17 text run at (10,10) width 122: "Orange and ridged." - RenderBlock {P} at (0,211) size 784x37 [color=#0000FF] [border: (10px double #FFA500)] + RenderBlock {P} at (0,216) size 784x38 [color=#0000FF] [border: (10px double #FFA500)] RenderText {#text} at (10,10) size 125x17 text run at (10,10) width 125: "Orange and double." - RenderBlock {P} at (0,264) size 784x17 [color=#0000FF] + RenderBlock {P} at (0,270) size 784x18 [color=#0000FF] RenderText {#text} at (0,0) size 69x17 text run at (0,0) width 69: "No border." - RenderBlock {P} at (0,297) size 784x17 [color=#0000FF] + RenderBlock {P} at (0,304) size 784x18 [color=#0000FF] RenderText {#text} at (0,0) size 69x17 text run at (0,0) width 69: "No border." - RenderBlock {P} at (0,330) size 784x17 [color=#0000FF] + RenderBlock {P} at (0,338) size 784x18 [color=#0000FF] RenderText {#text} at (0,0) size 69x17 text run at (0,0) width 69: "No border." diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.png index 93f683592731..2ef2fb6720ac 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.txt index 65e9eee2a2cf..6d0dc7a9c322 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-01-b-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x199 - RenderBlock {HTML} at (0,0) size 800x199 - RenderBody {BODY} at (8,16) size 784x151 - RenderBlock {P} at (0,0) size 784x17 [color=#0000FF] +layer at (0,0) size 800x201 + RenderBlock {HTML} at (0,0) size 800x201 + RenderBody {BODY} at (8,16) size 784x153 + RenderBlock {P} at (0,0) size 784x18 [color=#0000FF] RenderText {#text} at (0,0) size 264x17 text run at (0,0) width 264: "There should be no border around the cat:" - RenderBlock {DIV} at (32,49) size 720x102 [color=#FF0000] + RenderBlock {DIV} at (32,50) size 720x103 [color=#FF0000] RenderInline {A} at (0,0) size 98x17 [color=#0000EE] RenderImage {IMG} at (0,0) size 98x99 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.png index a389ad109c13..037bd497fae3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.txt index f490d28eed30..c9d59281186f 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5522-brdr-02-e-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x78 - RenderBlock {HTML} at (0,0) size 800x78 - RenderBody {BODY} at (8,8) size 784x62 [color=#0000FF] - RenderTable {TABLE} at (0,0) size 708x62 - RenderTableSection {TBODY} at (0,0) size 708x62 - RenderTableRow {TR} at (0,2) size 708x23 - RenderTableCell {TD} at (2,2) size 704x23 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] +layer at (0,0) size 800x80 + RenderBlock {HTML} at (0,0) size 800x80 + RenderBody {BODY} at (8,8) size 784x64 [color=#0000FF] + RenderTable {TABLE} at (0,0) size 708x64 + RenderTableSection {TBODY} at (0,0) size 708x64 + RenderTableRow {TR} at (0,2) size 708x24 + RenderTableCell {TD} at (2,2) size 704x24 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] RenderText {#text} at (3,3) size 325x17 text run at (3,3) width 325: "There should be a blue border around this sentence." - RenderTableRow {TR} at (0,27) size 708x33 - RenderTableCell {TD} at (2,32) size 331x23 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,28) size 708x34 + RenderTableCell {TD} at (2,33) size 331x24 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (3,3) size 325x17 text run at (3,3) width 325: "There should be a blue border around this sentence." - RenderTableCell {TD} at (335,27) size 371x33 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] - RenderTable {TABLE} at (3,3) size 365x27 - RenderTableSection {TBODY} at (0,0) size 365x27 - RenderTableRow {TR} at (0,2) size 365x23 - RenderTableCell {TD} at (2,2) size 361x23 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] + RenderTableCell {TD} at (335,28) size 371x34 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] + RenderTable {TABLE} at (3,3) size 365x28 + RenderTableSection {TBODY} at (0,0) size 365x28 + RenderTableRow {TR} at (0,2) size 365x24 + RenderTableCell {TD} at (2,2) size 361x24 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (3,3) size 106x17 text run at (3,3) width 106: "There should be " RenderInline {STRONG} at (0,0) size 113x17 diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.png index 32b4ab53843c..fb16b6757444 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.txt index 2701b4abbe2d..df46c1ba7d54 100644 --- a/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0805-c5522-ibrdr-00-a-expected.txt @@ -1,53 +1,53 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x286 - RenderBlock {HTML} at (0,0) size 800x286 - RenderBody {BODY} at (8,8) size 784x270 - RenderBlock {DIV} at (0,0) size 784x17 +layer at (0,0) size 800x300 + RenderBlock {HTML} at (0,0) size 800x300 + RenderBody {BODY} at (8,8) size 784x284 + RenderBlock {DIV} at (0,0) size 784x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,33) size 784x204 [color=#C0C0C0] - RenderText {#text} at (0,0) size 759x51 + RenderBlock {P} at (0,34) size 784x216 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x53 text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " text run at (474,0) width 285: "dummy text dummy text dummy text dummy" - text run at (0,17) width 185: "text dummy text dummy text " - text run at (185,17) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,17) width 75: "dummy text" - text run at (0,34) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (0,18) width 185: "text dummy text dummy text " + text run at (185,18) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,18) width 75: "dummy text" + text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 259x37 [color=#0000FF] [border: (10px double #0000FF)] - RenderText {#text} at (405,34) size 239x17 - text run at (405,34) width 239: "two blue lines all around this blue text" - RenderText {#text} at (654,34) size 759x102 - text run at (654,34) width 4: " " - text run at (658,34) width 75: "dummy text" - text run at (0,51) width 395: "dummy text dummy text dummy text dummy text dummy text " - text run at (395,51) width 364: "dummy text dummy text dummy text dummy text dummy" - text run at (0,68) width 106: "text dummy text " - text run at (106,68) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (580,68) width 154: "dummy text dummy text" - text run at (0,85) width 316: "dummy text dummy text dummy text dummy text " - text run at (316,85) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,102) width 27: "text " - text run at (27,102) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (501,102) width 233: "dummy text dummy text dummy text" - text run at (0,119) width 79: "dummy text " + RenderText {#text} at (405,36) size 239x17 + text run at (405,36) width 239: "two blue lines all around this blue text" + RenderText {#text} at (654,36) size 759x107 + text run at (654,36) width 4: " " + text run at (658,36) width 75: "dummy text" + text run at (0,54) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,54) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,72) width 106: "text dummy text " + text run at (106,72) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,72) width 154: "dummy text dummy text" + text run at (0,90) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,90) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,108) width 27: "text " + text run at (27,108) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,108) width 233: "dummy text dummy text dummy text" + text run at (0,126) width 79: "dummy text " RenderInline {SPAN} at (0,0) size 234x19 [color=#0000FF] [border: (1px solid #0000FF)] - RenderText {#text} at (80,119) size 232x17 - text run at (80,119) width 27: "one " - text run at (107,119) width 205: "blue line all around this blue text" - RenderText {#text} at (313,119) size 760x85 - text run at (313,119) width 162: " dummy text dummy text " - text run at (475,119) width 285: "dummy text dummy text dummy text dummy" - text run at (0,136) width 185: "text dummy text dummy text " - text run at (185,136) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (659,136) width 75: "dummy text" - text run at (0,153) width 395: "dummy text dummy text dummy text dummy text dummy text " - text run at (395,153) width 364: "dummy text dummy text dummy text dummy text dummy" - text run at (0,170) width 106: "text dummy text " - text run at (106,170) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (580,170) width 154: "dummy text dummy text" - text run at (0,187) width 316: "dummy text dummy text dummy text dummy text " - text run at (316,187) width 75: "dummy text" - RenderBlock {DIV} at (0,253) size 784x17 + RenderText {#text} at (80,126) size 232x17 + text run at (80,126) width 27: "one " + text run at (107,126) width 205: "blue line all around this blue text" + RenderText {#text} at (313,126) size 760x89 + text run at (313,126) width 162: " dummy text dummy text " + text run at (475,126) width 285: "dummy text dummy text dummy text dummy" + text run at (0,144) width 185: "text dummy text dummy text " + text run at (185,144) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,144) width 75: "dummy text" + text run at (0,162) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,162) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,180) width 106: "text dummy text " + text run at (106,180) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,180) width 154: "dummy text dummy text" + text run at (0,198) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,198) width 75: "dummy text" + RenderBlock {DIV} at (0,266) size 784x18 RenderText {#text} at (0,0) size 416x17 text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.png b/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.png index a4fe10fc7f08..791a4d8336c4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.png and b/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.txt b/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.txt index e1a65b60e744..057f34b67307 100644 --- a/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090204-display-change-01-b-ao-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x89 - RenderBlock {HTML} at (0,0) size 800x89 - RenderBody {BODY} at (8,16) size 784x65 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x90 + RenderBlock {HTML} at (0,0) size 800x90 + RenderBody {BODY} at (8,16) size 784x66 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "There should be no red below, only green." - RenderBlock (floating) {DIV} at (0,33) size 784x16 [color=#008000] [bgcolor=#FF0000] + RenderBlock (floating) {DIV} at (0,34) size 784x16 [color=#008000] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 16x16 text run at (0,0) width 16: "X" - RenderBlock {DIV} at (0,33) size 16x32 [color=#008000] [bgcolor=#FF0000] + RenderBlock {DIV} at (0,34) size 16x32 [color=#008000] [bgcolor=#FF0000] RenderText {#text} at (0,16) size 16x16 text run at (0,16) width 16: "X" diff --git a/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png index a79437f47cb3..fe88f5aca795 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt index 5e1033c50dff..d083d3367b33 100644 --- a/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x185 - RenderBlock {HTML} at (0,0) size 800x185 - RenderBody {BODY} at (8,16) size 784x161 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x186 + RenderBlock {HTML} at (0,0) size 800x186 + RenderBody {BODY} at (8,16) size 784x162 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 482x17 text run at (0,0) width 482: "The two diagrams below should be identical to the pixel with no red present." - RenderTable {TABLE} at (0,33) size 434x128 + RenderTable {TABLE} at (0,34) size 434x128 RenderTableSection {TBODY} at (0,0) size 434x128 RenderTableRow {TR} at (0,2) size 434x124 RenderTableCell {TD} at (2,2) size 214x124 [border: (2px solid #000000)] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.png index 954938ec0684..ec2303c5dcf6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.txt index 3d171dddd155..0e4d04fea0f7 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-00-d-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x165 - RenderBlock {HTML} at (0,0) size 800x165 - RenderBody {BODY} at (8,16) size 784x99 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x170 + RenderBlock {HTML} at (0,0) size 800x170 + RenderBody {BODY} at (8,16) size 784x102 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 404x17 text run at (0,0) width 404: "The two patterns below should be identical, with no red present." - RenderBlock {DIV} at (0,33) size 784x66 - RenderBlock {DIV} at (16,16) size 160x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (0,34) size 784x68 + RenderBlock {DIV} at (16,16) size 160x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 12x17 text run at (0,0) width 12: " *" - RenderBlock {DIV} at (96,33) size 160x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock {DIV} at (96,34) size 160x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (148,0) size 12x17 text run at (148,0) width 12: "* " - RenderBlock {DIV} at (16,115) size 240x0 + RenderBlock {DIV} at (16,118) size 240x0 RenderBlock {DIV} at (0,0) size 240x0 [bgcolor=#FF0000] - RenderBlock (floating) {P} at (0,0) size 160x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock (floating) {P} at (0,0) size 160x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 12x17 text run at (0,0) width 12: " *" - RenderBlock (floating) {P} at (80,17) size 160x17 [color=#FFFF00] [bgcolor=#000080] + RenderBlock (floating) {P} at (80,18) size 160x18 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (148,0) size 12x17 text run at (148,0) width 12: "* " diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.png index be6fa7c83b56..309ee694ce2b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.txt index d93a2113dba6..bec70aee0388 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-01-d-g-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x161 - RenderBlock {HTML} at (0,0) size 800x161 - RenderBody {BODY} at (8,16) size 784x97 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x162 + RenderBlock {HTML} at (0,0) size 800x162 + RenderBody {BODY} at (8,16) size 784x98 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 404x17 text run at (0,0) width 404: "The two patterns below should be identical, with no red present." - RenderBlock {DIV} at (0,33) size 784x64 + RenderBlock {DIV} at (0,34) size 784x64 RenderImage {IMG} at (16,16) size 160x16 [color=#FFFF00] [bgcolor=#FF0000] RenderImage {IMG} at (96,32) size 160x16 [color=#FFFF00] [bgcolor=#FF0000] - RenderBlock {DIV} at (16,113) size 240x0 + RenderBlock {DIV} at (16,114) size 240x0 RenderBlock {DIV} at (0,0) size 240x0 [bgcolor=#FF0000] RenderImage {IMG} at (0,0) size 160x16 [color=#FFFF00] RenderImage {IMG} at (80,16) size 160x16 [color=#FFFF00] diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.png index e39ecf2812bb..b7780682b541 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.txt index 95d94472f89b..3768f2ada9fb 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-02-c-expected.txt @@ -1,43 +1,43 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x261 - RenderBlock {HTML} at (0,0) size 800x261 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 [color=#000080] - RenderText {#text} at (0,0) size 779x34 +layer at (0,0) size 800x268 + RenderBlock {HTML} at (0,0) size 800x268 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 [color=#000080] + RenderText {#text} at (0,0) size 779x35 text run at (0,0) width 423: "The blue boxes below should be in numeric order and form a \"D\". " text run at (423,0) width 356: "(Boxes labelled \"A\" should be in the first column; boxes" - text run at (0,17) width 53: "labelled " - text run at (53,17) width 355: "\"B\" should be in the second; arrows indicate the correct " - text run at (408,17) width 71: "alignment.)" - RenderBlock {DIV} at (16,50) size 320x0 - RenderBlock (floating) {P} at (4,4) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + text run at (0,18) width 53: "labelled " + text run at (53,18) width 355: "\"B\" should be in the second; arrows indicate the correct " + text run at (408,18) width 71: "alignment.)" + RenderBlock {DIV} at (16,52) size 320x0 + RenderBlock (floating) {P} at (4,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 1" - RenderBlock (floating) {P} at (138,4) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (138,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 40x17 text run at (7,7) width 40: "\x{21E6} B 2" - RenderBlock (floating) {P} at (4,43) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 3" - RenderBlock (floating) {P} at (190,43) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 4 \x{21E8}" - RenderBlock (floating) {P} at (4,82) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 5" - RenderBlock (floating) {P} at (190,82) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 6 \x{21E8}" - RenderBlock (floating) {P} at (190,121) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 8 \x{21E8}" - RenderBlock (floating) {P} at (4,121) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 7" - RenderBlock (floating) {P} at (4,160) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 9" - RenderBlock (floating) {P} at (138,160) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (138,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 48x17 text run at (7,7) width 48: "\x{21E6} B 10" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.png index 47ec6f87f7d6..5cc6e9d4b685 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.txt index 88fc67dc6940..04ffe34ad2a6 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-03-c-expected.txt @@ -1,43 +1,43 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x261 - RenderBlock {HTML} at (0,0) size 800x261 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 [color=#000080] - RenderText {#text} at (0,0) size 755x34 +layer at (0,0) size 800x268 + RenderBlock {HTML} at (0,0) size 800x268 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 [color=#000080] + RenderText {#text} at (0,0) size 755x35 text run at (0,0) width 389: "The blue boxes below should be in numeric order and form a " text run at (389,0) width 366: "backwards \"D\". (Boxes labelled \"A\" should be in the first" - text run at (0,17) width 55: "column; " - text run at (55,17) width 402: "boxes labelled \"B\" should be in the second; arrows indicate the " - text run at (457,17) width 118: "correct alignment.)" - RenderBlock {DIV} at (16,50) size 320x0 - RenderBlock (floating) {P} at (190,4) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + text run at (0,18) width 55: "column; " + text run at (55,18) width 402: "boxes labelled \"B\" should be in the second; arrows indicate the " + text run at (457,18) width 118: "correct alignment.)" + RenderBlock {DIV} at (16,52) size 320x0 + RenderBlock (floating) {P} at (190,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 2 \x{21E8}" - RenderBlock (floating) {P} at (56,4) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (56,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (78,7) size 41x17 text run at (78,7) width 41: "A 1 \x{21E8}" - RenderBlock (floating) {P} at (190,43) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 4 \x{21E8}" - RenderBlock (floating) {P} at (4,43) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 3" - RenderBlock (floating) {P} at (190,82) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 6 \x{21E8}" - RenderBlock (floating) {P} at (4,82) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 5" - RenderBlock (floating) {P} at (4,121) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 7" - RenderBlock (floating) {P} at (190,121) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 8 \x{21E8}" - RenderBlock (floating) {P} at (190,160) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (71,7) size 48x17 text run at (71,7) width 48: "B 10 \x{21E8}" - RenderBlock (floating) {P} at (56,160) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (56,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (78,7) size 41x17 text run at (78,7) width 41: "A 9 \x{21E8}" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.png index f63e8b8778fe..1fea48fcd3fd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.txt index 838202fec7a9..c57955df3aa7 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-04-c-expected.txt @@ -1,55 +1,55 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x339 - RenderBlock {HTML} at (0,0) size 800x339 - RenderBody {BODY} at (8,16) size 784x34 - RenderBlock {P} at (0,0) size 784x34 [color=#000080] - RenderText {#text} at (0,0) size 778x34 +layer at (0,0) size 800x348 + RenderBlock {HTML} at (0,0) size 800x348 + RenderBody {BODY} at (8,16) size 784x36 + RenderBlock {P} at (0,0) size 784x36 [color=#000080] + RenderText {#text} at (0,0) size 778x35 text run at (0,0) width 422: "The blue boxes below should be in numeric order and form a \"B\". " text run at (422,0) width 356: "(Boxes labelled \"A\" should be in the first column; boxes" - text run at (0,17) width 53: "labelled " - text run at (53,17) width 355: "\"B\" should be in the second; arrows indicate the correct " - text run at (408,17) width 71: "alignment.)" - RenderBlock {DIV} at (16,50) size 320x0 - RenderBlock (floating) {P} at (4,4) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + text run at (0,18) width 53: "labelled " + text run at (53,18) width 355: "\"B\" should be in the second; arrows indicate the correct " + text run at (408,18) width 71: "alignment.)" + RenderBlock {DIV} at (16,52) size 320x0 + RenderBlock (floating) {P} at (4,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 1" - RenderBlock (floating) {P} at (138,4) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (138,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 40x17 text run at (7,7) width 40: "\x{21E6} B 2" - RenderBlock (floating) {P} at (4,43) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 3" - RenderBlock (floating) {P} at (190,43) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 4 \x{21E8}" - RenderBlock (floating) {P} at (4,82) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 5" - RenderBlock (floating) {P} at (190,82) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (79,7) size 40x17 text run at (79,7) width 40: "B 6 \x{21E8}" - RenderBlock (floating) {P} at (4,121) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 7" - RenderBlock (floating) {P} at (138,121) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (138,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 40x17 text run at (7,7) width 40: "\x{21E6} B 8" - RenderBlock (floating) {P} at (4,160) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 41x17 text run at (7,7) width 41: "\x{21E6} A 9" - RenderBlock (floating) {P} at (190,160) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (71,7) size 48x17 text run at (71,7) width 48: "B 10 \x{21E8}" - RenderBlock (floating) {P} at (4,199) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,204) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 49x17 text run at (7,7) width 49: "\x{21E6} A 11" - RenderBlock (floating) {P} at (190,199) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (190,204) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (71,7) size 48x17 text run at (71,7) width 48: "B 12 \x{21E8}" - RenderBlock (floating) {P} at (4,238) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (4,244) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 49x17 text run at (7,7) width 49: "\x{21E6} A 13" - RenderBlock (floating) {P} at (138,238) size 126x31 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (138,244) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,7) size 48x17 text run at (7,7) width 48: "\x{21E6} B 14" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.png index e451ab8f632a..fe2bcfdb0cbd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.txt index b5e9595fbb00..7099044c1b01 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-00-d-expected.txt @@ -1,21 +1,21 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x131 - RenderBlock {HTML} at (0,0) size 800x131 - RenderBody {BODY} at (8,16) size 784x105 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x108 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 681x17 text run at (0,0) width 681: "There should be five numbers, in numerical order, below: on the first line 1, 2 and 3, on the second, 4 and 5." - RenderBlock {DIV} at (10,33) size 262x72 [color=#000080] [border: (3px solid #0000FF)] - RenderBlock (floating) {P} at (19,19) size 80x17 + RenderBlock {DIV} at (10,34) size 262x74 [color=#000080] [border: (3px solid #0000FF)] + RenderBlock (floating) {P} at (19,19) size 80x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "1" - RenderBlock (floating) {P} at (99,19) size 80x17 + RenderBlock (floating) {P} at (99,19) size 80x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "2" - RenderBlock (floating) {P} at (19,36) size 80x17 + RenderBlock (floating) {P} at (19,37) size 80x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "4" - RenderText {#text} at (179,19) size 88x34 + RenderText {#text} at (179,19) size 88x35 text run at (179,19) width 8: "3" - text run at (99,36) width 88: "5 " + text run at (99,37) width 88: "5 " diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.png index 921db6b0cc27..623a061a48eb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt index 99b3dec3c137..c52d80209bd4 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x269 - RenderBlock {HTML} at (0,0) size 800x269 - RenderBody {BODY} at (8,16) size 784x243 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x270 + RenderBlock {HTML} at (0,0) size 800x270 + RenderBody {BODY} at (8,16) size 784x244 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 766x17 text run at (0,0) width 766: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below, slightly on the left (\x{21E6}) inside a blue box." - RenderBlock {DIV} at (10,33) size 260x210 [border: (5px solid #0000FF)] + RenderBlock {DIV} at (10,34) size 260x210 [border: (5px solid #0000FF)] RenderBlock (floating) {P} at (5,5) size 100x100 [color=#000080] RenderImage {IMG} at (0,0) size 100x100 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.png index 34c308bbfc8e..e428a0cbdc3c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.txt index abf4634b55b5..56428cca1748 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-00-e-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x184 - RenderBlock {HTML} at (0,0) size 800x185 - RenderBody {BODY} at (8,16) size 784x153 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x192 + RenderBlock {HTML} at (0,0) size 800x193 + RenderBody {BODY} at (8,16) size 784x161 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 263x17 text run at (0,0) width 263: "The word \"fail\" should not appear below." - RenderBlock {DIV} at (16,33) size 240x120 [color=#FFFFFF] [bgcolor=#FFFFFF] - RenderBlock (floating) {P} at (0,0) size 44x18 [color=#000080] + RenderBlock {DIV} at (16,34) size 240x127 [color=#FFFFFF] [bgcolor=#FFFFFF] + RenderBlock (floating) {P} at (0,0) size 44x19 [color=#000080] RenderText {#text} at (0,0) size 44x17 text run at (0,0) width 44: "TEST:" - RenderBlock (floating) {P} at (0,17) size 240x18 [color=#00FFFF] [bgcolor=#008080] + RenderBlock (floating) {P} at (0,18) size 240x19 [color=#00FFFF] [bgcolor=#008080] RenderText {#text} at (100,0) size 40x17 text run at (100,0) width 40: "PASS" - RenderText {#text} at (43,0) size 236x119 + RenderText {#text} at (43,0) size 236x125 text run at (43,0) width 189: "fail fail fail fail fail fail fail fail" - text run at (0,34) width 48: "fail fail " - text run at (48,34) width 188: "fail fail fail fail fail fail fail fail" - text run at (0,51) width 48: "fail fail " - text run at (48,51) width 188: "fail fail fail fail fail fail fail fail" - text run at (0,68) width 48: "fail fail " - text run at (48,68) width 188: "fail fail fail fail fail fail fail fail" - text run at (0,85) width 48: "fail fail " - text run at (48,85) width 188: "fail fail fail fail fail fail fail fail" - text run at (0,102) width 44: "fail fail" + text run at (0,36) width 48: "fail fail " + text run at (48,36) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,54) width 48: "fail fail " + text run at (48,54) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,72) width 48: "fail fail " + text run at (48,72) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,90) width 48: "fail fail " + text run at (48,90) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,108) width 44: "fail fail" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png index 3f83f35d2a59..8508fd783ed2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt index 83d053f78201..884f73792404 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x162 - RenderBlock {HTML} at (0,0) size 800x162 - RenderBody {BODY} at (8,16) size 784x121 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x163 + RenderBlock {HTML} at (0,0) size 800x163 + RenderBody {BODY} at (8,16) size 784x122 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 382x17 text run at (0,0) width 382: "The word \"fail\" should not appear below, just a green block." - RenderBlock {DIV} at (16,33) size 240x88 [color=#FFFFFF] [bgcolor=#FFFFFF] + RenderBlock {DIV} at (16,34) size 240x88 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 1x1 RenderImage {IMG} at (0,1) size 240x112 RenderInline {SPAN} at (0,0) size 188x88 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png index 586386605e1f..08019e7ee5a3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt index d649ad8bc9ec..74085a217b97 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x183 - RenderBlock {HTML} at (0,0) size 800x183 - RenderBody {BODY} at (8,8) size 784x167 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x184 + RenderBlock {HTML} at (0,0) size 800x184 + RenderBody {BODY} at (8,8) size 784x168 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 273x17 text run at (0,0) width 273: "There should be a green box to the right. \x{2798}" - RenderBlock {DIV} at (0,17) size 784x150 [bgcolor=#FFFFFF] + RenderBlock {DIV} at (0,18) size 784x150 [bgcolor=#FFFFFF] RenderBlock (floating) {P} at (458,10) size 316x91 [color=#008000] [border: (3px solid #008000)] RenderText {#text} at (8,8) size 300x75 text run at (8,8) width 300: "x x xxxx xx xxxx x x" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.png index c0ee5ccc9406..1821e13ac744 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.txt index bb131605c7ca..02428e920ca2 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltblck-01-d-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x132 - RenderBlock {HTML} at (0,0) size 800x132 - RenderBody {BODY} at (8,8) size 784x116 - RenderBlock {DIV} at (0,0) size 784x116 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF) (96px solid #0000FF) (3px solid #0000FF)] - RenderBlock (floating) {DIV} at (421,11) size 352x66 [bgcolor=#008080] - RenderBlock {P} at (16,16) size 320x34 - RenderText {#text} at (0,0) size 313x34 +layer at (0,0) size 800x133 + RenderBlock {HTML} at (0,0) size 800x133 + RenderBody {BODY} at (8,8) size 784x117 + RenderBlock {DIV} at (0,0) size 784x117 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF) (96px solid #0000FF) (3px solid #0000FF)] + RenderBlock (floating) {DIV} at (421,11) size 352x68 [bgcolor=#008080] + RenderBlock {P} at (16,16) size 320x36 + RenderText {#text} at (0,0) size 313x35 text run at (0,0) width 313: "This teal box should start inside the dark blue box" - text run at (0,17) width 81: "and spill out " - text run at (81,17) width 171: "onto the blue area below it." - RenderBlock {P} at (3,3) size 778x17 + text run at (0,18) width 81: "and spill out " + text run at (81,18) width 171: "onto the blue area below it." + RenderBlock {P} at (3,3) size 778x18 RenderText {#text} at (0,0) size 256x17 text run at (0,0) width 256: "You should see a teal box to the right. \x{21E8}" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png index 4b648ae8f518..1b25ebdfcb3f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt index af5282ce6b04..4671e48bb7be 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x708 +layer at (0,0) size 785x709 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x708 - RenderBlock {HTML} at (0,0) size 785x708 - RenderBody {BODY} at (8,16) size 769x684 - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x709 + RenderBlock {HTML} at (0,0) size 785x709 + RenderBody {BODY} at (8,16) size 769x685 + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 251x17 text run at (0,0) width 251: "There should be a big green box below." - RenderBlock {DIV} at (0,33) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 50x50 RenderBlock {P} at (3,18) size 300x90 RenderText {#text} at (50,0) size 290x90 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.png index 9277b5f5a107..452b7d0948e7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt index 6a4711b2c372..643b7e908553 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt @@ -1,47 +1,47 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x246 - RenderBlock {HTML} at (0,0) size 800x246 +layer at (0,0) size 800x260 + RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,8) size 784x0 - RenderBlock (floating) {DIV} at (0,0) size 588x238 [color=#FFFFFF] [bgcolor=#000080] - RenderBlock (floating) {DIV} at (277,0) size 294x68 [color=#00FFFF] [bgcolor=#008080] - RenderBlock {P} at (0,0) size 294x68 - RenderText {#text} at (0,0) size 294x68 + RenderBlock (floating) {DIV} at (0,0) size 588x252 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock (floating) {DIV} at (277,0) size 294x72 [color=#00FFFF] [bgcolor=#008080] + RenderBlock {P} at (0,0) size 294x72 + RenderText {#text} at (0,0) size 294x71 text run at (0,0) width 294: "To the right of this teal box there should be a" - text run at (0,17) width 94: "purple square, " - text run at (94,17) width 200: "tightly squeezed in between the" - text run at (0,34) width 194: "edge of the teal box and the " - text run at (193,34) width 101: "outside edge of" - text run at (0,51) width 110: "the blue block. \x{21E8}" - RenderBlock {P} at (0,0) size 588x238 - RenderText {#text} at (0,0) size 277x34 + text run at (0,18) width 94: "purple square, " + text run at (94,18) width 200: "tightly squeezed in between the" + text run at (0,36) width 194: "edge of the teal box and the " + text run at (193,36) width 101: "outside edge of" + text run at (0,54) width 110: "the blue block. \x{21E8}" + RenderBlock {P} at (0,0) size 588x252 + RenderText {#text} at (0,0) size 277x35 text run at (0,0) width 277: "Inside this blue block on the right there" - text run at (0,17) width 159: "should be a teal box. \x{21E8} " - RenderInline {SPAN} at (0,0) size 588x221 [color=#000080] - RenderText {#text} at (158,17) size 588x221 - text run at (158,17) width 119: "FAIL FAIL FAIL" - text run at (0,34) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,51) width 81: "FAIL FAIL " - text run at (80,51) width 197: "FAIL FAIL FAIL FAIL FAIL" - text run at (0,68) width 298: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (297,68) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,85) width 213: "FAIL FAIL FAIL FAIL FAIL " - text run at (212,85) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,102) width 128: "FAIL FAIL FAIL " - text run at (127,102) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,119) width 43: "FAIL " - text run at (42,119) width 510: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (552,119) width 36: "FAIL" - text run at (0,136) width 468: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (467,136) width 121: "FAIL FAIL FAIL" - text run at (0,153) width 383: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (382,153) width 206: "FAIL FAIL FAIL FAIL FAIL" - text run at (0,170) width 298: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (297,170) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,187) width 213: "FAIL FAIL FAIL FAIL FAIL " - text run at (212,187) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,204) width 128: "FAIL FAIL FAIL " - text run at (127,204) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,221) width 40: "FAIL " - text run at (40,221) width 476: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,18) width 159: "should be a teal box. \x{21E8} " + RenderInline {SPAN} at (0,0) size 588x233 [color=#000080] + RenderText {#text} at (158,18) size 588x233 + text run at (158,18) width 119: "FAIL FAIL FAIL" + text run at (0,36) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,54) width 81: "FAIL FAIL " + text run at (80,54) width 197: "FAIL FAIL FAIL FAIL FAIL" + text run at (0,72) width 298: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (297,72) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,90) width 213: "FAIL FAIL FAIL FAIL FAIL " + text run at (212,90) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,108) width 128: "FAIL FAIL FAIL " + text run at (127,108) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,126) width 43: "FAIL " + text run at (42,126) width 510: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (552,126) width 36: "FAIL" + text run at (0,144) width 468: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (467,144) width 121: "FAIL FAIL FAIL" + text run at (0,162) width 383: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (382,162) width 206: "FAIL FAIL FAIL FAIL FAIL" + text run at (0,180) width 298: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (297,180) width 291: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,198) width 213: "FAIL FAIL FAIL FAIL FAIL " + text run at (212,198) width 376: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,216) width 128: "FAIL FAIL FAIL " + text run at (127,216) width 461: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,234) width 40: "FAIL " + text run at (40,234) width 476: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.png index 9cc96523f9f9..b6c6502a9ab4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.txt index e63720782958..15419f4d89f5 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-flthw-00-c-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x257 - RenderBlock {HTML} at (0,0) size 800x257 - RenderBody {BODY} at (8,16) size 784x233 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x258 + RenderBlock {HTML} at (0,0) size 800x258 + RenderBody {BODY} at (8,16) size 784x234 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 507x17 text run at (0,0) width 507: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below." - RenderBlock {DIV} at (0,33) size 784x200 + RenderBlock {DIV} at (0,34) size 784x200 RenderBlock (floating) {DIV} at (0,0) size 100x100 RenderBlock (floating) {DIV} at (0,100) size 100x100 RenderBlock {DIV} at (100,0) size 684x200 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png index 1bb66e410d6d..0d51172b1785 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt index 52b4924d895a..59f72e406fdb 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x181 - RenderBlock {HTML} at (0,0) size 800x181 - RenderBody {BODY} at (8,16) size 784x150 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x182 + RenderBlock {HTML} at (0,0) size 800x182 + RenderBody {BODY} at (8,16) size 784x151 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 274x17 text run at (0,0) width 274: "There should be two boxes of green below." - RenderBlock {DIV} at (15,33) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (15,34) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (floating) {SPAN} at (3,3) size 45x30 RenderText {#text} at (0,0) size 30x30 text run at (0,0) width 30: "X" @@ -14,7 +14,7 @@ layer at (0,0) size 800x181 text run at (48,3) width 45: "x x" text run at (48,18) width 30: "xx" text run at (3,33) width 45: "x x" - RenderBlock {DIV} at (15,99) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (15,100) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (floating) {SPAN} at (3,3) size 45x30 [bgcolor=#008000] RenderText {#text} at (0,0) size 30x30 text run at (0,0) width 30: "X" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png index cff41992c99d..65c3adfd87cd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt index 60dc37475000..5237d91356ea 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x618 +layer at (0,0) size 785x619 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x618 - RenderBlock {HTML} at (0,0) size 785x618 - RenderBody {BODY} at (8,16) size 769x594 - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x619 + RenderBlock {HTML} at (0,0) size 785x619 + RenderBody {BODY} at (8,16) size 769x595 + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 330x17 text run at (0,0) width 330: "There should be a tall green box below, with no red." - RenderBlock {DIV} at (0,33) size 126x561 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 126x561 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (18,18) size 90x45 RenderText {#text} at (0,0) size 90x45 text run at (0,0) width 75: "x x x" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.png index df02c9b8673e..26747aaa5c3a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt index 5ba03f02ee12..9ac056a29c8a 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt @@ -1,74 +1,74 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x225 - RenderBlock {HTML} at (0,0) size 800x225 - RenderBody {BODY} at (8,16) size 784x199 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x202 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 649x17 text run at (0,0) width 388: "Below you should see four blocks side by side followed by a " text run at (388,0) width 261: "matching cross section of the four blocks." - RenderBlock (floating) {DIV} at (0,43) size 140x129 [bgcolor=#FFFF00] [border: (20px solid #000000)] - RenderBlock {P} at (40,56) size 60x17 + RenderBlock (floating) {DIV} at (0,44) size 140x130 [bgcolor=#FFFF00] [border: (20px solid #000000)] + RenderBlock {P} at (40,56) size 60x18 RenderText {#text} at (6,0) size 48x17 text run at (6,0) width 48: "Yellow" - RenderBlock (floating) {DIV} at (160,43) size 140x129 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - RenderBlock {P} at (40,56) size 60x17 + RenderBlock (floating) {DIV} at (160,44) size 140x130 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] + RenderBlock {P} at (40,56) size 60x18 RenderText {#text} at (15,0) size 30x17 text run at (15,0) width 30: "Blue" - RenderBlock (floating) {DIV} at (320,43) size 140x129 [bgcolor=#FF0000] [border: (20px solid #000000)] - RenderBlock {P} at (40,56) size 60x17 + RenderBlock (floating) {DIV} at (320,44) size 140x130 [bgcolor=#FF0000] [border: (20px solid #000000)] + RenderBlock {P} at (40,56) size 60x18 RenderText {#text} at (17,0) size 26x17 text run at (17,0) width 26: "Red" - RenderBlock (floating) {DIV} at (480,43) size 140x129 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - RenderBlock {P} at (40,56) size 60x17 + RenderBlock (floating) {DIV} at (480,44) size 140x130 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] + RenderBlock {P} at (40,56) size 60x18 RenderText {#text} at (10,0) size 40x17 text run at (10,0) width 40: "Green" - RenderBlock {DIV} at (0,182) size 784x17 - RenderTable {TABLE} at (0,0) size 620x17 - RenderTableSection {TBODY} at (0,0) size 620x17 - RenderTableRow {TR} at (0,0) size 620x17 - RenderTableCell {TD} at (0,0) size 20x17 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (0,184) size 784x18 + RenderTable {TABLE} at (0,0) size 620x18 + RenderTableSection {TBODY} at (0,0) size 620x18 + RenderTableRow {TR} at (0,0) size 620x18 + RenderTableCell {TD} at (0,0) size 20x18 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (20,0) size 100x17 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (20,0) size 100x18 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (120,0) size 20x17 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (120,0) size 20x18 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (140,0) size 20x17 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] + RenderTableCell {TD} at (140,0) size 20x18 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (160,0) size 20x17 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] + RenderTableCell {TD} at (160,0) size 20x18 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (180,0) size 100x17 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] + RenderTableCell {TD} at (180,0) size 100x18 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (280,0) size 20x17 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] + RenderTableCell {TD} at (280,0) size 20x18 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (300,0) size 20x17 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] + RenderTableCell {TD} at (300,0) size 20x18 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (320,0) size 20x17 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] + RenderTableCell {TD} at (320,0) size 20x18 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (340,0) size 100x17 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] + RenderTableCell {TD} at (340,0) size 100x18 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (440,0) size 20x17 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] + RenderTableCell {TD} at (440,0) size 20x18 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (460,0) size 20x17 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] + RenderTableCell {TD} at (460,0) size 20x18 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (480,0) size 20x17 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] + RenderTableCell {TD} at (480,0) size 20x18 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (500,0) size 100x17 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] + RenderTableCell {TD} at (500,0) size 100x18 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderTableCell {TD} at (600,0) size 20x17 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] + RenderTableCell {TD} at (600,0) size 20x18 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png index 957979668ca8..a32ef44a79b5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt index ed98d7e708c7..bd4f6b87f72e 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt @@ -1,104 +1,104 @@ -layer at (0,0) size 785x750 +layer at (0,0) size 785x781 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x750 - RenderBlock {HTML} at (0,0) size 785x750 - RenderBody {BODY} at (8,32) size 769x686 - RenderBlock {P} at (32,0) size 705x108 [color=#000080] - RenderText {#text} at (0,0) size 673x108 +layer at (0,0) size 785x781 + RenderBlock {HTML} at (0,0) size 785x781 + RenderBody {BODY} at (8,32) size 769x717 + RenderBlock {P} at (32,0) size 705x111 [color=#000080] + RenderText {#text} at (0,0) size 673x110 text run at (0,0) width 673: "\x{21E9} The following blue box should be exactly half the" - text run at (0,36) width 81: "width " - text run at (81,36) width 560: "of the viewport, on the left of the 50% ruler" - text run at (0,72) width 74: "mark." - RenderBlock (floating) {DIV} at (0,140) size 385x323 [color=#FFFFFF] [bgcolor=#0000FF] - RenderText {#text} at (0,0) size 385x323 + text run at (0,37) width 81: "width " + text run at (81,37) width 560: "of the viewport, on the left of the 50% ruler" + text run at (0,74) width 74: "mark." + RenderBlock (floating) {DIV} at (0,143) size 385x342 [color=#FFFFFF] [bgcolor=#0000FF] + RenderText {#text} at (0,0) size 385x341 text run at (0,0) width 385: "ignore this float text ignore this float text ignore this" - text run at (0,17) width 43: "float " - text run at (42,17) width 343: "text ignore this float text ignore this float text" - text run at (0,34) width 79: "ignore this " - text run at (78,34) width 307: "float text ignore this float text ignore this" - text run at (0,51) width 126: "float text ignore " - text run at (125,51) width 260: "this float text ignore this float text" - text run at (0,68) width 156: "ignore this float text " - text run at (155,68) width 230: "ignore this float text ignore this" - text run at (0,85) width 199: "float text ignore this float " - text run at (198,85) width 187: "text ignore this float text" - text run at (0,102) width 235: "ignore this float text ignore this " - text run at (234,102) width 151: "float text ignore this" - text run at (0,119) width 283: "float text ignore this float text ignore " - text run at (282,119) width 103: "this float text" - text run at (0,136) width 312: "ignore this float text ignore this float text " - text run at (311,136) width 74: "ignore this" - text run at (0,153) width 356: "float text ignore this float text ignore this float " - text run at (355,153) width 30: "text" - text run at (0,170) width 385: "ignore this float text ignore this float text ignore this" - text run at (0,187) width 385: "float text ignore this float text ignore this float text" - text run at (0,204) width 48: "ignore " - text run at (47,204) width 338: "this float text ignore this float text ignore this" - text run at (0,221) width 78: "float text " - text run at (77,221) width 308: "ignore this float text ignore this float text" - text run at (0,238) width 121: "ignore this float " - text run at (120,238) width 265: "text ignore this float text ignore this" - text run at (0,255) width 157: "float text ignore this " - text run at (156,255) width 229: "float text ignore this float text" - text run at (0,272) width 204: "ignore this float text ignore " - text run at (203,272) width 182: "this float text ignore this" - text run at (0,289) width 234: "float text ignore this float text " - text run at (234,289) width 151: "ignore this float text" - text run at (0,306) width 259: "ignore this float text ignore this float" - RenderBlock {DIV} at (0,140) size 769x442 [color=#C0C0C0] - RenderText {#text} at (384,0) size 769x442 + text run at (0,18) width 43: "float " + text run at (42,18) width 343: "text ignore this float text ignore this float text" + text run at (0,36) width 79: "ignore this " + text run at (78,36) width 307: "float text ignore this float text ignore this" + text run at (0,54) width 126: "float text ignore " + text run at (125,54) width 260: "this float text ignore this float text" + text run at (0,72) width 156: "ignore this float text " + text run at (155,72) width 230: "ignore this float text ignore this" + text run at (0,90) width 199: "float text ignore this float " + text run at (198,90) width 187: "text ignore this float text" + text run at (0,108) width 235: "ignore this float text ignore this " + text run at (234,108) width 151: "float text ignore this" + text run at (0,126) width 283: "float text ignore this float text ignore " + text run at (282,126) width 103: "this float text" + text run at (0,144) width 312: "ignore this float text ignore this float text " + text run at (311,144) width 74: "ignore this" + text run at (0,162) width 356: "float text ignore this float text ignore this float " + text run at (355,162) width 30: "text" + text run at (0,180) width 385: "ignore this float text ignore this float text ignore this" + text run at (0,198) width 385: "float text ignore this float text ignore this float text" + text run at (0,216) width 48: "ignore " + text run at (47,216) width 338: "this float text ignore this float text ignore this" + text run at (0,234) width 78: "float text " + text run at (77,234) width 308: "ignore this float text ignore this float text" + text run at (0,252) width 121: "ignore this float " + text run at (120,252) width 265: "text ignore this float text ignore this" + text run at (0,270) width 157: "float text ignore this " + text run at (156,270) width 229: "float text ignore this float text" + text run at (0,288) width 204: "ignore this float text ignore " + text run at (203,288) width 182: "this float text ignore this" + text run at (0,306) width 234: "float text ignore this float text " + text run at (234,306) width 151: "ignore this float text" + text run at (0,324) width 259: "ignore this float text ignore this float" + RenderBlock {DIV} at (0,143) size 769x468 [color=#C0C0C0] + RenderText {#text} at (384,0) size 769x467 text run at (384,0) width 385: "this is some dummy text this is some dummy text this is" - text run at (384,17) width 98: "some dummy " - text run at (481,17) width 288: "text this is some dummy text this is some" - text run at (384,34) width 169: "dummy text this is some " - text run at (552,34) width 217: "dummy text this is some dummy" - text run at (384,51) width 230: "text this is some dummy text this is " - text run at (613,51) width 156: "some dummy text this is" - text run at (384,68) width 305: "some dummy text this is some dummy text " - text run at (688,68) width 81: "this is some" - text run at (384,85) width 385: "dummy text this is some dummy text this is some dummy" - text run at (384,102) width 385: "text this is some dummy text this is some dummy text this is" - text run at (384,119) width 42: "some " - text run at (425,119) width 344: "dummy text this is some dummy text this is some" - text run at (384,136) width 130: "dummy text this is " - text run at (513,136) width 256: "some dummy text this is some dummy" - text run at (384,153) width 189: "text this is some dummy text " - text run at (572,153) width 197: "this is some dummy text this is" - text run at (384,170) width 274: "some dummy text this is some dummy " - text run at (657,170) width 112: "text this is some" - text run at (384,187) width 337: "dummy text this is some dummy text this is some " - text run at (721,187) width 48: "dummy" - text run at (384,204) width 385: "text this is some dummy text this is some dummy text this is" - text run at (384,221) width 385: "some dummy text this is some dummy text this is some" - text run at (384,238) width 85: "dummy text " - text run at (468,238) width 301: "this is some dummy text this is some dummy" - text run at (384,255) width 161: "text this is some dummy " - text run at (544,255) width 225: "text this is some dummy text this is" - text run at (384,272) width 218: "some dummy text this is some " - text run at (601,272) width 168: "dummy text this is some" - text run at (384,289) width 298: "dummy text this is some dummy text this is " - text run at (681,289) width 88: "some dummy" - text run at (384,306) width 349: "text this is some dummy text this is some dummy text " - text run at (732,306) width 37: "this is" - text run at (0,323) width 405: "some dummy text this is some dummy text this is some dummy " - text run at (404,323) width 365: "text this is some dummy text this is some dummy text this" - text run at (0,340) width 53: "is some " - text run at (52,340) width 444: "dummy text this is some dummy text this is some dummy text this is " - text run at (495,340) width 274: "some dummy text this is some dummy text" - text run at (0,357) width 161: "this is some dummy text " - text run at (160,357) width 454: "this is some dummy text this is some dummy text this is some dummy " - text run at (613,357) width 156: "text this is some dummy" - text run at (0,374) width 278: "text this is some dummy text this is some " - text run at (277,374) width 459: "dummy text this is some dummy text this is some dummy text this is " - text run at (736,374) width 33: "some" - text run at (0,391) width 407: "dummy text this is some dummy text this is some dummy text " - text run at (406,391) width 363: "this is some dummy text this is some dummy text this is" - text run at (0,408) width 90: "some dummy " - text run at (89,408) width 421: "text this is some dummy text this is some dummy text this is some " - text run at (509,408) width 260: "dummy text this is some dummy text this" - text run at (0,425) width 170: "is some dummy text this is " - text run at (170,425) width 268: "some dummy text this is some dummy text" - RenderBlock {P} at (32,614) size 705x72 [color=#000080] - RenderText {#text} at (19,0) size 686x72 + text run at (384,18) width 98: "some dummy " + text run at (481,18) width 288: "text this is some dummy text this is some" + text run at (384,36) width 169: "dummy text this is some " + text run at (552,36) width 217: "dummy text this is some dummy" + text run at (384,54) width 230: "text this is some dummy text this is " + text run at (613,54) width 156: "some dummy text this is" + text run at (384,72) width 305: "some dummy text this is some dummy text " + text run at (688,72) width 81: "this is some" + text run at (384,90) width 385: "dummy text this is some dummy text this is some dummy" + text run at (384,108) width 385: "text this is some dummy text this is some dummy text this is" + text run at (384,126) width 42: "some " + text run at (425,126) width 344: "dummy text this is some dummy text this is some" + text run at (384,144) width 130: "dummy text this is " + text run at (513,144) width 256: "some dummy text this is some dummy" + text run at (384,162) width 189: "text this is some dummy text " + text run at (572,162) width 197: "this is some dummy text this is" + text run at (384,180) width 274: "some dummy text this is some dummy " + text run at (657,180) width 112: "text this is some" + text run at (384,198) width 337: "dummy text this is some dummy text this is some " + text run at (721,198) width 48: "dummy" + text run at (384,216) width 385: "text this is some dummy text this is some dummy text this is" + text run at (384,234) width 385: "some dummy text this is some dummy text this is some" + text run at (384,252) width 85: "dummy text " + text run at (468,252) width 301: "this is some dummy text this is some dummy" + text run at (384,270) width 161: "text this is some dummy " + text run at (544,270) width 225: "text this is some dummy text this is" + text run at (384,288) width 218: "some dummy text this is some " + text run at (601,288) width 168: "dummy text this is some" + text run at (384,306) width 298: "dummy text this is some dummy text this is " + text run at (681,306) width 88: "some dummy" + text run at (384,324) width 349: "text this is some dummy text this is some dummy text " + text run at (732,324) width 37: "this is" + text run at (0,342) width 405: "some dummy text this is some dummy text this is some dummy " + text run at (404,342) width 365: "text this is some dummy text this is some dummy text this" + text run at (0,360) width 53: "is some " + text run at (52,360) width 444: "dummy text this is some dummy text this is some dummy text this is " + text run at (495,360) width 274: "some dummy text this is some dummy text" + text run at (0,378) width 161: "this is some dummy text " + text run at (160,378) width 454: "this is some dummy text this is some dummy text this is some dummy " + text run at (613,378) width 156: "text this is some dummy" + text run at (0,396) width 278: "text this is some dummy text this is some " + text run at (277,396) width 459: "dummy text this is some dummy text this is some dummy text this is " + text run at (736,396) width 33: "some" + text run at (0,414) width 407: "dummy text this is some dummy text this is some dummy text " + text run at (406,414) width 363: "this is some dummy text this is some dummy text this is" + text run at (0,432) width 90: "some dummy " + text run at (89,432) width 421: "text this is some dummy text this is some dummy text this is some " + text run at (509,432) width 260: "dummy text this is some dummy text this" + text run at (0,450) width 170: "is some dummy text this is " + text run at (170,450) width 268: "some dummy text this is some dummy text" + RenderBlock {P} at (32,643) size 705x74 [color=#000080] + RenderText {#text} at (19,0) size 686x73 text run at (19,0) width 686: "The above gray text should flow around the blue box." - text run at (678,36) width 27: "\x{21E7}" + text run at (678,37) width 27: "\x{21E7}" diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png index 4fa7fa4a59f1..d61709bdfb6c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt index 6e72b19054ba..6124fcfae0ce 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x53 - RenderBlock {HTML} at (0,0) size 800x53 - RenderBody {BODY} at (8,8) size 784x37 - RenderBlock {DIV} at (0,0) size 784x37 - RenderBlock (floating) {P} at (0,0) size 784x22 +layer at (0,0) size 800x54 + RenderBlock {HTML} at (0,0) size 800x54 + RenderBody {BODY} at (8,8) size 784x38 + RenderBlock {DIV} at (0,0) size 784x38 + RenderBlock (floating) {P} at (0,0) size 784x23 RenderText {#text} at (0,0) size 381x22 text run at (0,0) width 381: "There should be a green block on the next line:" - RenderImage {IMG} at (0,22) size 15x15 [color=#FF0000] + RenderImage {IMG} at (0,23) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png index 9b27b054feb9..9fa3071025d3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt index 73048997d827..066b80b7869c 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x52 - RenderBlock {HTML} at (0,0) size 800x52 +layer at (0,0) size 800x54 + RenderBlock {HTML} at (0,0) size 800x54 RenderBody {BODY} at (8,8) size 784x17 RenderBlock {DIV} at (0,0) size 784x17 - RenderBlock (floating) {P} at (0,0) size 392x44 - RenderText {#text} at (0,0) size 352x44 + RenderBlock (floating) {P} at (0,0) size 392x46 + RenderText {#text} at (0,0) size 352x45 text run at (0,0) width 352: "There should be a green square to the right," - text run at (0,22) width 312: "roughly in the middle, horizontally. \x{21E8}" + text run at (0,23) width 312: "roughly in the middle, horizontally. \x{21E8}" RenderImage {IMG} at (392,0) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png index 8c43606ba518..546f80c8a606 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt index fdb41d0a4258..d00b1f04db73 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x42 - RenderBlock {HTML} at (0,0) size 800x42 - RenderBody {BODY} at (8,8) size 784x17 - RenderBlock {DIV} at (0,0) size 784x17 - RenderBlock {DIV} at (0,0) size 784x17 - RenderBlock (floating) {P} at (392,0) size 392x34 +layer at (0,0) size 800x44 + RenderBlock {HTML} at (0,0) size 800x44 + RenderBody {BODY} at (8,8) size 784x18 + RenderBlock {DIV} at (0,0) size 784x18 + RenderBlock {DIV} at (0,0) size 784x18 + RenderBlock (floating) {P} at (392,0) size 392x36 RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000] - RenderText {#text} at (15,0) size 359x34 + RenderText {#text} at (15,0) size 359x35 text run at (15,0) width 4: " " text run at (19,0) width 340: "\x{21E6} There should be a green square at the top left of the" - text run at (0,17) width 56: "window." + text run at (0,18) width 56: "window." RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.png index 9c6e209769e3..9cef5945a2f8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.txt index 2ec576711f19..728faa19c4d8 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5525-fltwrap-00-b-expected.txt @@ -1,28 +1,28 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x281 - RenderBlock {HTML} at (0,0) size 800x281 - RenderBody {BODY} at (8,8) size 784x265 - RenderBlock (floating) {DIV} at (0,0) size 196x265 [color=#FFFFFF] [bgcolor=#000080] - RenderBlock {P} at (0,0) size 196x265 - RenderText {#text} at (0,0) size 185x265 - text run at (0,0) width 137: "\x{21E6} This" - text run at (0,53) width 166: "blue box" - text run at (0,106) width 185: "should be" - text run at (0,159) width 118: "on the" - text run at (0,212) width 75: "left." - RenderBlock (floating) {DIV} at (588,0) size 196x265 [color=#FFFFFF] [bgcolor=#008080] - RenderBlock {P} at (0,0) size 196x265 - RenderText {#text} at (0,0) size 185x265 - text run at (0,0) width 165: "This teal" - text run at (0,53) width 72: "box" - text run at (0,106) width 185: "should be" - text run at (0,159) width 118: "on the" - text run at (0,212) width 154: "right. \x{21E8}" - RenderBlock {P} at (0,0) size 784x265 - RenderText {#text} at (196,0) size 365x265 - text run at (196,0) width 365: "This text should be" - text run at (196,53) width 335: "in between a blue" - text run at (196,106) width 317: "box on the \x{21E6}left" - text run at (196,159) width 326: "and a teal box on" - text run at (196,212) width 212: "the right\x{21E8}." +layer at (0,0) size 800x291 + RenderBlock {HTML} at (0,0) size 800x291 + RenderBody {BODY} at (8,8) size 784x275 + RenderBlock (floating) {DIV} at (0,0) size 196x275 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock {P} at (0,0) size 196x275 + RenderText {#text} at (0,1) size 185x273 + text run at (0,1) width 137: "\x{21E6} This" + text run at (0,56) width 166: "blue box" + text run at (0,111) width 185: "should be" + text run at (0,166) width 118: "on the" + text run at (0,221) width 75: "left." + RenderBlock (floating) {DIV} at (588,0) size 196x275 [color=#FFFFFF] [bgcolor=#008080] + RenderBlock {P} at (0,0) size 196x275 + RenderText {#text} at (0,1) size 185x273 + text run at (0,1) width 165: "This teal" + text run at (0,56) width 72: "box" + text run at (0,111) width 185: "should be" + text run at (0,166) width 118: "on the" + text run at (0,221) width 154: "right. \x{21E8}" + RenderBlock {P} at (0,0) size 784x275 + RenderText {#text} at (196,1) size 365x273 + text run at (196,1) width 365: "This text should be" + text run at (196,56) width 335: "in between a blue" + text run at (196,111) width 317: "box on the \x{21E6}left" + text run at (196,166) width 326: "and a teal box on" + text run at (196,221) width 212: "the right\x{21E8}." diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png index 4b648ae8f518..1b25ebdfcb3f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt index af5282ce6b04..4671e48bb7be 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 785x708 +layer at (0,0) size 785x709 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x708 - RenderBlock {HTML} at (0,0) size 785x708 - RenderBody {BODY} at (8,16) size 769x684 - RenderBlock {P} at (0,0) size 769x17 +layer at (0,0) size 785x709 + RenderBlock {HTML} at (0,0) size 785x709 + RenderBody {BODY} at (8,16) size 769x685 + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 251x17 text run at (0,0) width 251: "There should be a big green box below." - RenderBlock {DIV} at (0,33) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 50x50 RenderBlock {P} at (3,18) size 300x90 RenderText {#text} at (50,0) size 290x90 diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.png b/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.png index 9cc96523f9f9..b6c6502a9ab4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.txt index e63720782958..15419f4d89f5 100644 --- a/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t0905-c5526-flthw-00-c-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x257 - RenderBlock {HTML} at (0,0) size 800x257 - RenderBody {BODY} at (8,16) size 784x233 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x258 + RenderBlock {HTML} at (0,0) size 800x258 + RenderBody {BODY} at (8,16) size 784x234 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 507x17 text run at (0,0) width 507: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below." - RenderBlock {DIV} at (0,33) size 784x200 + RenderBlock {DIV} at (0,34) size 784x200 RenderBlock (floating) {DIV} at (0,0) size 100x100 RenderBlock (floating) {DIV} at (0,100) size 100x100 RenderBlock {DIV} at (100,0) size 684x200 diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.png index 304a41c1b3a0..7133d3197ec5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.txt index 909827ffeda7..68f0063d500f 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-00-d-expected.txt @@ -1,30 +1,30 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x166 - RenderBlock {HTML} at (0,0) size 800x166 - RenderBody {BODY} at (8,16) size 784x134 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x172 + RenderBlock {HTML} at (0,0) size 800x172 + RenderBody {BODY} at (8,16) size 784x140 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 589x17 text run at (0,0) width 371: "In the following test, the teal blocks must be just inside the " text run at (371,0) width 218: "top and sides of the blue rectangle." - RenderBlock {DIV} at (0,33) size 784x101 - RenderBlock {DIV} at (16,0) size 752x101 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] - RenderBlock (floating) {P} at (8,8) size 176x84 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)] - RenderText {#text} at (8,8) size 146x68 + RenderBlock {DIV} at (0,34) size 784x106 + RenderBlock {DIV} at (16,0) size 752x106 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] + RenderBlock (floating) {P} at (8,8) size 176x88 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)] + RenderText {#text} at (8,8) size 146x71 text run at (8,8) width 146: "Teal block. Teal block." - text run at (8,25) width 146: "Teal block. Teal block." - text run at (8,42) width 146: "Teal block. Teal block." - text run at (8,59) width 146: "Teal block. Teal block." - RenderBlock (floating) {P} at (568,8) size 176x84 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)] - RenderText {#text} at (8,8) size 146x68 + text run at (8,26) width 146: "Teal block. Teal block." + text run at (8,44) width 146: "Teal block. Teal block." + text run at (8,62) width 146: "Teal block. Teal block." + RenderBlock (floating) {P} at (568,8) size 176x88 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)] + RenderText {#text} at (8,8) size 146x71 text run at (8,8) width 146: "Teal block. Teal block." - text run at (8,25) width 146: "Teal block. Teal block." - text run at (8,42) width 146: "Teal block. Teal block." - text run at (8,59) width 146: "Teal block. Teal block." - RenderText {#text} at (184,8) size 358x85 + text run at (8,26) width 146: "Teal block. Teal block." + text run at (8,44) width 146: "Teal block. Teal block." + text run at (8,62) width 146: "Teal block. Teal block." + RenderText {#text} at (184,8) size 358x89 text run at (184,8) width 327: "Blue rectangle. Blue rectangle. Blue rectangle. Blue" - text run at (184,25) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (184,42) width 99: "Blue rectangle. " - text run at (283,42) width 228: "Blue rectangle. Blue rectangle. Blue" - text run at (184,59) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (184,76) width 194: "Blue rectangle. Blue rectangle." + text run at (184,26) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (184,44) width 99: "Blue rectangle. " + text run at (283,44) width 228: "Blue rectangle. Blue rectangle. Blue" + text run at (184,62) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (184,80) width 194: "Blue rectangle. Blue rectangle." diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.png index 16dd1c8e9c98..dc66a67d70c0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.txt index fa61fd5b0a24..f3ed729d8fbc 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-01-b-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x132 - RenderBlock {HTML} at (0,0) size 800x132 - RenderBody {BODY} at (8,16) size 784x100 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x136 + RenderBlock {HTML} at (0,0) size 800x136 + RenderBody {BODY} at (8,16) size 784x104 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 542x17 text run at (0,0) width 542: "In the following test, the blue blocks should be on the given sides of the teal rectangle." - RenderBlock {DIV} at (0,33) size 784x67 - RenderBlock {DIV} at (16,0) size 752x67 [color=#00FFFF] [bgcolor=#008080] - RenderBlock (floating) {P} at (8,8) size 176x50 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)] - RenderText {#text} at (8,8) size 132x34 + RenderBlock {DIV} at (0,34) size 784x70 + RenderBlock {DIV} at (16,0) size 752x70 [color=#00FFFF] [bgcolor=#008080] + RenderBlock (floating) {P} at (8,8) size 176x52 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)] + RenderText {#text} at (8,8) size 132x35 text run at (8,8) width 115: "\x{21E6} This blue block" - text run at (8,25) width 132: "should be on the left." - RenderBlock (floating) {P} at (568,8) size 176x50 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)] - RenderText {#text} at (8,8) size 141x34 + text run at (8,26) width 132: "should be on the left." + RenderBlock (floating) {P} at (568,8) size 176x52 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)] + RenderText {#text} at (8,8) size 141x35 text run at (8,8) width 115: "\x{21E8} This blue block" - text run at (8,25) width 141: "should be on the right." - RenderText {#text} at (184,8) size 384x51 + text run at (8,26) width 141: "should be on the right." + RenderText {#text} at (184,8) size 384x53 text run at (184,8) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." - text run at (184,25) width 194: "Teal rectangle. Teal rectangle. " - text run at (378,25) width 190: "Teal rectangle. Teal rectangle." - text run at (184,42) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." + text run at (184,26) width 194: "Teal rectangle. Teal rectangle. " + text run at (378,26) width 190: "Teal rectangle. Teal rectangle." + text run at (184,44) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.png index 916700ea80ac..71e8e41c853e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.txt index 543e870d0c74..8e2ad4021d49 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-02-d-g-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x217 - RenderBlock {HTML} at (0,0) size 800x217 - RenderBody {BODY} at (8,16) size 784x117 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x218 + RenderBlock {HTML} at (0,0) size 800x218 + RenderBody {BODY} at (8,16) size 784x122 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 595x17 text run at (0,0) width 377: "In the following test, the teal squares must be just inside the " text run at (377,0) width 218: "top and sides of the blue rectangle." - RenderBlock {DIV} at (0,33) size 784x84 - RenderBlock {DIV} at (16,0) size 752x84 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] + RenderBlock {DIV} at (0,34) size 784x88 + RenderBlock {DIV} at (16,0) size 752x88 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] RenderImage {IMG} at (8,8) size 160x160 [color=#FFFF00] [bgcolor=#FF0000] RenderImage {IMG} at (584,8) size 160x160 [color=#FFFF00] [bgcolor=#FF0000] - RenderText {#text} at (168,8) size 392x68 + RenderText {#text} at (168,8) size 392x71 text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (168,25) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (168,42) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (168,59) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,26) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,44) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,62) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.png index ee62788262e0..01cdaa29caf9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.txt index 5f0c1d2ebb5a..a117fea1e42d 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-03-b-g-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x236 - RenderBlock {HTML} at (0,0) size 800x236 - RenderBody {BODY} at (8,16) size 784x119 - RenderBlock {P} at (0,0) size 784x36 [color=#000080] +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x124 + RenderBlock {P} at (0,0) size 784x38 [color=#000080] RenderText {#text} at (0,2) size 396x17 text run at (0,2) width 246: "In the following test, the purple square " text run at (246,2) width 150: "should be on the left (\x{21E6}" @@ -11,15 +11,15 @@ layer at (0,0) size 800x236 RenderText {#text} at (415,2) size 215x17 text run at (415,2) width 215: "), and the teal square on the right (" RenderImage {IMG} at (630,0) size 19x20 - RenderText {#text} at (649,2) size 738x34 + RenderText {#text} at (649,2) size 738x35 text run at (649,2) width 89: "\x{21E8}) of the blue" - text run at (0,19) width 61: "rectangle." - RenderBlock {DIV} at (0,52) size 784x67 - RenderBlock {DIV} at (16,0) size 752x67 [color=#0000FF] [bgcolor=#000080] + text run at (0,20) width 61: "rectangle." + RenderBlock {DIV} at (0,54) size 784x70 + RenderBlock {DIV} at (16,0) size 752x70 [color=#0000FF] [bgcolor=#000080] RenderImage {IMG} at (8,8) size 160x160 RenderImage {IMG} at (584,8) size 160x160 - RenderText {#text} at (168,8) size 392x51 + RenderText {#text} at (168,8) size 392x53 text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (168,25) width 198: "Blue rectangle. Blue rectangle. " - text run at (366,25) width 194: "Blue rectangle. Blue rectangle." - text run at (168,42) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,26) width 198: "Blue rectangle. Blue rectangle. " + text run at (366,26) width 194: "Blue rectangle. Blue rectangle." + text run at (168,44) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.png index 323ede50e6e5..f3b2c38af898 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.txt index 60ba803aee6e..4be710007575 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-00-d-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x481 - RenderBlock {HTML} at (0,0) size 800x481 - RenderBody {BODY} at (8,16) size 784x449 - RenderBlock {P} at (0,0) size 784x51 [color=#000080] - RenderText {#text} at (0,0) size 778x51 +layer at (0,0) size 800x484 + RenderBlock {HTML} at (0,0) size 800x484 + RenderBody {BODY} at (8,16) size 784x452 + RenderBlock {P} at (0,0) size 784x54 [color=#000080] + RenderText {#text} at (0,0) size 778x53 text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" - text run at (0,17) width 88: "enough room " - text run at (88,17) width 398: "for the big box to fit on the small box's line after the small box, " - text run at (486,17) width 292: "in which case the big box should be level with" - text run at (0,34) width 111: "the bottom of the " - text run at (111,34) width 137: "respective small box)." - RenderBlock {DIV} at (16,67) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)] + text run at (0,18) width 88: "enough room " + text run at (88,18) width 398: "for the big box to fit on the small box's line after the small box, " + text run at (486,18) width 292: "in which case the big box should be level with" + text run at (0,36) width 111: "the bottom of the " + text run at (111,36) width 137: "respective small box)." + RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)] RenderText {#text} at (171,22) size 474x17 text run at (171,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 18x23 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.png index 0af8fea3863f..6eb7c746f5d8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt index c527d1f64883..7622c5640d2d 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x481 - RenderBlock {HTML} at (0,0) size 800x481 - RenderBody {BODY} at (8,16) size 784x449 - RenderBlock {P} at (0,0) size 784x51 [color=#000080] - RenderText {#text} at (0,0) size 769x51 +layer at (0,0) size 800x484 + RenderBlock {HTML} at (0,0) size 800x484 + RenderBody {BODY} at (8,16) size 784x452 + RenderBlock {P} at (0,0) size 784x54 [color=#000080] + RenderText {#text} at (0,0) size 769x53 text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" - text run at (0,17) width 88: "enough room " - text run at (88,17) width 391: "for the big box to fit on the small box's line, in which case the " - text run at (479,17) width 290: "big box should be level with the bottom of the" - text run at (0,34) width 104: "respective small " - text run at (104,34) width 33: "box)." - RenderBlock {DIV} at (16,67) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)] + text run at (0,18) width 88: "enough room " + text run at (88,18) width 391: "for the big box to fit on the small box's line, in which case the " + text run at (479,18) width 290: "big box should be level with the bottom of the" + text run at (0,36) width 104: "respective small " + text run at (104,36) width 33: "box)." + RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)] RenderText {#text} at (133,22) size 474x17 text run at (133,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 19x23 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.png index 7586d3b13505..0a5e62550ae5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.txt index 1c42d3068f19..a78eee85702b 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-02-d-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x541 - RenderBlock {HTML} at (0,0) size 800x541 - RenderBody {BODY} at (8,16) size 784x509 - RenderBlock {P} at (0,0) size 784x51 [color=#000080] - RenderText {#text} at (0,0) size 778x51 +layer at (0,0) size 800x544 + RenderBlock {HTML} at (0,0) size 800x544 + RenderBody {BODY} at (8,16) size 784x512 + RenderBlock {P} at (0,0) size 784x54 [color=#000080] + RenderText {#text} at (0,0) size 778x53 text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" - text run at (0,17) width 88: "enough room " - text run at (88,17) width 398: "for the big box to fit on the small box's line after the small box, " - text run at (486,17) width 292: "in which case the big box should be as high as" - text run at (0,34) width 121: "possible below the " - text run at (121,34) width 70: "small box)." - RenderBlock {DIV} at (16,67) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)] + text run at (0,18) width 88: "enough room " + text run at (88,18) width 398: "for the big box to fit on the small box's line after the small box, " + text run at (486,18) width 292: "in which case the big box should be as high as" + text run at (0,36) width 121: "possible below the " + text run at (121,36) width 70: "small box)." + RenderBlock {DIV} at (16,70) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)] RenderText {#text} at (21,22) size 553x17 text run at (21,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " text run at (495,22) width 79: "dummy text " diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.png index 8753d1f5ffed..0f284a2eea36 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.txt index 8485337a9048..82f179dcbfa4 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c414-flt-ln-03-d-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x461 - RenderBlock {HTML} at (0,0) size 800x461 - RenderBody {BODY} at (8,16) size 784x429 - RenderBlock {P} at (0,0) size 784x51 [color=#000080] - RenderText {#text} at (0,0) size 778x51 +layer at (0,0) size 800x464 + RenderBlock {HTML} at (0,0) size 800x464 + RenderBody {BODY} at (8,16) size 784x432 + RenderBlock {P} at (0,0) size 784x54 [color=#000080] + RenderText {#text} at (0,0) size 778x53 text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" - text run at (0,17) width 88: "enough room " - text run at (88,17) width 398: "for the big box to fit on the small box's line after the small box, " - text run at (486,17) width 292: "in which case the big box should be as high as" - text run at (0,34) width 121: "possible below the " - text run at (121,34) width 70: "small box)." - RenderBlock {DIV} at (16,67) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] + text run at (0,18) width 88: "enough room " + text run at (88,18) width 398: "for the big box to fit on the small box's line after the small box, " + text run at (486,18) width 292: "in which case the big box should be as high as" + text run at (0,36) width 121: "possible below the " + text run at (121,36) width 70: "small box)." + RenderBlock {DIV} at (16,70) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] RenderText {#text} at (171,22) size 316x17 text run at (171,22) width 316: "dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 18x23 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.png index ccb2f7d24e0f..8b51b09c0021 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt index 03df52e358e4..e099b1d11ec3 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt @@ -1,45 +1,45 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x270 - RenderBlock {HTML} at (0,0) size 800x270 - RenderBody {BODY} at (8,16) size 784x238 - RenderBlock {P} at (0,0) size 784x238 [color=#000080] +layer at (0,0) size 800x284 + RenderBlock {HTML} at (0,0) size 800x284 + RenderBody {BODY} at (8,16) size 784x252 + RenderBlock {P} at (0,0) size 784x252 [color=#000080] RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (50,0) size 325x17 text run at (50,0) width 325: "\x{21E6} This text should flow around the box on the left. " - RenderInline {SPAN} at (0,0) size 766x238 [color=#C0C0C0] - RenderText {#text} at (375,0) size 766x238 + RenderInline {SPAN} at (0,0) size 766x251 [color=#C0C0C0] + RenderText {#text} at (375,0) size 766x251 text run at (375,0) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (50,17) width 52: "dummy " - text run at (102,17) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (576,17) width 181: "text dummy text dummy text" - text run at (50,34) width 289: "dummy text dummy text dummy text dummy " - text run at (339,34) width 418: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,51) width 52: "dummy " - text run at (52,51) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,51) width 233: "text dummy text dummy text dummy" - text run at (0,68) width 237: "text dummy text dummy text dummy " - text run at (237,68) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (711,68) width 23: "text" - text run at (0,85) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (447,85) width 312: "text dummy text dummy text dummy text dummy" - text run at (0,102) width 158: "text dummy text dummy " - text run at (158,102) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (632,102) width 102: "text dummy text" - text run at (0,119) width 368: "dummy text dummy text dummy text dummy text dummy " - text run at (368,119) width 391: "text dummy text dummy text dummy text dummy text dummy" - text run at (0,136) width 79: "text dummy " - text run at (79,136) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (553,136) width 181: "text dummy text dummy text" - text run at (0,153) width 289: "dummy text dummy text dummy text dummy " - text run at (289,153) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,170) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (474,170) width 260: "text dummy text dummy text dummy text" - text run at (0,187) width 210: "dummy text dummy text dummy " - text run at (210,187) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (684,187) width 75: "text dummy" - text run at (0,204) width 395: "text dummy text dummy text dummy text dummy text dummy " - text run at (395,204) width 339: "text dummy text dummy text dummy text dummy text" - text run at (0,221) width 131: "dummy text dummy " - text run at (131,221) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (50,18) width 52: "dummy " + text run at (102,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (576,18) width 181: "text dummy text dummy text" + text run at (50,36) width 289: "dummy text dummy text dummy text dummy " + text run at (339,36) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,54) width 52: "dummy " + text run at (52,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,54) width 233: "text dummy text dummy text dummy" + text run at (0,72) width 237: "text dummy text dummy text dummy " + text run at (237,72) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (711,72) width 23: "text" + text run at (0,90) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (447,90) width 312: "text dummy text dummy text dummy text dummy" + text run at (0,108) width 158: "text dummy text dummy " + text run at (158,108) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (632,108) width 102: "text dummy text" + text run at (0,126) width 368: "dummy text dummy text dummy text dummy text dummy " + text run at (368,126) width 391: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,144) width 79: "text dummy " + text run at (79,144) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (553,144) width 181: "text dummy text dummy text" + text run at (0,162) width 289: "dummy text dummy text dummy text dummy " + text run at (289,162) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,180) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (474,180) width 260: "text dummy text dummy text dummy text" + text run at (0,198) width 210: "dummy text dummy text dummy " + text run at (210,198) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (684,198) width 75: "text dummy" + text run at (0,216) width 395: "text dummy text dummy text dummy text dummy text dummy " + text run at (395,216) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,234) width 131: "dummy text dummy " + text run at (131,234) width 418: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.png index 25008f97661e..75d561c6bb5b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt index 207b24446599..a124221524f1 100644 --- a/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt @@ -1,45 +1,45 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x270 - RenderBlock {HTML} at (0,0) size 800x270 - RenderBody {BODY} at (8,16) size 784x238 - RenderBlock {P} at (0,0) size 784x238 [color=#000080] +layer at (0,0) size 800x284 + RenderBlock {HTML} at (0,0) size 800x284 + RenderBody {BODY} at (8,16) size 784x252 + RenderBlock {P} at (0,0) size 784x252 [color=#000080] RenderImage {IMG} at (734,0) size 50x50 RenderText {#text} at (0,0) size 334x17 text run at (0,0) width 334: "This text should flow around the box on the right. \x{21E8} " - RenderInline {SPAN} at (0,0) size 759x238 [color=#C0C0C0] - RenderText {#text} at (334,0) size 759x238 + RenderInline {SPAN} at (0,0) size 759x251 [color=#C0C0C0] + RenderText {#text} at (334,0) size 759x251 text run at (334,0) width 391: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,17) width 52: "dummy " - text run at (52,17) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,17) width 181: "text dummy text dummy text" - text run at (0,34) width 289: "dummy text dummy text dummy text dummy " - text run at (289,34) width 418: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,51) width 52: "dummy " - text run at (52,51) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (526,51) width 233: "text dummy text dummy text dummy" - text run at (0,68) width 237: "text dummy text dummy text dummy " - text run at (237,68) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (711,68) width 23: "text" - text run at (0,85) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (447,85) width 312: "text dummy text dummy text dummy text dummy" - text run at (0,102) width 158: "text dummy text dummy " - text run at (158,102) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (632,102) width 102: "text dummy text" - text run at (0,119) width 368: "dummy text dummy text dummy text dummy text dummy " - text run at (368,119) width 391: "text dummy text dummy text dummy text dummy text dummy" - text run at (0,136) width 79: "text dummy " - text run at (79,136) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (553,136) width 181: "text dummy text dummy text" - text run at (0,153) width 289: "dummy text dummy text dummy text dummy " - text run at (289,153) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,170) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (474,170) width 260: "text dummy text dummy text dummy text" - text run at (0,187) width 210: "dummy text dummy text dummy " - text run at (210,187) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (684,187) width 75: "text dummy" - text run at (0,204) width 395: "text dummy text dummy text dummy text dummy text dummy " - text run at (395,204) width 339: "text dummy text dummy text dummy text dummy text" - text run at (0,221) width 131: "dummy text dummy " - text run at (131,221) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,18) width 52: "dummy " + text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,18) width 181: "text dummy text dummy text" + text run at (0,36) width 289: "dummy text dummy text dummy text dummy " + text run at (289,36) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,54) width 52: "dummy " + text run at (52,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,54) width 233: "text dummy text dummy text dummy" + text run at (0,72) width 237: "text dummy text dummy text dummy " + text run at (237,72) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (711,72) width 23: "text" + text run at (0,90) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (447,90) width 312: "text dummy text dummy text dummy text dummy" + text run at (0,108) width 158: "text dummy text dummy " + text run at (158,108) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (632,108) width 102: "text dummy text" + text run at (0,126) width 368: "dummy text dummy text dummy text dummy text dummy " + text run at (368,126) width 391: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,144) width 79: "text dummy " + text run at (79,144) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (553,144) width 181: "text dummy text dummy text" + text run at (0,162) width 289: "dummy text dummy text dummy text dummy " + text run at (289,162) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,180) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (474,180) width 260: "text dummy text dummy text dummy text" + text run at (0,198) width 210: "dummy text dummy text dummy " + text run at (210,198) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (684,198) width 75: "text dummy" + text run at (0,216) width 395: "text dummy text dummy text dummy text dummy text dummy " + text run at (395,216) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,234) width 131: "dummy text dummy " + text run at (131,234) width 418: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.png index a7e18d864b3a..03374e8f4d30 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.txt index 52689059a77d..496b47903e69 100644 --- a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-00-b-g-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x151 - RenderBlock {HTML} at (0,0) size 800x151 - RenderBody {BODY} at (8,16) size 784x127 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x153 + RenderBlock {HTML} at (0,0) size 800x153 + RenderBody {BODY} at (8,16) size 784x129 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 403x17 text run at (0,0) width 403: "The square below should be exactly 50 pixels wide on the ruler." - RenderBlock {DIV} at (0,33) size 784x94 + RenderBlock {DIV} at (0,34) size 784x95 RenderImage {IMG} at (0,0) size 50x50 diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.png index abdca1d06d4d..74014f92b57f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.txt index 580e519709f2..2ecb6abbc872 100644 --- a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-01-b-g-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x492 - RenderBlock {HTML} at (0,0) size 800x492 - RenderBody {BODY} at (8,16) size 784x468 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x494 + RenderBlock {HTML} at (0,0) size 800x494 + RenderBody {BODY} at (8,16) size 784x470 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 461x17 text run at (0,0) width 461: "The square below should be exactly 50% wide on the ruler at the bottom." - RenderBlock {DIV} at (0,33) size 784x395 + RenderBlock {DIV} at (0,34) size 784x396 RenderImage {IMG} at (0,0) size 392x392 diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png index 149979916bbf..5f12ee66a3e3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.txt index edf3522bdd84..98df7ce26764 100644 --- a/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1002-c5523-width-02-b-g-expected.txt @@ -1,61 +1,64 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x573 - RenderBlock {HTML} at (0,0) size 800x573 - RenderBody {BODY} at (8,16) size 784x549 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 785x602 + RenderView at (0,0) size 785x600 +layer at (0,0) size 785x602 + RenderBlock {HTML} at (0,0) size 785x602 + RenderBody {BODY} at (8,16) size 769x578 + RenderBlock {P} at (0,0) size 769x18 RenderText {#text} at (0,0) size 417x17 text run at (0,0) width 374: "The blue text should not go past the 50% mark on the ruler " text run at (374,0) width 43: "below." - RenderBlock {DIV} at (0,33) size 392x476 [color=#0000FF] - RenderText {#text} at (0,0) size 388x476 - text run at (0,0) width 388: "a bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,17) width 377: "bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,34) width 37: "bit of " - text run at (37,34) width 340: "dummy text a bit of dummy text a bit of dummy text a" - text run at (0,51) width 89: "bit of dummy " - text run at (89,51) width 288: "text a bit of dummy text a bit of dummy text a" - text run at (0,68) width 127: "bit of dummy text a " - text run at (127,68) width 250: "bit of dummy text a bit of dummy text a" - text run at (0,85) width 164: "bit of dummy text a bit of " - text run at (164,85) width 213: "dummy text a bit of dummy text a" - text run at (0,102) width 216: "bit of dummy text a bit of dummy " - text run at (216,102) width 161: "text a bit of dummy text a" - text run at (0,119) width 254: "bit of dummy text a bit of dummy text a " - text run at (254,119) width 123: "bit of dummy text a" - text run at (0,136) width 291: "bit of dummy text a bit of dummy text a bit of " - text run at (291,136) width 86: "dummy text a" - text run at (0,153) width 343: "bit of dummy text a bit of dummy text a bit of dummy " - text run at (343,153) width 34: "text a" - text run at (0,170) width 377: "bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,187) width 377: "bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,204) width 37: "bit of " - text run at (37,204) width 340: "dummy text a bit of dummy text a bit of dummy text a" - text run at (0,221) width 89: "bit of dummy " - text run at (89,221) width 288: "text a bit of dummy text a bit of dummy text a" - text run at (0,238) width 127: "bit of dummy text a " - text run at (127,238) width 250: "bit of dummy text a bit of dummy text a" - text run at (0,255) width 164: "bit of dummy text a bit of " - text run at (164,255) width 213: "dummy text a bit of dummy text a" - text run at (0,272) width 216: "bit of dummy text a bit of dummy " - text run at (216,272) width 161: "text a bit of dummy text a" - text run at (0,289) width 254: "bit of dummy text a bit of dummy text a " - text run at (254,289) width 123: "bit of dummy text a" - text run at (0,306) width 291: "bit of dummy text a bit of dummy text a bit of " - text run at (291,306) width 86: "dummy text a" - text run at (0,323) width 343: "bit of dummy text a bit of dummy text a bit of dummy " - text run at (343,323) width 34: "text a" - text run at (0,340) width 377: "bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,357) width 377: "bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,374) width 37: "bit of " - text run at (37,374) width 340: "dummy text a bit of dummy text a bit of dummy text a" - text run at (0,391) width 89: "bit of dummy " - text run at (89,391) width 288: "text a bit of dummy text a bit of dummy text a" - text run at (0,408) width 127: "bit of dummy text a " - text run at (127,408) width 250: "bit of dummy text a bit of dummy text a" - text run at (0,425) width 164: "bit of dummy text a bit of " - text run at (164,425) width 213: "dummy text a bit of dummy text a" - text run at (0,442) width 216: "bit of dummy text a bit of dummy " - text run at (216,442) width 161: "text a bit of dummy text a" - text run at (0,459) width 216: "bit of dummy text a bit of dummy " - text run at (216,459) width 23: "text" + RenderBlock {DIV} at (0,34) size 385x504 [color=#0000FF] + RenderText {#text} at (0,0) size 377x503 + text run at (0,0) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,18) width 11: "a " + text run at (11,18) width 366: "bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,36) width 48: "a bit of " + text run at (48,36) width 329: "dummy text a bit of dummy text a bit of dummy text" + text run at (0,54) width 100: "a bit of dummy " + text run at (100,54) width 277: "text a bit of dummy text a bit of dummy text" + text run at (0,72) width 138: "a bit of dummy text a " + text run at (138,72) width 239: "bit of dummy text a bit of dummy text" + text run at (0,90) width 175: "a bit of dummy text a bit of " + text run at (175,90) width 202: "dummy text a bit of dummy text" + text run at (0,108) width 227: "a bit of dummy text a bit of dummy " + text run at (227,108) width 150: "text a bit of dummy text" + text run at (0,126) width 265: "a bit of dummy text a bit of dummy text a " + text run at (265,126) width 112: "bit of dummy text" + text run at (0,144) width 302: "a bit of dummy text a bit of dummy text a bit of " + text run at (302,144) width 75: "dummy text" + text run at (0,162) width 354: "a bit of dummy text a bit of dummy text a bit of dummy " + text run at (354,162) width 23: "text" + text run at (0,180) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,198) width 11: "a " + text run at (11,198) width 366: "bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,216) width 48: "a bit of " + text run at (48,216) width 329: "dummy text a bit of dummy text a bit of dummy text" + text run at (0,234) width 100: "a bit of dummy " + text run at (100,234) width 277: "text a bit of dummy text a bit of dummy text" + text run at (0,252) width 138: "a bit of dummy text a " + text run at (138,252) width 239: "bit of dummy text a bit of dummy text" + text run at (0,270) width 175: "a bit of dummy text a bit of " + text run at (175,270) width 202: "dummy text a bit of dummy text" + text run at (0,288) width 227: "a bit of dummy text a bit of dummy " + text run at (227,288) width 150: "text a bit of dummy text" + text run at (0,306) width 265: "a bit of dummy text a bit of dummy text a " + text run at (265,306) width 112: "bit of dummy text" + text run at (0,324) width 302: "a bit of dummy text a bit of dummy text a bit of " + text run at (302,324) width 75: "dummy text" + text run at (0,342) width 354: "a bit of dummy text a bit of dummy text a bit of dummy " + text run at (354,342) width 23: "text" + text run at (0,360) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,378) width 11: "a " + text run at (11,378) width 366: "bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,396) width 48: "a bit of " + text run at (48,396) width 329: "dummy text a bit of dummy text a bit of dummy text" + text run at (0,414) width 100: "a bit of dummy " + text run at (100,414) width 277: "text a bit of dummy text a bit of dummy text" + text run at (0,432) width 138: "a bit of dummy text a " + text run at (138,432) width 239: "bit of dummy text a bit of dummy text" + text run at (0,450) width 175: "a bit of dummy text a bit of " + text run at (175,450) width 202: "dummy text a bit of dummy text" + text run at (0,468) width 227: "a bit of dummy text a bit of dummy " + text run at (227,468) width 150: "text a bit of dummy text" + text run at (0,486) width 227: "a bit of dummy text a bit of dummy " + text run at (227,486) width 23: "text" diff --git a/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.png index 27115643583f..bca90fb10c47 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.txt index bdb22fdf4e70..e549e7ebb770 100644 --- a/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100303-c412-blockw-00-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x309 - RenderBlock {HTML} at (0,0) size 800x309 - RenderBody {BODY} at (8,16) size 784x283 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x310 + RenderBlock {HTML} at (0,0) size 800x310 + RenderBody {BODY} at (8,16) size 784x284 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 341x17 text run at (0,0) width 341: "There should be no red below, just two green squares." - RenderBlock {DIV} at (10,33) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)] + RenderBlock {DIV} at (10,34) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderBlock {P} at (20,10) size 90x10 RenderText {#text} at (0,0) size 10x10 text run at (0,0) width 10: "X" @@ -38,7 +38,7 @@ layer at (0,0) size 800x309 RenderBlock {P} at (10,100) size 100x10 RenderText {#text} at (0,0) size 10x10 text run at (0,0) width 10: "X" - RenderBlock {DIV} at (10,163) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)] + RenderBlock {DIV} at (10,164) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderBlock {P} at (20,10) size 90x10 [bgcolor=#008000] RenderText {#text} at (0,0) size 10x10 text run at (0,0) width 10: "X" diff --git a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png index 8be511ddb017..9fa49c6152a7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt index d89cfee7b398..b46968d6f918 100644 --- a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x457 - RenderBlock {HTML} at (0,0) size 800x457 - RenderBody {BODY} at (8,16) size 784x425 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x458 + RenderBlock {HTML} at (0,0) size 800x458 + RenderBody {BODY} at (8,16) size 784x426 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 616x17 text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the " text run at (396,0) width 220: "width of the window and centered." - RenderBlock {P} at (0,33) size 784x392 [color=#000080] + RenderBlock {P} at (0,34) size 784x392 [color=#000080] RenderImage {IMG} at (196,0) size 392x392 diff --git a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png index c66b1bc0ed23..b2e3db23ebfd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt index 077db5d2edc8..38525a41c351 100644 --- a/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x474 - RenderBlock {HTML} at (0,0) size 800x474 - RenderBody {BODY} at (8,16) size 784x442 - RenderBlock {P} at (0,0) size 784x34 [color=#000080] - RenderText {#text} at (0,0) size 769x34 +layer at (0,0) size 800x476 + RenderBlock {HTML} at (0,0) size 800x476 + RenderBody {BODY} at (8,16) size 784x444 + RenderBlock {P} at (0,0) size 784x36 [color=#000080] + RenderText {#text} at (0,0) size 769x35 text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the " text run at (396,0) width 373: "width of the window, aligned flush with the right hand side" - text run at (0,17) width 27: "(\x{21E8})." - RenderBlock {P} at (0,50) size 784x392 [color=#000080] + text run at (0,18) width 27: "(\x{21E8})." + RenderBlock {P} at (0,52) size 784x392 [color=#000080] RenderImage {IMG} at (392,0) size 392x392 diff --git a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png index fad19ed02c02..fe3159eefaa4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt index 918825557789..a148d3109f7b 100644 --- a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x315 - RenderBlock {HTML} at (0,0) size 800x315 - RenderBody {BODY} at (8,16) size 784x283 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,16) size 784x286 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "There should be no red anywhere." - RenderBlock {P} at (0,33) size 784x17 [color=#000080] + RenderBlock {P} at (0,34) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 327x17 text run at (0,0) width 327: "There should be two identical squares after this line:" - RenderBlock {DIV} at (16,66) size 752x35 + RenderBlock {DIV} at (16,68) size 752x35 RenderImage {IMG} at (0,0) size 15x15 RenderBlock {SPAN} at (0,20) size 15x15 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "X" - RenderBlock {P} at (0,117) size 784x17 [color=#000080] + RenderBlock {P} at (0,119) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 327x17 text run at (0,0) width 327: "There should be two identical squares after this line:" - RenderBlock {DIV} at (16,150) size 752x133 + RenderBlock {DIV} at (16,153) size 752x133 RenderImage {IMG} at (0,0) size 64x64 RenderBlock {SPAN} at (0,69) size 64x64 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 64x64 diff --git a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png index 0a48675c6ab5..6b7584283fbd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt index 6886d1bb5c12..d34204e2fd86 100644 --- a/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x166 - RenderBlock {HTML} at (0,0) size 800x166 - RenderBody {BODY} at (8,16) size 784x134 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x169 + RenderBlock {HTML} at (0,0) size 800x169 + RenderBody {BODY} at (8,16) size 784x137 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "There should be no red anywhere." - RenderBlock {P} at (0,33) size 784x18 [color=#000080] + RenderBlock {P} at (0,34) size 784x19 [color=#000080] RenderText {#text} at (0,1) size 381x17 text run at (0,1) width 381: "There should be two identical squares at the end of this line: " RenderImage {IMG} at (381,0) size 15x15 @@ -16,7 +16,7 @@ layer at (0,0) size 800x166 RenderText {#text} at (400,0) size 15x15 text run at (400,0) width 15: "X" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,67) size 784x67 [color=#000080] + RenderBlock {P} at (0,69) size 784x68 [color=#000080] RenderText {#text} at (0,50) size 381x17 text run at (0,50) width 381: "There should be two identical squares at the end of this line: " RenderImage {IMG} at (381,0) size 64x64 diff --git a/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.png index 708f41fb9b47..b0aee2aefaba 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.txt index 2b839f99402f..0ac652e3b871 100644 --- a/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1004-c5524-width-00-b-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x557 - RenderBlock {HTML} at (0,0) size 800x557 - RenderBody {BODY} at (8,16) size 784x533 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 770x34 +layer at (0,0) size 800x560 + RenderBlock {HTML} at (0,0) size 800x560 + RenderBody {BODY} at (8,16) size 784x536 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 770x35 text run at (0,0) width 395: "The blue rectangle below should be exactly 200 pixels by 120 " text run at (395,0) width 375: "pixels on the ruler (and the aqua bars should stick out of the" - text run at (0,17) width 193: "blue box, with no red present)." - RenderBlock {DIV} at (0,50) size 784x483 + text run at (0,18) width 193: "blue box, with no red present)." + RenderBlock {DIV} at (0,52) size 784x484 RenderImage {IMG} at (40,40) size 120x200 diff --git a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.png index f1de36842779..c65cade42ee1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.txt index 07c7f164ff81..3648b6b59677 100644 --- a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-00-b-g-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x211 - RenderBlock {HTML} at (0,0) size 800x211 - RenderBody {BODY} at (8,16) size 784x187 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x213 + RenderBlock {HTML} at (0,0) size 800x213 + RenderBody {BODY} at (8,16) size 784x189 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 400x17 text run at (0,0) width 400: "The square below should be exactly 50 pixels high on the ruler." - RenderBlock {DIV} at (0,33) size 784x154 + RenderBlock {DIV} at (0,34) size 784x155 RenderImage {IMG} at (45,0) size 50x50 diff --git a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.png index c95759cd1a10..949251697188 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.txt index 7d504f3944c0..2788ceceade9 100644 --- a/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1005-c5524-width-01-b-g-expected.txt @@ -1,10 +1,10 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x261 - RenderBlock {HTML} at (0,0) size 800x261 - RenderBody {BODY} at (8,16) size 784x237 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x263 + RenderBlock {HTML} at (0,0) size 800x263 + RenderBody {BODY} at (8,16) size 784x239 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 408x17 text run at (0,0) width 408: "The square below should be exactly 100 pixels high on the ruler." - RenderBlock {DIV} at (0,33) size 784x204 + RenderBlock {DIV} at (0,34) size 784x205 RenderImage {IMG} at (45,0) size 100x100 diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.png index 7e6933d43aab..ad392b7ca1e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt index 8770e24bb13f..d7a95cb1273d 100644 --- a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x217 - RenderBlock {HTML} at (0,0) size 800x217 - RenderBody {BODY} at (8,16) size 784x193 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x218 + RenderBlock {HTML} at (0,0) size 800x218 + RenderBody {BODY} at (8,16) size 784x194 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 439x17 text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box." - RenderBlock {DIV} at (0,33) size 230x160 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)] + RenderBlock {DIV} at (0,34) size 230x160 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderText {#text} at (20,20) size 190x30 text run at (20,20) width 190: "xxxx xxxx xxxx xxxx" text run at (20,40) width 190: "xxxx xxxx xxxx xxxx" diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.png index 85e85460668c..ad5b45a95f75 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt index c020b3e409d8..fa8cfe463b79 100644 --- a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x297 - RenderBlock {HTML} at (0,0) size 800x297 - RenderBody {BODY} at (8,16) size 784x273 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x298 + RenderBlock {HTML} at (0,0) size 800x298 + RenderBody {BODY} at (8,16) size 784x274 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 439x17 text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box." - RenderBlock {DIV} at (0,33) size 430x240 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)] + RenderBlock {DIV} at (0,34) size 430x240 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderText {#text} at (20,20) size 390x105 text run at (20,20) width 390: "xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx" text run at (20,115) width 50: "xxxx " diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.png index 71cc15944db3..4b38665a551f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt index c054cc858d3c..79f9ffe86318 100644 --- a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x321 - RenderBlock {HTML} at (0,0) size 800x321 - RenderBody {BODY} at (8,16) size 784x297 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x322 + RenderBlock {HTML} at (0,0) size 800x322 + RenderBody {BODY} at (8,16) size 784x298 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 439x17 text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box." - RenderBlock {DIV} at (0,33) size 360x264 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)] + RenderBlock {DIV} at (0,34) size 360x264 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)] RenderText {#text} at (40,40) size 280x104 text run at (40,40) width 280: "xxxx xxxx xxxx" text run at (40,80) width 280: "xxxx xxxx xxxx" diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.png index 2ba73dbf0c26..1eb523662442 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt index 7a4994e296dc..31757ba75517 100644 --- a/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x317 - RenderBlock {HTML} at (0,0) size 800x317 - RenderBody {BODY} at (8,16) size 784x293 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,16) size 784x294 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 439x17 text run at (0,0) width 439: "There should be no red below, just the outline of an empty green box." - RenderBlock {DIV} at (0,33) size 360x260 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)] + RenderBlock {DIV} at (0,34) size 360x260 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)] RenderText {#text} at (40,40) size 280x100 text run at (40,40) width 280: "xxxx xxxx xxxx" text run at (40,80) width 280: "xxxx xxxx xxxx" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png index 8d18b3dbd39d..0241d6dec066 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt index b8b38be77bee..3b9c59de7576 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x117 - RenderBlock {HTML} at (0,0) size 800x117 - RenderBody {BODY} at (8,16) size 784x93 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x94 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 358x17 text run at (0,0) width 358: "There should be no red below, only green lines and dots." - RenderBlock {DIV} at (0,33) size 200x60 [color=#008000] + RenderBlock {DIV} at (0,34) size 200x60 [color=#008000] RenderText {#text} at (0,1) size 40x10 text run at (0,1) width 40: "z z " RenderInline {EM} at (0,0) size 190x22 [color=#FF0000] diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.png index 1981c7868f0a..09b92814fcac 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.txt index d319757aa072..c9e38822bd23 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-00-a-ag-expected.txt @@ -1,13 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x253 - RenderBlock {HTML} at (0,0) size 800x253 - RenderBody {BODY} at (8,16) size 784x187 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 755x34 +layer at (0,0) size 800x255 + RenderBlock {HTML} at (0,0) size 800x255 + RenderBody {BODY} at (8,16) size 784x189 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 755x35 text run at (0,0) width 755: "There should be four identical white boxes in the teal block below, all the same size, each one a little lower down on the" - text run at (0,17) width 134: "line, in a step pattern." - RenderBlock {DIV} at (50,84) size 684x103 [color=#FFFFFF] [bgcolor=#008080] + text run at (0,18) width 134: "line, in a step pattern." + RenderBlock {DIV} at (50,86) size 684x103 [color=#FFFFFF] [bgcolor=#008080] RenderInline {SPAN} at (0,0) size 51x51 RenderText {#text} at (12,12) size 51x51 text run at (12,12) width 51: "X" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.png index 26a286e8fce1..5b0fbc08c1b1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.txt index 91d2995305ed..aafbe29095c2 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-01-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x297 - RenderBlock {HTML} at (0,0) size 800x297 - RenderBody {BODY} at (8,16) size 784x273 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x298 + RenderBlock {HTML} at (0,0) size 800x298 + RenderBody {BODY} at (8,16) size 784x274 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 314x17 text run at (0,0) width 314: "There should be a green block with no red below." - RenderBlock {DIV} at (15,33) size 90x240 [color=#008000] [bgcolor=#FF0000] + RenderBlock {DIV} at (15,34) size 90x240 [color=#008000] [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 90x33 RenderImage {IMG} at (0,0) size 30x30 RenderInline {SPAN} at (0,0) size 15x15 diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.png index a0ca72705024..2a783b7c9f56 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.txt index f255c6c0cb29..2c04d6daaf91 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x323 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 727x34 +layer at (0,0) size 800x356 + RenderBlock {HTML} at (0,0) size 800x356 + RenderBody {BODY} at (8,16) size 784x325 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 727x35 text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue " text run at (387,0) width 340: "rectanglues should always have their tops on the same" - text run at (0,17) width 83: "alignment as " - text run at (83,17) width 204: "other blue rectangles on the line." - RenderBlock {P} at (15,50) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + text run at (0,18) width 83: "alignment as " + text run at (83,18) width 204: "other blue rectangles on the line." + RenderBlock {P} at (15,52) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] RenderText {#text} at (8,26) size 61x16 text run at (8,26) width 61: "xxx " RenderImage {IMG} at (68,26) size 31x31 diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.png index 5943fb6b393f..784540228df7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.txt index b14480a97d51..681d445e1f97 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-03-d-agi-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x316 - RenderBlock {HTML} at (0,0) size 800x316 - RenderBody {BODY} at (8,16) size 784x285 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 750x34 +layer at (0,0) size 800x318 + RenderBlock {HTML} at (0,0) size 800x318 + RenderBody {BODY} at (8,16) size 784x287 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 750x35 text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue " text run at (387,0) width 363: "rectanglues should always have their middles on the same" - text run at (0,17) width 83: "alignment as " - text run at (83,17) width 204: "other blue rectangles on the line." - RenderBlock {P} at (15,50) size 754x235 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + text run at (0,18) width 83: "alignment as " + text run at (83,18) width 204: "other blue rectangles on the line." + RenderBlock {P} at (15,52) size 754x235 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] RenderText {#text} at (8,36) size 61x16 text run at (8,36) width 61: "\x{C9}\x{C9}\x{C9} " RenderImage {IMG} at (68,26) size 31x31 diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.png index 8f3d16d19e66..d1f2f2c1a890 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.txt index a52a27816eb0..7d09acccff1c 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x253 - RenderBlock {HTML} at (0,0) size 800x253 - RenderBody {BODY} at (8,16) size 784x222 - RenderBlock {P} at (0,0) size 784x34 - RenderText {#text} at (0,0) size 727x34 +layer at (0,0) size 800x255 + RenderBlock {HTML} at (0,0) size 800x255 + RenderBody {BODY} at (8,16) size 784x224 + RenderBlock {P} at (0,0) size 784x36 + RenderText {#text} at (0,0) size 727x35 text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue " text run at (387,0) width 340: "rectanglues should always have their tops on the same" - text run at (0,17) width 83: "alignment as " - text run at (83,17) width 204: "other blue rectangles on the line." - RenderBlock {P} at (15,50) size 754x172 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + text run at (0,18) width 83: "alignment as " + text run at (83,18) width 204: "other blue rectangles on the line." + RenderBlock {P} at (15,52) size 754x172 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] RenderInline {SPAN} at (0,0) size 46x16 RenderText {#text} at (8,8) size 46x16 text run at (8,8) width 46: "xxx" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.png index db1a3b8c8e89..ee2d91dee1b0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.txt index 8324b9b56412..8c823fdf73c0 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c548-leadin-00-d-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x163 - RenderBlock {HTML} at (0,0) size 800x163 - RenderBody {BODY} at (8,16) size 784x139 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x164 + RenderBlock {HTML} at (0,0) size 800x164 + RenderBody {BODY} at (8,16) size 784x140 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 459x17 text run at (0,0) width 459: "There should be stripes of dark green and light green below, with no red." - RenderBlock {DIV} at (0,33) size 81x106 [color=#00FF00] [bgcolor=#008000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 81x106 [color=#00FF00] [bgcolor=#008000] [border: (3px solid #000000)] RenderInline {SPAN} at (0,0) size 75x75 [bgcolor=#FF0000] RenderText {#text} at (3,15) size 75x75 text run at (3,15) width 75: "xxx" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.png index 57fb9e8b0f74..d7bcbe107bc4 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt index 34d76e1b37d6..8e273d931ee2 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x325 - RenderBlock {HTML} at (0,0) size 800x325 - RenderBody {BODY} at (8,16) size 784x297 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x326 + RenderBlock {HTML} at (0,0) size 800x326 + RenderBody {BODY} at (8,16) size 784x298 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 267x17 text run at (0,0) width 267: "The two blocks below should be identical:" - RenderBlock {DIV} at (12,33) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)] + RenderBlock {DIV} at (12,34) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)] RenderText {#text} at (27,27) size 72x72 text run at (27,27) width 72: "X X" text run at (27,75) width 72: "X X" - RenderBlock {PRE} at (12,171) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)] + RenderBlock {PRE} at (12,172) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)] RenderText {#text} at (3,3) size 120x120 text run at (3,3) width 120: " " text run at (3,27) width 120: " X X " diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png index 7a177de53444..76ded400cdde 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt index 375722ebe915..4b430247a55e 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x345 - RenderBlock {HTML} at (0,0) size 800x345 - RenderBody {BODY} at (8,8) size 784x329 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x346 + RenderBlock {HTML} at (0,0) size 800x346 + RenderBody {BODY} at (8,8) size 784x330 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 504x17 text run at (0,0) width 504: "There should be a big pattern of green and lime dots below, with no red present." - RenderBlock {DIV} at (6,23) size 66x306 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (6,24) size 66x306 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (15,9) size 48x48 RenderText {#text} at (0,6) size 36x36 text run at (0,6) width 36: "X X" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png index d4754faf5c95..33c36902f7d8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt index bf0c224bf695..d5356fadb180 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x313 - RenderBlock {HTML} at (0,0) size 800x313 - RenderBody {BODY} at (8,8) size 784x297 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x314 + RenderBlock {HTML} at (0,0) size 800x314 + RenderBody {BODY} at (8,8) size 784x298 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 504x17 text run at (0,0) width 504: "There should be a big pattern of green and lime dots below, with no red present." - RenderBlock {DIV} at (6,23) size 66x274 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (6,24) size 66x274 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (15,9) size 48x48 RenderText {#text} at (0,6) size 36x36 text run at (0,6) width 36: "X X" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png index 0e5940ce7078..e225394c38a2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt index fabf7f514ff4..2f325ca19bda 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x311 - RenderBlock {HTML} at (0,0) size 800x311 - RenderBody {BODY} at (8,8) size 784x283 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x312 + RenderBlock {HTML} at (0,0) size 800x312 + RenderBody {BODY} at (8,8) size 784x284 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "There should be no red below:" - RenderBlock {DIV} at (20,37) size 86x246 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (20,38) size 86x246 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 80x80 RenderText {#text} at (0,10) size 60x60 text run at (0,10) width 60: "x x" diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png index bf3219d2cbad..8b76b4d835a5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt index caefcec0501d..76eaf28dc254 100644 --- a/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x391 - RenderBlock {HTML} at (0,0) size 800x391 - RenderBody {BODY} at (8,8) size 784x363 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x392 + RenderBlock {HTML} at (0,0) size 800x392 + RenderBody {BODY} at (8,8) size 784x364 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "There should be no red below:" - RenderBlock {DIV} at (20,37) size 86x326 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (20,38) size 86x326 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 80x80 RenderText {#text} at (0,10) size 60x60 text run at (0,10) width 60: "x x" diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.png index 83e8860f2413..837f350aa4f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.txt index 0382472b064b..21eebf4239d6 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-00-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (148,0) size 16x17 text run at (148,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 12: "1 " text run at (12,0) width 12: "2 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.png index dc97a4af974e..2b221b0cd86c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.txt index 90b7ef55926f..f3e7811b3558 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-01-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 7x17 RenderInline (generated) at (0,0) size 7x17 RenderCounter at (0,0) size 0x0 @@ -95,7 +95,7 @@ layer at (0,0) size 800x91 RenderText at (121,0) size 7x17 text run at (121,0) width 7: "z" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 128x17 text run at (0,0) width 11: "z " text run at (11,0) width 11: "z " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.png index d600be1cffcd..4ca6f6f8680c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.txt index f271dba4b7f5..d7c071731c00 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-02-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 6x17 RenderInline (generated) at (0,0) size 6x17 RenderCounter at (0,0) size 6x17 @@ -83,7 +83,7 @@ layer at (0,0) size 800x91 RenderCounter at (110,0) size 6x17 text run at (110,0) width 6: "\x{2022}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 116x17 text run at (0,0) width 10: "\x{2022} " text run at (10,0) width 10: "\x{2022} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.png index b7699d1a7b29..ce607d533030 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.txt index aa827c49b09e..1d1817bb54f6 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-03-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 6x17 RenderInline (generated) at (0,0) size 6x17 RenderCounter at (0,0) size 6x17 @@ -83,7 +83,7 @@ layer at (0,0) size 800x91 RenderCounter at (110,0) size 6x17 text run at (110,0) width 6: "\x{25E6}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 116x17 text run at (0,0) width 10: "\x{25E6} " text run at (10,0) width 10: "\x{25E6} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.png index 54c09bf40cd6..cf13be572c62 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.txt index 5eb9b78f70ab..3f090486dfbd 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-04-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 10x17 RenderInline (generated) at (0,0) size 10x17 RenderCounter at (0,0) size 10x17 @@ -83,7 +83,7 @@ layer at (0,0) size 800x91 RenderCounter at (154,0) size 10x17 text run at (154,0) width 10: "\x{25A0}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 188x17 text run at (0,0) width 16: "\x{25FE} " text run at (16,0) width 16: "\x{25FE} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.png index 83e8860f2413..837f350aa4f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.txt index 0382472b064b..21eebf4239d6 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-05-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (148,0) size 16x17 text run at (148,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 12: "1 " text run at (12,0) width 12: "2 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.png index fd684b6a9601..be88b350608a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.txt index 9f284dd45c55..81879f93a541 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-06-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 16x17 RenderInline (generated) at (0,0) size 16x17 RenderCounter at (0,0) size 16x17 @@ -96,7 +96,7 @@ layer at (0,0) size 800x91 RenderCounter at (288,0) size 24x17 text run at (288,0) width 24: "101" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 312x17 text run at (0,0) width 20: "01 " text run at (20,0) width 20: "02 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.png index 3a93a56496fc..bdcf123661e7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.txt index 55a929505daa..044967da2987 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-07-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 4x17 RenderInline (generated) at (0,0) size 4x17 RenderCounter at (0,0) size 4x17 @@ -120,7 +120,7 @@ layer at (0,0) size 800x91 RenderCounter at (494,0) size 70x17 text run at (494,0) width 70: "mmmcdxci" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 564x17 text run at (0,0) width 8: "i " text run at (8,0) width 12: "ii " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.png index 6928abbbde42..69217ba28d9d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.txt index c4949426efcd..2ad851b75b52 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-08-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 5x17 RenderInline (generated) at (0,0) size 5x17 RenderCounter at (0,0) size 5x17 @@ -120,7 +120,7 @@ layer at (0,0) size 800x91 RenderCounter at (682,0) size 93x17 text run at (682,0) width 93: "MMMCDXCI" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 775x17 text run at (0,0) width 9: "I " text run at (9,0) width 14: "II " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.png index 196877f083ca..5b7453f0dbda 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.txt index 03403513ff99..7e44186f9b8f 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-09-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -246,7 +246,7 @@ layer at (0,0) size 800x91 RenderCounter at (530,0) size 46x17 text run at (530,0) width 46: "\x{10F5}\x{10F0}\x{10E8}\x{10DF}\x{10D7}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 576x17 text run at (0,0) width 12: "\x{10D0} " text run at (12,0) width 12: "\x{10D1} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.png index c01df4e2fee3..bb49eb294b51 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.txt index 9872a36a14f1..6f53a89ce910 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-11-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 7x17 RenderInline (generated) at (0,0) size 7x17 RenderCounter at (0,0) size 7x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (118,0) size 4x17 text run at (118,0) width 4: "l" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 122x17 text run at (0,0) width 11: "a " text run at (11,0) width 12: "b " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.png index c01df4e2fee3..bb49eb294b51 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.txt index 9872a36a14f1..6f53a89ce910 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-12-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 7x17 RenderInline (generated) at (0,0) size 7x17 RenderCounter at (0,0) size 7x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (118,0) size 4x17 text run at (118,0) width 4: "l" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 122x17 text run at (0,0) width 11: "a " text run at (11,0) width 12: "b " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.png index d1e1d7d0ff5a..ae605dea7c41 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.txt index e28384cb951c..e0b70e0ea238 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-13-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 12x17 RenderInline (generated) at (0,0) size 12x17 RenderCounter at (0,0) size 12x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (156,0) size 10x17 text run at (156,0) width 10: "L" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 166x17 text run at (0,0) width 16: "A " text run at (16,0) width 15: "B " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.png index d1e1d7d0ff5a..ae605dea7c41 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.txt index e28384cb951c..e0b70e0ea238 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-14-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 12x17 RenderInline (generated) at (0,0) size 12x17 RenderCounter at (0,0) size 12x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (156,0) size 10x17 text run at (156,0) width 10: "L" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 166x17 text run at (0,0) width 16: "A " text run at (16,0) width 15: "B " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.png index 92ed3513ecf9..4aaeca87f481 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.txt index f225a8849909..97e577330e71 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-15-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (125,0) size 9x17 text run at (125,0) width 9: "\x{3BC}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 134x17 text run at (0,0) width 12: "\x{3B1} " text run at (12,0) width 12: "\x{3B2} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.png index 83e8860f2413..837f350aa4f9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.txt index 0382472b064b..21eebf4239d6 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counter-16-f-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (148,0) size 16x17 text run at (148,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 164x17 text run at (0,0) width 12: "1 " text run at (12,0) width 12: "2 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.png index fca592869ce3..37c3ba477864 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.txt index 7ab6672a2c2d..19c7394057e4 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-00-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 20x17 RenderInline (generated) at (0,0) size 20x17 RenderCounter at (0,0) size 20x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (280,0) size 28x17 text run at (280,0) width 28: "1.12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 308x17 text run at (0,0) width 24: "1.1 " text run at (24,0) width 24: "1.2 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.png index 41c951057db5..153dd1549c19 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.txt index 01da58c43508..307ae8000d75 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-01-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 11x17 RenderInline (generated) at (0,0) size 11x17 RenderCounter at (0,0) size 4x17 @@ -107,7 +107,7 @@ layer at (0,0) size 800x91 RenderText at (169,0) size 7x17 text run at (169,0) width 7: "z" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 176x17 text run at (0,0) width 15: ".z " text run at (15,0) width 15: ".z " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.png index a2dd80c47408..569efe971349 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.txt index d77151806af8..148d350779e7 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-02-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 16x17 RenderInline (generated) at (0,0) size 16x17 RenderCounter at (0,0) size 16x17 @@ -83,7 +83,7 @@ layer at (0,0) size 800x91 RenderCounter at (220,0) size 16x17 text run at (220,0) width 16: "\x{2022}.\x{2022}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 236x17 text run at (0,0) width 20: "\x{2022}.\x{2022} " text run at (20,0) width 20: "\x{2022}.\x{2022} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.png index 04773d9203e5..030201d3c15e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.txt index b1bcff8980df..870d9e33a480 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-03-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 16x17 RenderInline (generated) at (0,0) size 16x17 RenderCounter at (0,0) size 16x17 @@ -83,7 +83,7 @@ layer at (0,0) size 800x91 RenderCounter at (220,0) size 16x17 text run at (220,0) width 16: "\x{25E6}.\x{25E6}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 236x17 text run at (0,0) width 20: "\x{25E6}.\x{25E6} " text run at (20,0) width 20: "\x{25E6}.\x{25E6} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.png index 4495918b0689..054b6fd0b87f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.txt index 1d4cdea49a5d..f3ce92f34f15 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-04-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 233x17 text run at (0,0) width 233: "The following two lines should look " RenderInline {EM} at (0,0) size 91x17 @@ -11,7 +11,7 @@ layer at (0,0) size 800x91 text run at (233,0) width 91: "approximately" RenderText {#text} at (324,0) size 63x17 text run at (324,0) width 63: " the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 24x17 RenderInline (generated) at (0,0) size 24x17 RenderCounter at (0,0) size 24x17 @@ -83,7 +83,7 @@ layer at (0,0) size 800x91 RenderCounter at (308,0) size 24x17 text run at (308,0) width 24: "\x{25A0}.\x{25A0}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 32: "\x{25FE}.\x{25FE} " text run at (32,0) width 32: "\x{25FE}.\x{25FE} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.png index fca592869ce3..37c3ba477864 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.txt index 7ab6672a2c2d..19c7394057e4 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-05-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 20x17 RenderInline (generated) at (0,0) size 20x17 RenderCounter at (0,0) size 20x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (280,0) size 28x17 text run at (280,0) width 28: "1.12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 308x17 text run at (0,0) width 24: "1.1 " text run at (24,0) width 24: "1.2 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.png index 3852daf825b1..5bd77deff207 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.txt index b9963640db52..7134e4fb27c0 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-06-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 36x17 RenderInline (generated) at (0,0) size 36x17 RenderCounter at (0,0) size 36x17 @@ -96,7 +96,7 @@ layer at (0,0) size 800x91 RenderCounter at (568,0) size 44x17 text run at (568,0) width 44: "01.101" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 612x17 text run at (0,0) width 40: "01.01 " text run at (40,0) width 40: "01.02 " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.png index cad781532bde..ca6ad77ef9fe 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.txt index 5cef18cbdebc..c2ecd9b22302 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-07-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 12x17 RenderInline (generated) at (0,0) size 12x17 RenderCounter at (0,0) size 12x17 @@ -120,7 +120,7 @@ layer at (0,0) size 800x91 RenderCounter at (638,0) size 78x17 text run at (638,0) width 78: "i.mmmcdxci" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 716x17 text run at (0,0) width 16: "i.i " text run at (16,0) width 20: "i.ii " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png index f1833a84296d..664cfaf7b4ff 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.txt index f207b8c5ee15..a8d7ebf59655 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-08-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 954x585 RenderView at (0,0) size 800x585 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 14x17 RenderInline (generated) at (0,0) size 14x17 RenderCounter at (0,0) size 14x17 @@ -120,7 +120,7 @@ layer at (0,0) size 800x91 RenderCounter at (844,0) size 102x17 text run at (844,0) width 102: "I.MMMCDXCI" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 946x17 text run at (0,0) width 18: "I.I " text run at (18,0) width 23: "I.II " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png index 375644af76c7..fc33b02085fb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.txt index f3bcc816414d..106d50feb6fa 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-09-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 1064x585 RenderView at (0,0) size 800x585 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 20x17 RenderInline (generated) at (0,0) size 20x17 RenderCounter at (0,0) size 20x17 @@ -246,7 +246,7 @@ layer at (0,0) size 800x91 RenderCounter at (998,0) size 58x17 text run at (998,0) width 58: "\x{10D0}.\x{10F5}\x{10F0}\x{10E8}\x{10DF}\x{10D7}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 1056x17 text run at (0,0) width 24: "\x{10D0}.\x{10D0} " text run at (24,0) width 24: "\x{10D0}.\x{10D1} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.png index e0a661595857..4a52763067ea 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.txt index f58b4da41632..d31b44652a75 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-11-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 18x17 RenderInline (generated) at (0,0) size 18x17 RenderCounter at (0,0) size 18x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (239,0) size 15x17 text run at (239,0) width 15: "a.l" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 254x17 text run at (0,0) width 22: "a.a " text run at (22,0) width 23: "a.b " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.png index e0a661595857..4a52763067ea 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.txt index f58b4da41632..d31b44652a75 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-12-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 18x17 RenderInline (generated) at (0,0) size 18x17 RenderCounter at (0,0) size 18x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (239,0) size 15x17 text run at (239,0) width 15: "a.l" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 254x17 text run at (0,0) width 22: "a.a " text run at (22,0) width 23: "a.b " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.png index 01959d4b9990..124be50bff85 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.txt index 2d8ed7a70912..8a892beb7cd2 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-13-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 28x17 RenderInline (generated) at (0,0) size 28x17 RenderCounter at (0,0) size 28x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (332,0) size 26x17 text run at (332,0) width 26: "A.L" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 358x17 text run at (0,0) width 32: "A.A " text run at (32,0) width 31: "A.B " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.png index 01959d4b9990..124be50bff85 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.txt index 2d8ed7a70912..8a892beb7cd2 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-14-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 28x17 RenderInline (generated) at (0,0) size 28x17 RenderCounter at (0,0) size 28x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (332,0) size 26x17 text run at (332,0) width 26: "A.L" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 358x17 text run at (0,0) width 32: "A.A " text run at (32,0) width 31: "A.B " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.png index 91ae9cfea0a9..a79526945a92 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.txt index 02760b365bce..bc4636f49575 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-15-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 20x17 RenderInline (generated) at (0,0) size 20x17 RenderCounter at (0,0) size 20x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (257,0) size 21x17 text run at (257,0) width 21: "\x{3B1}.\x{3BC}" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 278x17 text run at (0,0) width 24: "\x{3B1}.\x{3B1} " text run at (24,0) width 24: "\x{3B1}.\x{3B2} " diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.png index f34b039119e1..ffded9cda43b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.txt index ada5c2ea260e..930a1b709393 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-16-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 33x17 RenderInline (generated) at (0,0) size 33x17 RenderCounter at (0,0) size 20x17 @@ -28,7 +28,7 @@ layer at (0,0) size 800x91 text run at (96,0) width 10: "--" RenderCounter at (106,0) size 51x17 text run at (106,0) width 51: "1-------3" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 157x17 text run at (0,0) width 96: "1.1 - 12 - 1.3-- " text run at (96,0) width 61: "--1-------3" diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.png index 9e7afff4ef8f..0cfc157677f0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.txt index c79ce09b5732..49b23926711d 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-17-d-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 33x17 RenderInline (generated) at (0,0) size 33x17 RenderCounter at (0,0) size 20x17 @@ -27,6 +27,6 @@ layer at (0,0) size 800x91 text run at (82,0) width 48: "-- --" RenderCounter at (130,0) size 51x17 text run at (130,0) width 51: "1-------3" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 181x17 text run at (0,0) width 181: "1.1 - 12 - 1.3-- --1-------3" diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.png b/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.png index fca592869ce3..37c3ba477864 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.png and b/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.txt b/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.txt index 7ab6672a2c2d..19c7394057e4 100644 --- a/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1202-counters-18-f-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 292x17 text run at (0,0) width 292: "The following two lines should look the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 20x17 RenderInline (generated) at (0,0) size 20x17 RenderCounter at (0,0) size 20x17 @@ -78,7 +78,7 @@ layer at (0,0) size 800x91 RenderCounter at (280,0) size 28x17 text run at (280,0) width 28: "1.12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 308x17 text run at (0,0) width 24: "1.1 " text run at (24,0) width 24: "1.2 " diff --git a/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.png index a19b93667851..ea6d61ca0b23 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.txt index dc9e01ac2340..8b7d875e67e3 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-implied-00-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -15,6 +15,6 @@ layer at (0,0) size 800x91 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (8,0) size 8x17 text run at (8,0) width 8: "0" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 16x17 text run at (0,0) width 16: "00" diff --git a/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.png index 49f9dfbca09b..8a67eccd1a11 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.txt index b27ab8fcce77..7cbeed1fd89b 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-implied-01-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 277x17 text run at (0,0) width 277: "The following two lines should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 12x17 RenderInline (generated) at (0,0) size 12x17 RenderCounter at (0,0) size 8x17 @@ -19,6 +19,6 @@ layer at (0,0) size 800x91 RenderCounter at (12,0) size 8x17 text run at (12,0) width 8: "1" RenderText at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 20x17 text run at (0,0) width 20: "0 1" diff --git a/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.png index 2294c977f1ef..1b5881452ae8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.txt index 1d286c08b8ad..dcccc2e5641a 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-implied-02-d-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 277x17 text run at (0,0) width 277: "The following two lines should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 35x17 RenderInline (generated) at (0,0) size 11x17 RenderText at (0,0) size 11x17 @@ -37,6 +37,6 @@ layer at (0,0) size 800x91 RenderCounter at (47,0) size 20x17 text run at (47,0) width 20: "1.0" RenderText at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 67x17 text run at (0,0) width 67: "B1 0 1 1.0" diff --git a/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.png index 642f77160a78..0d5e7c89cc9b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.txt index b2e55f3ab952..f6f2c4633c98 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-multiple-00-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -15,6 +15,6 @@ layer at (0,0) size 800x91 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (8,0) size 8x17 text run at (8,0) width 8: "2" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 16x17 text run at (0,0) width 16: "12" diff --git a/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.png index 642f77160a78..0d5e7c89cc9b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.txt index b2e55f3ab952..f6f2c4633c98 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-multiple-01-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -15,6 +15,6 @@ layer at (0,0) size 800x91 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (8,0) size 8x17 text run at (8,0) width 8: "2" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 16x17 text run at (0,0) width 16: "12" diff --git a/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.png index 638dfd5f6f90..634d53e98d23 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.txt index f586bee5116a..b14ae561ad3e 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-order-00-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 @@ -118,7 +118,7 @@ layer at (0,0) size 800x91 RenderCounter at (220,0) size 16x17 text run at (220,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 236x17 text run at (0,0) width 12: "0 " text run at (12,0) width 12: "1 " diff --git a/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.png index 3ead19c4d671..cb85fb2d8b25 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.txt index e3865b316274..4db525992813 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-order-01-d-expected.txt @@ -1,66 +1,66 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x170 - RenderBlock {HTML} at (0,0) size 800x170 - RenderBody {BODY} at (8,16) size 784x146 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x177 + RenderBlock {HTML} at (0,0) size 800x177 + RenderBody {BODY} at (8,16) size 784x153 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 730x17 text run at (0,0) width 408: "You should see nine boxes below, each just containing a unique " text run at (408,0) width 322: "multiple of eleven, from 11 to 99, and nothing else." - RenderBlock {UL} at (0,33) size 784x113 - RenderBlock {LI} at (0,0) size 50x19 [border: (1px solid #000000)] + RenderBlock {UL} at (0,34) size 784x119 + RenderBlock {LI} at (0,0) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "1" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "1" - RenderBlock (floating) {LI} at (0,19) size 50x19 [border: (1px solid #000000)] + RenderBlock (floating) {LI} at (0,20) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "2" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "2" - RenderBlock {LI} at (0,56) size 50x19 [border: (1px solid #000000)] + RenderBlock {LI} at (0,59) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "5" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "5" - RenderBlock {LI} at (0,75) size 50x19 [border: (1px solid #000000)] + RenderBlock {LI} at (0,79) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "7" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "7" - RenderBlock {LI} at (0,94) size 50x19 [border: (1px solid #000000)] + RenderBlock {LI} at (0,99) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "9" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "9" -layer at (8,68) size 50x37 - RenderBlock (relative positioned) {LI} at (0,19) size 50x37 [border: (1px solid #000000)] +layer at (8,70) size 50x39 + RenderBlock (relative positioned) {LI} at (0,20) size 50x39 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 - RenderCounter at (1,19) size 8x17 - text run at (1,19) width 8: "3" - RenderText {#text} at (9,19) size 8x17 - text run at (9,19) width 8: "3" -layer at (136,105) size 50x19 - RenderBlock (positioned) {DIV} at (128,0) size 50x19 [border: (1px solid #000000)] + RenderCounter at (1,20) size 8x17 + text run at (1,20) width 8: "3" + RenderText {#text} at (9,20) size 8x17 + text run at (9,20) width 8: "3" +layer at (136,109) size 50x20 + RenderBlock (positioned) {DIV} at (128,0) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "4" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "4" -layer at (192,80) size 50x19 - RenderBlock (positioned) {LI} at (192,80) size 50x19 [border: (1px solid #000000)] +layer at (192,80) size 50x20 + RenderBlock (positioned) {LI} at (192,80) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "6" RenderText {#text} at (9,1) size 8x17 text run at (9,1) width 8: "6" -layer at (64,128) size 50x19 - RenderBlock (positioned) {LI} at (64,128) size 50x19 [border: (1px solid #000000)] +layer at (64,128) size 50x20 + RenderBlock (positioned) {LI} at (64,128) size 50x20 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x17 RenderCounter at (1,1) size 8x17 text run at (1,1) width 8: "8" diff --git a/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.png b/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.png index ec5ed5b76c2f..04e8b7b571ef 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.png and b/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.txt b/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.txt index 6b0832326186..905df505c350 100644 --- a/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1204-root-e-expected.txt @@ -1,21 +1,21 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 RenderBlock (anonymous) at (0,0) size 800x0 RenderInline (generated) at (0,0) size 0x0 RenderText at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 20x17 RenderInline (generated) at (0,0) size 20x17 RenderCounter at (0,0) size 20x17 text run at (0,0) width 20: "4.8" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 20x17 text run at (0,0) width 20: "4.8" diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.png index 1e3325fc2df2..43c977f8eecb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.txt index 0d9d209f09dd..74c3a7ced7cd 100644 --- a/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120401-scope-00-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "The next 2 lines should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 40x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 @@ -56,7 +56,7 @@ layer at (0,0) size 800x91 RenderCounter at (92,0) size 8x17 text run at (92,0) width 8: "1" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 100x17 text run at (0,0) width 52: "122111 " text run at (52,0) width 48: "133331" diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.png b/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.png index 4f125e8939e4..51c7df2a0813 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.txt index dcab8e891c55..931a5734c48a 100644 --- a/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120401-scope-01-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "The following two lines should be the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 491x17 RenderInline (generated) at (0,0) size 24x17 RenderText at (0,0) size 11x17 @@ -112,6 +112,6 @@ layer at (0,0) size 800x91 text run at (478,0) width 8: "3" RenderText at (486,0) size 5x17 text run at (486,0) width 5: "-" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 491x17 text run at (0,0) width 491: "B1-B2-B2.1-B2.2-A2.3-B2.4-A2.5-A2.6-B2.7-B2.8-A2.9-A2.10-A2.11-A3-" diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.png b/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.png index 61b278ce5e14..231b8e5ce8ab 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.txt index a9956e3a2ce9..da5da839bb70 100644 --- a/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120401-scope-02-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "The following two lines should be the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 195x17 RenderInline (generated) at (0,0) size 24x17 RenderText at (0,0) size 11x17 @@ -52,6 +52,6 @@ layer at (0,0) size 800x91 text run at (182,0) width 8: "2" RenderText at (190,0) size 5x17 text run at (190,0) width 5: "-" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 195x17 text run at (0,0) width 195: "B1-B1.1-B1.2-A1.3-A1.4-A2-" diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.png b/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.png index 59fb0862fc5d..b950d62bf63a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.txt index c9f1b8166170..22da91130b80 100644 --- a/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120401-scope-03-c-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "The following two lines should be the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 159x17 RenderInline (generated) at (0,0) size 24x17 RenderText at (0,0) size 11x17 @@ -52,6 +52,6 @@ layer at (0,0) size 800x91 text run at (146,0) width 8: "5" RenderText at (154,0) size 5x17 text run at (154,0) width 5: "-" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 159x17 text run at (0,0) width 159: "B1-B2-B3-A4-A4.1-A5-" diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.png b/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.png index 21965947ae0e..05e361a4510b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.txt index 8a11c8fc2894..ab1b4b2040a7 100644 --- a/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120401-scope-04-d-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 245x17 text run at (0,0) width 245: "The next two lines should be the same:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 12x17 RenderInline (generated) at (0,0) size 12x17 @@ -37,6 +37,6 @@ layer at (0,0) size 800x91 RenderCounter at (59,0) size 20x17 text run at (59,0) width 20: "1.1" RenderText at (0,0) size 0x0 - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 79x17 text run at (0,0) width 79: "1 1 R1.1 1.1" diff --git a/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.png index 4cf55bd69636..6180525e7e3c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.txt index fbcd8b82bc3c..47d3f0d2c7ff 100644 --- a/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120403-content-none-00-c-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 text run at (0,0) width 8: "0" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "0" diff --git a/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.png index 4cf55bd69636..6180525e7e3c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.txt index 84cca5f8956d..721b62eedba8 100644 --- a/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120403-display-none-00-c-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 text run at (0,0) width 8: "0" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "0" diff --git a/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.png b/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.png index a2b278b8a85b..c1f131b9eeb0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.png and b/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.txt b/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.txt index 5876b4b6493e..df22c2095515 100644 --- a/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t120403-visibility-00-c-expected.txt @@ -1,17 +1,17 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x91 - RenderBlock {HTML} at (0,0) size 800x91 - RenderBody {BODY} at (8,16) size 784x67 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x94 + RenderBlock {HTML} at (0,0) size 800x94 + RenderBody {BODY} at (8,16) size 784x70 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 216x17 text run at (0,0) width 216: "The following should be identical:" - RenderBlock {DIV} at (0,33) size 784x17 + RenderBlock {DIV} at (0,34) size 784x18 RenderInline {SPAN} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 8x17 RenderInline (generated) at (0,0) size 8x17 RenderCounter at (0,0) size 8x17 text run at (0,0) width 8: "1" - RenderBlock {DIV} at (0,50) size 784x17 + RenderBlock {DIV} at (0,52) size 784x18 RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "1" diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.png index 99ef125c22fa..b55895ca2f53 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.txt index d21540662818..9cda35e13397 100644 --- a/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1205-c561-list-displ-00-b-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x193 - RenderBlock {HTML} at (0,0) size 800x193 - RenderBody {BODY} at (8,16) size 784x169 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x202 + RenderBlock {HTML} at (0,0) size 800x202 + RenderBody {BODY} at (8,16) size 784x178 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 757x17 text run at (0,0) width 757: "There should be eight numbered lines below, all identical except for the numbering, which should match the description." - RenderListItem {DIV} at (0,33) size 784x17 [color=#000080] + RenderListItem {DIV} at (0,34) size 784x18 [color=#000080] RenderListMarker at (0,0) size 16x17: "1" RenderText {#text} at (16,0) size 151x17 text run at (16,0) width 151: "This should be line one." - RenderBlock {DIV} at (0,50) size 784x17 [color=#000080] + RenderBlock {DIV} at (0,52) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 168x17 text run at (0,0) width 168: "2. This should be line two." - RenderBlock (anonymous) at (0,67) size 784x17 + RenderBlock (anonymous) at (0,70) size 784x18 RenderInline {DIV} at (0,0) size 94x17 [color=#000080] RenderText {#text} at (0,0) size 94x17 text run at (0,0) width 94: "3. This should " @@ -22,20 +22,20 @@ layer at (0,0) size 800x193 RenderText {#text} at (94,0) size 81x17 text run at (94,0) width 81: "be line three." RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,84) size 784x17 [color=#000080] + RenderBlock {DIV} at (0,88) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 170x17 text run at (0,0) width 170: "4. This should be line four." - RenderBlock {DIV} at (0,101) size 784x17 [color=#000080] + RenderBlock {DIV} at (0,106) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 168x17 text run at (0,0) width 168: "5. This should be line five." RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,118) size 784x51 [color=#000080] - RenderBlock (anonymous) at (0,0) size 784x17 + RenderBlock {DIV} at (0,124) size 784x54 [color=#000080] + RenderBlock (anonymous) at (0,0) size 784x18 RenderText {#text} at (0,0) size 162x17 text run at (0,0) width 162: "6. This should be line six." - RenderBlock {A} at (0,17) size 784x17 + RenderBlock {A} at (0,18) size 784x18 RenderText {#text} at (0,0) size 180x17 text run at (0,0) width 180: "7. This should be line seven." - RenderBlock (anonymous) at (0,34) size 784x17 + RenderBlock (anonymous) at (0,36) size 784x18 RenderText {#text} at (0,0) size 175x17 text run at (0,0) width 175: "8. This should be line eight." diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.png index 50b8b44427b9..a66ef5f47234 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.txt index 86c29b731522..96b66af69aa7 100644 --- a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-00-b-expected.txt @@ -1,57 +1,57 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x317 - RenderBlock {HTML} at (0,0) size 800x317 - RenderBody {BODY} at (8,16) size 784x285 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x330 + RenderBlock {HTML} at (0,0) size 800x330 + RenderBody {BODY} at (8,16) size 784x298 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 458x17 text run at (0,0) width 458: "Each bullet should look as described, and there should be no red present." - RenderBlock {UL} at (0,33) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,34) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "disc" - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "disc" - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "disc" - RenderBlock {UL} at (0,100) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,104) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 34x17 text run at (0,0) width 34: "circle" - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 34x17 text run at (0,0) width 34: "circle" - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-17,0) size 7x17: white bullet RenderText {#text} at (0,0) size 34x17 text run at (0,0) width 34: "circle" - RenderBlock {UL} at (0,167) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,174) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "square" - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "square" - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-17,0) size 7x17: black square RenderText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "square" - RenderBlock {UL} at (0,234) size 784x51 [color=#FF0000] - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,244) size 784x54 [color=#FF0000] + RenderListItem {LI} at (40,0) size 744x18 RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderText {#text} at (0,0) size 4x17 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.png index 59bc262658bd..9dab271226e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.txt index 1a83d8975e2b..2e2068d3ae6e 100644 --- a/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1205-c563-list-type-01-b-expected.txt @@ -1,73 +1,73 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x384 - RenderBlock {HTML} at (0,0) size 800x384 - RenderBody {BODY} at (8,16) size 784x352 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x400 + RenderBlock {HTML} at (0,0) size 800x400 + RenderBody {BODY} at (8,16) size 784x368 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 388x17 text run at (0,0) width 388: "The two columns should look the same, except for alignment." - RenderBlock {OL} at (0,33) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {OL} at (0,34) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-16,0) size 12x17: "i" RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "i." - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-20,0) size 16x17: "ii" RenderText {#text} at (0,0) size 12x17 text run at (0,0) width 12: "ii." - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-24,0) size 20x17: "iii" RenderText {#text} at (0,0) size 16x17 text run at (0,0) width 16: "iii." - RenderBlock {OL} at (0,100) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {OL} at (0,104) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 13x17: "I" RenderText {#text} at (0,0) size 9x17 text run at (0,0) width 9: "I." - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-22,0) size 18x17: "II" RenderText {#text} at (0,0) size 14x17 text run at (0,0) width 14: "II." - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-27,0) size 23x17: "III" RenderText {#text} at (0,0) size 19x17 text run at (0,0) width 19: "III." - RenderBlock {OL} at (0,167) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {OL} at (0,174) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-19,0) size 15x17: "a" RenderText {#text} at (0,0) size 11x17 text run at (0,0) width 11: "a." - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-20,0) size 16x17: "b" RenderText {#text} at (0,0) size 12x17 text run at (0,0) width 12: "b." - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-19,0) size 15x17: "c" RenderText {#text} at (0,0) size 11x17 text run at (0,0) width 11: "c." - RenderBlock {OL} at (0,234) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {OL} at (0,244) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-24,0) size 20x17: "A" RenderText {#text} at (0,0) size 16x17 text run at (0,0) width 16: "A." - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-23,0) size 19x17: "B" RenderText {#text} at (0,0) size 15x17 text run at (0,0) width 15: "B." - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-23,0) size 19x17: "C" RenderText {#text} at (0,0) size 15x17 text run at (0,0) width 15: "C." - RenderBlock {OL} at (0,301) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {OL} at (0,314) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-24,0) size 20x17: "A" RenderText {#text} at (0,0) size 16x17 text run at (0,0) width 16: "A." - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-23,0) size 19x17: "B" RenderText {#text} at (0,0) size 15x17 text run at (0,0) width 15: "B." - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-20,0) size 16x17: "3" RenderText {#text} at (0,0) size 12x17 text run at (0,0) width 12: "3." diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.png index c197f6907479..23a348f98f2a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.txt index 95090e0a5eb5..853b0205c002 100644 --- a/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1205-c564-list-img-00-b-g-expected.txt @@ -1,34 +1,34 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x192 - RenderBlock {HTML} at (0,0) size 800x192 - RenderBody {BODY} at (8,16) size 784x160 [color=#000080] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x199 + RenderBlock {HTML} at (0,0) size 800x199 + RenderBody {BODY} at (8,16) size 784x167 [color=#000080] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 234x17 text run at (0,0) width 234: "Each bullet should look as described." - RenderBlock {UL} at (0,33) size 784x60 - RenderListItem {LI} at (40,0) size 744x20 + RenderBlock {UL} at (0,34) size 784x63 + RenderListItem {LI} at (40,0) size 744x21 RenderListMarker at (-24,0) size 17x17 RenderText {#text} at (0,3) size 85x17 text run at (0,3) width 85: "purple square" - RenderListItem {LI} at (40,20) size 744x20 + RenderListItem {LI} at (40,21) size 744x21 RenderListMarker at (-24,0) size 17x17 RenderText {#text} at (0,3) size 85x17 text run at (0,3) width 85: "purple square" - RenderListItem {LI} at (40,40) size 744x20 + RenderListItem {LI} at (40,42) size 744x21 RenderListMarker at (-24,0) size 17x17 RenderText {#text} at (0,3) size 85x17 text run at (0,3) width 85: "purple square" - RenderBlock {UL} at (0,109) size 784x51 - RenderListItem {LI} at (40,0) size 744x17 + RenderBlock {UL} at (0,113) size 784x54 + RenderListItem {LI} at (40,0) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "disc" - RenderListItem {LI} at (40,17) size 744x17 + RenderListItem {LI} at (40,18) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "disc" - RenderListItem {LI} at (40,34) size 744x17 + RenderListItem {LI} at (40,36) size 744x18 RenderListMarker at (-17,0) size 7x17: bullet RenderText {#text} at (0,0) size 25x17 text run at (0,0) width 25: "disc" diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.png index 8730978f1f9c..0a4bd8482d25 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.txt index a0ebd993f481..68333e4e598c 100644 --- a/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1205-c565-list-pos-00-b-expected.txt @@ -1,21 +1,21 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x93 - RenderBlock {HTML} at (0,0) size 800x93 - RenderBody {BODY} at (8,16) size 784x69 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x96 + RenderBlock {HTML} at (0,0) size 800x96 + RenderBody {BODY} at (8,16) size 784x72 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 363x17 text run at (0,0) width 363: "The following two boxes should be identical, to the pixel." - RenderBlock {OL} at (80,33) size 160x17 [color=#FFFFFF] [bgcolor=#000080] - RenderListItem {LI} at (0,0) size 160x17 + RenderBlock {OL} at (80,34) size 160x18 [color=#FFFFFF] [bgcolor=#000080] + RenderListItem {LI} at (0,0) size 160x18 RenderListMarker at (-20,0) size 16x17: "1" RenderInline {SPAN} at (0,0) size 12x17 [color=#000080] RenderText {#text} at (0,0) size 12x17 text run at (0,0) width 12: "1." RenderText {#text} at (12,0) size 31x17 text run at (12,0) width 31: " Test" - RenderBlock {OL} at (80,51) size 160x18 [color=#000080] [bgcolor=#000080] - RenderListItem {LI} at (0,0) size 160x17 + RenderBlock {OL} at (80,53) size 160x19 [color=#000080] [bgcolor=#000080] + RenderListItem {LI} at (0,0) size 160x18 RenderListMarker at (0,0) size 16x17: "1" RenderInline {SPAN} at (0,0) size 27x17 [color=#FFFFFF] RenderText {#text} at (16,0) size 27x17 diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.png index a61d54028dcf..e7f90747d187 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt index 09e1a2dd5592..5590e46d8b36 100644 --- a/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x84 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x116 + RenderBlock {HTML} at (0,0) size 800x116 + RenderBody {BODY} at (8,16) size 784x85 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "There should be no red below." - RenderBlock {UL} at (75,33) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {UL} at (75,34) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderListItem {LI} at (3,3) size 90x45 RenderListMarker at (0,0) size 45x15: "A" RenderText {#text} at (45,0) size 90x45 diff --git a/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.png index 39867cc4bce9..54d75963d2d8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.txt index 20fe78d2a6f0..148be1e72327 100644 --- a/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1401-c531-color-00-a-expected.txt @@ -1,11 +1,11 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#008000] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [color=#008000] + RenderBlock {P} at (0,34) size 784x18 [color=#008000] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.png index c404b39a3618..4f9bfaa32fee 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.txt index 6421a5cd7599..18787111e86a 100644 --- a/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1402-c45-bg-canvas-00-b-expected.txt @@ -1,9 +1,9 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x67 - RenderBlock {HTML} at (0,0) size 800x67 [bgcolor=#800080] - RenderBody {BODY} at (25,25) size 750x17 [color=#FFFFFF] [bgcolor=#000080] - RenderBlock {P} at (0,0) size 750x17 +layer at (0,0) size 800x68 + RenderBlock {HTML} at (0,0) size 800x68 [bgcolor=#800080] + RenderBody {BODY} at (25,25) size 750x18 [color=#FFFFFF] [bgcolor=#000080] + RenderBlock {P} at (0,0) size 750x18 RenderText {#text} at (0,0) size 665x17 text run at (0,0) width 379: "This paragraph should be in a blue block near the top of the " text run at (379,0) width 286: "page. Around it on all sides should be purple." diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.png index db9735eb2417..f9cb4269827f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.txt index bab7fc58cd06..e11746a95a3f 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-00-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 [bgcolor=#00FF00] +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 [bgcolor=#00FF00] + RenderBlock {P} at (0,34) size 784x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 59x17 text run at (0,0) width 59: "This line " RenderInline {SPAN} at (0,0) size 100x17 @@ -14,6 +14,6 @@ layer at (0,0) size 800x115 text run at (59,0) width 100: "should be green" RenderText {#text} at (159,0) size 28x17 text run at (159,0) width 28: " too." - RenderBlock {P} at (0,66) size 784x17 [bgcolor=#AAFFAA] + RenderBlock {P} at (0,68) size 784x18 [bgcolor=#AAFFAA] RenderText {#text} at (0,0) size 193x17 text run at (0,0) width 193: "This line should be pale green." diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-01-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-01-b-expected.txt index 0addf05d497d..10d204180bad 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-01-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c532-bgcolor-01-b-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.png index 2fd50fdf8ab5..8589491136cd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.txt index e65fe3eee38b..073da66a81e1 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-00-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." - RenderBlock {P} at (0,33) size 784x17 + RenderBlock {P} at (0,34) size 784x18 RenderText {#text} at (0,0) size 59x17 text run at (0,0) width 59: "This line " RenderInline {SPAN} at (0,0) size 100x17 diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-01-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-01-b-g-expected.txt index 0addf05d497d..10d204180bad 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-01-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c533-bgimage-01-b-g-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x49 - RenderBlock {HTML} at (0,0) size 800x49 - RenderBody {BODY} at (8,16) size 784x17 [color=#008000] - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x50 + RenderBlock {HTML} at (0,0) size 800x50 + RenderBody {BODY} at (8,16) size 784x18 [color=#008000] + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 163x17 text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.png index 2961b464e8be..9ced5107e2de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.txt index e847472a7854..3016c676cbaa 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x288 - RenderBlock {HTML} at (0,0) size 800x288 - RenderBody {BODY} at (8,16) size 784x264 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x289 + RenderBlock {HTML} at (0,0) size 800x289 + RenderBody {BODY} at (8,16) size 784x265 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 156x231 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 156x231 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 150x75 RenderText {#text} at (0,0) size 150x75 text run at (0,0) width 150: " xxxxxxxxx" diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.png index 2961b464e8be..9ced5107e2de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.txt index 91b9c0b2fb58..3bb524e489b3 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgre-01-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x288 - RenderBlock {HTML} at (0,0) size 800x288 - RenderBody {BODY} at (8,16) size 784x264 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x289 + RenderBlock {HTML} at (0,0) size 800x289 + RenderBody {BODY} at (8,16) size 784x265 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 156x231 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 156x231 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 150x75 RenderText {#text} at (0,0) size 150x75 text run at (0,0) width 150: "z " diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.png index 9657d68761c1..7e86b20598d3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt index 35519ab3e6dc..0ecc243e4e55 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,16) size 784x109 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x110 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 text run at (0,0) width 154: "xxxx x xxxx" diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.png index bd2003b74f41..2b828aa4ff68 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt index a792aa6928b2..bb0e30c65fbc 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,16) size 784x109 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x110 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 160x76 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 text run at (0,0) width 154: " x " diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.png index e39ac194e9ce..f45152093548 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt index 311ed2dcae83..f1dc7dfac374 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,16) size 784x109 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x110 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 text run at (0,0) width 154: " _ _ _ " diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.png index 205f58fc6208..8eee382aeb39 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt index 82db1afc204d..0ce2b7b51e8e 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,16) size 784x109 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x110 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 text run at (0,0) width 154: " r r r " diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.png index 94541c24fa23..5e05d12995a6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt index b8d6290a8f66..3eab2a2fe96b 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,16) size 784x109 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x110 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 text run at (0,0) width 154: " r r r r" diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.png index 9c70d5d63ba1..2ca30487695d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt index 6a787f662e50..9f1876525a66 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x133 - RenderBlock {HTML} at (0,0) size 800x133 - RenderBody {BODY} at (8,16) size 784x109 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,16) size 784x110 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 238x17 text run at (0,0) width 238: "There should be a green block below." - RenderBlock {DIV} at (0,33) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 text run at (0,0) width 154: " rr rr rr r" diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png index f3557b9e4237..596892a33aee 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt index f2de3a11cfd3..2d5205f576b7 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt @@ -1,486 +1,486 @@ -layer at (0,0) size 785x2768 +layer at (0,0) size 785x2928 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2768 - RenderBlock {HTML} at (0,0) size 785x2768 - RenderBody {BODY} at (8,8) size 769x2752 - RenderBlock {DIV} at (0,0) size 769x17 [color=#C0C0C0] +layer at (0,0) size 785x2928 + RenderBlock {HTML} at (0,0) size 785x2928 + RenderBody {BODY} at (8,8) size 769x2912 + RenderBlock {DIV} at (0,0) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,17) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,18) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,34) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,36) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,67) size 769x17 + RenderBlock {P} at (0,70) size 769x18 RenderText {#text} at (0,0) size 617x17 text run at (0,0) width 396: "Scroll this document. A line of blue should remain stuck at the " text run at (396,0) width 221: "top of the viewport the whole time." - RenderBlock {DIV} at (0,100) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,104) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,117) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,122) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,134) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,140) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,151) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,158) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,168) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,176) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,185) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,194) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,202) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,212) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,219) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,230) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,236) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,248) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,253) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,266) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,270) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,284) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,287) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,302) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,304) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,320) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,321) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,338) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,338) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,356) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,355) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,374) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,372) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,392) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,389) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,410) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,406) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,428) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,423) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,446) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,440) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,464) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,457) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,482) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,474) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,500) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,491) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,518) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,508) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,536) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,525) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,554) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,542) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,572) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,559) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,590) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,576) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,608) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,593) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,626) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,610) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,644) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,627) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,662) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,644) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,680) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,661) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,698) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,678) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,716) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,695) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,734) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,712) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,752) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,729) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,770) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,746) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,788) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,763) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,806) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,780) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,824) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,797) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,842) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,814) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,860) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,831) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,878) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,848) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,896) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,865) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,914) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,882) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,932) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,899) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,950) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,916) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,968) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,933) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,986) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,950) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1004) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,967) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1022) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,984) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1040) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1001) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1058) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1018) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1076) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1035) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1094) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1052) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1112) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1069) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1130) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1086) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1148) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1103) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1166) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1120) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1184) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1137) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1202) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1154) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1220) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1171) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1238) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1188) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1256) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1205) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1274) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1222) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1292) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1239) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1310) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1256) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1328) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1273) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1346) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1290) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1364) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1307) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1382) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1324) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1400) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1341) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1418) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1358) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1436) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1375) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1454) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1392) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1472) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1409) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1490) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1426) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1508) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1443) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1526) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1460) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1544) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1477) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1562) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1494) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1580) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1511) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1598) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1528) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1616) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1545) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1634) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1562) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1652) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1579) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1670) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1596) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1688) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1613) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1706) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1630) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1724) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1647) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1742) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1664) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1760) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1681) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1778) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1698) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1796) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1715) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1814) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1732) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1832) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1749) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1850) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1766) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1868) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1783) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1886) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1800) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1904) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1817) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1922) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1834) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1940) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1851) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1958) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1868) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1976) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1885) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,1994) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1902) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2012) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1919) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2030) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1936) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2048) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1953) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2066) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1970) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2084) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,1987) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2102) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2004) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2120) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2021) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2138) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2038) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2156) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2055) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2174) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2072) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2192) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2089) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2210) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2106) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2228) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2123) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2246) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2140) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2264) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2157) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2282) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2174) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2300) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2191) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2318) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2208) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2336) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2225) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2354) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2242) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2372) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2259) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2390) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2276) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2408) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2293) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2426) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2310) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2444) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2327) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2462) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2344) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2480) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2361) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2498) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2378) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2516) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2395) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2534) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2412) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2552) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2429) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2570) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2446) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2588) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2463) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2606) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2480) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2624) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2497) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2642) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2514) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2660) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2531) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2678) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2548) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2696) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2565) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2714) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2582) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2732) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2599) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2750) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2616) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2768) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2633) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2786) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2650) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2804) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2667) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2822) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2684) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2840) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2701) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2858) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2718) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2876) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {DIV} at (0,2735) size 769x17 [color=#C0C0C0] + RenderBlock {DIV} at (0,2894) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt index 40390808bc56..da2015bb4c9a 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt @@ -1,29 +1,29 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x289 - RenderBlock {HTML} at (0,0) size 800x289 - RenderBody {BODY} at (0,0) size 800x289 +layer at (0,0) size 800x290 + RenderBlock {HTML} at (0,0) size 800x290 + RenderBody {BODY} at (0,0) size 800x290 RenderBlock {DIV} at (0,0) size 800x15 [color=#FFFFFF] RenderText {#text} at (785,0) size 15x15 text run at (785,0) width 15: "X" - RenderBlock {P} at (0,31) size 800x17 + RenderBlock {P} at (0,31) size 800x18 RenderText {#text} at (0,0) size 487x17 text run at (0,0) width 487: "There should be no red on this page (look in the upper right hand corner too)." - RenderBlock {DIV} at (0,64) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,65) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " " text run at (0,30) width 165: " X " text run at (0,45) width 165: " " text run at (0,60) width 165: " " - RenderBlock {DIV} at (0,139) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,140) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " " text run at (0,30) width 165: " X " text run at (0,45) width 165: " " text run at (0,60) width 165: " " - RenderBlock {DIV} at (0,214) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,215) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " " diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt index 8b0eca18c48d..f0ce9b0390d8 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt @@ -1,33 +1,33 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x349 - RenderBlock {HTML} at (0,0) size 800x349 - RenderBody {BODY} at (0,16) size 800x333 - RenderBlock {P} at (0,0) size 800x17 +layer at (0,0) size 800x350 + RenderBlock {HTML} at (0,0) size 800x350 + RenderBody {BODY} at (0,16) size 800x334 + RenderBlock {P} at (0,0) size 800x18 RenderText {#text} at (0,0) size 230x17 text run at (0,0) width 230: "There should be no red on this page." - RenderBlock {DIV} at (0,33) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,34) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " " text run at (0,30) width 165: " " text run at (0,45) width 165: " " text run at (0,60) width 165: " X" - RenderBlock {DIV} at (0,108) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,109) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " " text run at (0,30) width 165: "X " text run at (0,45) width 165: " " text run at (0,60) width 165: " " - RenderBlock {DIV} at (0,183) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,184) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " X " text run at (0,30) width 165: " " text run at (0,45) width 165: " " text run at (0,60) width 165: " " - RenderBlock {DIV} at (0,258) size 165x75 [color=#FFFFFF] + RenderBlock {DIV} at (0,259) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " text run at (0,15) width 165: " " diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png index 574b872377d0..a923b8a0644b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt index c66234b2b277..d9a0f1454aac 100644 --- a/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt @@ -1,176 +1,176 @@ -layer at (0,0) size 785x1891 +layer at (0,0) size 785x1941 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1891 - RenderBlock {HTML} at (0,0) size 785x1891 - RenderBody {BODY} at (8,16) size 769x1859 - RenderBlock {P} at (0,0) size 769x17 [color=#C0C0C0] +layer at (0,0) size 785x1941 + RenderBlock {HTML} at (0,0) size 785x1941 + RenderBody {BODY} at (8,16) size 769x1909 + RenderBlock {P} at (0,0) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,33) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,34) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,66) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,68) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,99) size 769x34 - RenderText {#text} at (0,0) size 764x34 + RenderBlock {P} at (0,102) size 769x36 + RenderText {#text} at (0,0) size 764x35 text run at (0,0) width 396: "Scroll this document. A line of blue should remain stuck at the " text run at (396,0) width 368: "top of the viewport the whole time, and there should be no" - text run at (0,17) width 24: "red " - text run at (24,17) width 179: "below, just a block of green." - RenderBlock {DIV} at (30,149) size 165x75 [color=#008000] [bgcolor=#008000] + text run at (0,18) width 24: "red " + text run at (24,18) width 179: "below, just a block of green." + RenderBlock {DIV} at (30,154) size 165x75 [color=#008000] [bgcolor=#008000] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " X" text run at (0,15) width 165: " X" text run at (0,30) width 165: " X" text run at (0,45) width 165: " X" text run at (0,60) width 165: " X" - RenderBlock {DIV} at (30,224) size 165x75 [color=#008000] [bgcolor=#008000] + RenderBlock {DIV} at (30,229) size 165x75 [color=#008000] [bgcolor=#008000] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " X " text run at (0,15) width 165: " X " text run at (0,30) width 165: " X " text run at (0,45) width 165: " X " text run at (0,60) width 165: " X " - RenderBlock {DIV} at (30,299) size 165x75 [color=#008000] [bgcolor=#008000] + RenderBlock {DIV} at (30,304) size 165x75 [color=#008000] [bgcolor=#008000] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: "XXXXXXXXXXX" text run at (0,15) width 165: " " text run at (0,30) width 165: " " text run at (0,45) width 165: " " text run at (0,60) width 165: " " - RenderBlock {P} at (0,390) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,395) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,423) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,429) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,456) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,463) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,489) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,497) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,522) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,531) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,555) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,565) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,588) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,599) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,621) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,633) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,654) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,667) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,687) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,701) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,720) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,735) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,753) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,769) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,786) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,803) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,819) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,837) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,852) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,871) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,885) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,905) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,918) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,939) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,951) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,973) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,984) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1007) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1017) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1041) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1050) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1075) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1083) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1109) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1116) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1143) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1149) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1177) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1182) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1211) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1215) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1245) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1248) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1279) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1281) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1313) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1314) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1347) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1347) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1381) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1380) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1415) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1413) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1449) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1446) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1483) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1479) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1517) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1512) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1551) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1545) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1585) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1578) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1619) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1611) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1653) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1644) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1687) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1677) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1721) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1710) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1755) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1743) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1789) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1776) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1823) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1809) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1857) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." - RenderBlock {P} at (0,1842) size 769x17 [color=#C0C0C0] + RenderBlock {P} at (0,1891) size 769x18 [color=#C0C0C0] RenderText {#text} at (0,0) size 83x17 text run at (0,0) width 83: "Dummy text." diff --git a/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.png index 156fa2e17e75..a6444d9dc01d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.txt index 4f239a650e49..8d20929b2d1e 100644 --- a/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1503-c522-font-family-00-b-expected.txt @@ -1,49 +1,49 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x249 - RenderBlock {HTML} at (0,0) size 800x249 - RenderBody {BODY} at (8,8) size 784x233 - RenderBlock {DIV} at (0,0) size 784x100 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x259 + RenderBlock {HTML} at (0,0) size 800x259 + RenderBody {BODY} at (8,8) size 784x243 + RenderBlock {DIV} at (0,0) size 784x105 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,17) size 784x17 [color=#000080] + RenderBlock {P} at (0,18) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,34) size 784x17 [color=#000080] + RenderBlock {P} at (0,36) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,51) size 784x17 [color=#000080] + RenderBlock {P} at (0,54) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a cursive font." - RenderBlock {P} at (0,68) size 784x17 [color=#000080] + RenderBlock {P} at (0,72) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a fantasy font." - RenderBlock {P} at (0,85) size 784x15 [color=#000080] + RenderBlock {P} at (0,90) size 784x15 [color=#000080] RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." - RenderBlock {P} at (0,100) size 784x17 [color=#000080] + RenderBlock {P} at (0,105) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,117) size 784x18 [color=#000080] + RenderBlock {P} at (0,123) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 440x18 text run at (0,0) width 440: "This sentence should be in a monospace font." - RenderBlock {DIV} at (0,135) size 784x98 + RenderBlock {DIV} at (0,141) size 784x102 RenderBlock {P} at (0,0) size 784x15 [color=#000080] RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." - RenderBlock {P} at (0,15) size 784x17 [color=#000080] + RenderBlock {P} at (0,15) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 242x17 text run at (0,0) width 242: "This sentence should be in a serif font." - RenderBlock {P} at (0,32) size 784x17 [color=#000080] + RenderBlock {P} at (0,33) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 311x17 text run at (0,0) width 311: "This sentence should be in a sans-serif font." - RenderBlock {P} at (0,49) size 784x17 [color=#000080] + RenderBlock {P} at (0,51) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a cursive font." - RenderBlock {P} at (0,66) size 784x17 [color=#000080] + RenderBlock {P} at (0,69) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 260x17 text run at (0,0) width 260: "This sentence should be in a fantasy font." - RenderBlock {P} at (0,83) size 784x15 [color=#000080] + RenderBlock {P} at (0,87) size 784x15 [color=#000080] RenderText {#text} at (0,0) size 352x15 text run at (0,0) width 352: "This sentence should be in a monospace font." diff --git a/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.png index 9bf17c62a4fc..be8b4f1c61b8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.txt index bbea6cdc91b3..ce83d19b704f 100644 --- a/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1504-c523-font-style-00-b-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 215x17 text run at (0,0) width 215: "This sentence should be in italics. " RenderInline {SPAN} at (0,0) size 203x17 RenderText {#text} at (215,0) size 203x17 text run at (215,0) width 203: "This sentence should be normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,33) size 784x17 [color=#000080] + RenderBlock {P} at (0,34) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 205x17 text run at (0,0) width 205: "This sentence should be oblique." - RenderBlock {P} at (0,66) size 784x17 [color=#000080] + RenderBlock {P} at (0,68) size 784x18 [color=#000080] RenderInline {I} at (0,0) size 203x17 RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This sentence should be normal." diff --git a/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.png index 613f60435007..6444ad620abe 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.txt index e5a0d70771ba..de803a797795 100644 --- a/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1505-c524-font-var-00-b-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x82 - RenderBlock {HTML} at (0,0) size 800x82 - RenderBody {BODY} at (8,16) size 784x50 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x84 + RenderBlock {HTML} at (0,0) size 800x84 + RenderBody {BODY} at (8,16) size 784x52 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 268x17 text run at (0,0) width 268: "This Paragraph should be in Small Caps." - RenderBlock {P} at (0,33) size 784x17 [color=#000080] + RenderBlock {P} at (0,34) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 263x17 text run at (0,0) width 263: "This Sentence should be in Small Caps. " RenderInline {SPAN} at (0,0) size 210x17 diff --git a/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.png index 645500f205ab..38ce65f4b629 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.txt index d9cc5df7d622..4ac385135fa4 100644 --- a/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1506-c525-font-wt-00-b-expected.txt @@ -1,44 +1,44 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x428 - RenderBlock {HTML} at (0,0) size 800x428 - RenderBody {BODY} at (8,16) size 784x396 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x440 + RenderBlock {HTML} at (0,0) size 800x440 + RenderBody {BODY} at (8,16) size 784x408 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This sentence should be normal." - RenderBlock {P} at (0,33) size 784x17 [color=#000080] + RenderBlock {P} at (0,34) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 300x17 text run at (0,0) width 300: "This sentence should be bolder than normal." - RenderBlock {P} at (0,66) size 784x17 [color=#000080] + RenderBlock {P} at (0,68) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 198x17 text run at (0,0) width 198: "This sentence should be bold." - RenderBlock {H4} at (0,104) size 784x18 [color=#000080] + RenderBlock {H4} at (0,107) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 202x17 text run at (0,0) width 202: "Whatever this line looks like..." - RenderBlock {H4} at (0,142) size 784x18 [color=#000080] + RenderBlock {H4} at (0,146) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 290x17 text run at (0,0) width 290: "...this line should look bolder (or the same)." - RenderBlock {P} at (0,180) size 784x18 [color=#000080] + RenderBlock {P} at (0,185) size 784x19 [color=#000080] RenderInline {B} at (0,0) size 203x17 RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This sentence should be normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,213) size 784x18 [color=#000080] + RenderBlock {P} at (0,219) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 219x17 text run at (0,0) width 219: "This sentence should be very light." - RenderBlock {P} at (0,246) size 784x18 [color=#000080] + RenderBlock {P} at (0,253) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 335x17 text run at (0,0) width 335: "This sentence should be slightly bolder (or the same)." - RenderBlock {P} at (0,279) size 784x18 [color=#000080] + RenderBlock {P} at (0,287) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 373x17 text run at (0,0) width 373: "This sentence should be slightly bolder again (or the same)." - RenderBlock {P} at (0,312) size 784x18 [color=#000080] + RenderBlock {P} at (0,321) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 417x17 text run at (0,0) width 417: "This sentence should be slightly bolder still (but not the same)." - RenderBlock {P} at (0,345) size 784x18 [color=#000080] + RenderBlock {P} at (0,355) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 509x17 text run at (0,0) width 509: "This sentence should be the most bold (and maybe the same as the last one)." - RenderBlock {P} at (0,378) size 784x18 [color=#000080] + RenderBlock {P} at (0,389) size 784x19 [color=#000080] RenderText {#text} at (0,0) size 202x17 text run at (0,0) width 202: "This sentence should be bold. " RenderInline {SPAN} at (0,0) size 203x17 diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.png index bc6e72c0a775..b7817b8e8d69 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.txt index 2c8fee9a69b2..ad1654c53097 100644 --- a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-00-b-expected.txt @@ -1,56 +1,56 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x313 - RenderBlock {HTML} at (0,0) size 800x313 - RenderBody {BODY} at (8,10) size 784x293 - RenderBlock {P} at (10,0) size 764x17 [color=#000080] +layer at (0,0) size 800x323 + RenderBlock {HTML} at (0,0) size 800x323 + RenderBody {BODY} at (8,10) size 784x303 + RenderBlock {P} at (10,0) size 764x18 [color=#000080] RenderText {#text} at (0,0) size 203x17 text run at (0,0) width 203: "This sentence should be normal." - RenderBlock {P} at (10,27) size 764x17 [color=#000080] + RenderBlock {P} at (10,28) size 764x18 [color=#000080] RenderText {#text} at (0,0) size 214x17 text run at (0,0) width 214: "This sentence should be the same." - RenderBlock {P} at (10,54) size 764x21 [color=#000080] + RenderBlock {P} at (10,56) size 764x22 [color=#000080] RenderText {#text} at (0,0) size 333x21 text run at (0,0) width 333: "This sentence should be larger than normal." - RenderBlock {P} at (10,85) size 764x15 [color=#000080] + RenderBlock {P} at (10,88) size 764x16 [color=#000080] RenderText {#text} at (0,0) size 243x15 text run at (0,0) width 243: "This sentence should be smaller than normal." - RenderBlock {P} at (10,110) size 764x17 [color=#000080] + RenderBlock {P} at (10,114) size 764x18 [color=#000080] RenderText {#text} at (0,6) size 139x10 text run at (0,6) width 139: "This sentence should be very small. " RenderInline {SPAN} at (0,0) size 253x17 RenderText {#text} at (139,0) size 253x17 text run at (139,0) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (10,137) size 764x17 [color=#000080] + RenderBlock {P} at (10,142) size 764x18 [color=#000080] RenderText {#text} at (0,5) size 152x11 text run at (0,5) width 152: "This sentence should be rather small. " RenderInline {SPAN} at (0,0) size 253x17 RenderText {#text} at (152,0) size 253x17 text run at (152,0) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (10,164) size 764x17 [color=#000080] + RenderBlock {P} at (10,170) size 764x18 [color=#000080] RenderText {#text} at (0,2) size 168x15 text run at (0,2) width 168: "This sentence should be small. " RenderInline {SPAN} at (0,0) size 253x17 RenderText {#text} at (168,0) size 253x17 text run at (168,0) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (10,191) size 764x20 [color=#000080] + RenderBlock {P} at (10,198) size 764x21 [color=#000080] RenderText {#text} at (0,0) size 225x20 text run at (0,0) width 225: "This sentence should be large. " RenderInline {SPAN} at (0,0) size 253x17 RenderText {#text} at (225,2) size 253x17 text run at (225,2) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (10,221) size 764x26 [color=#000080] + RenderBlock {P} at (10,229) size 764x27 [color=#000080] RenderText {#text} at (0,0) size 362x26 text run at (0,0) width 362: "This sentence should be rather large. " RenderInline {SPAN} at (0,0) size 253x17 RenderText {#text} at (362,7) size 253x17 text run at (362,7) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (10,257) size 764x36 [color=#000080] + RenderBlock {P} at (10,266) size 764x37 [color=#000080] RenderText {#text} at (0,0) size 458x36 text run at (0,0) width 458: "This sentence should be very large. " RenderInline {SPAN} at (0,0) size 253x17 diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.png index 9864a78e3fcf..081f918ddceb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.txt index 4e1b5697a7c1..b14417a7ca01 100644 --- a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-01-b-a-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x345 - RenderBlock {HTML} at (0,0) size 800x345 - RenderBody {BODY} at (8,16) size 784x321 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x346 + RenderBlock {HTML} at (0,0) size 800x346 + RenderBody {BODY} at (8,16) size 784x322 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 472x17 text run at (0,0) width 472: "There should be a solid single uninterrupted smooth column of blue below." - RenderBlock {DIV} at (96,33) size 592x48 [color=#000080] + RenderBlock {DIV} at (96,34) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" - RenderBlock {DIV} at (96,81) size 592x48 [color=#000080] + RenderBlock {DIV} at (96,82) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" - RenderBlock {DIV} at (96,129) size 592x48 [color=#000080] + RenderBlock {DIV} at (96,130) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" - RenderBlock {DIV} at (96,177) size 592x48 [color=#000080] + RenderBlock {DIV} at (96,178) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" - RenderBlock {DIV} at (96,225) size 592x48 [color=#000080] + RenderBlock {DIV} at (96,226) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" - RenderBlock {DIV} at (96,273) size 592x48 [color=#000080] + RenderBlock {DIV} at (96,274) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.png index 69c26a3e2a68..2171b84e705b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.txt index 45d656de22f6..d74c88b55faf 100644 --- a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-02-b-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x164 - RenderBlock {HTML} at (0,0) size 800x164 - RenderBody {BODY} at (8,16) size 784x140 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x165 + RenderBlock {HTML} at (0,0) size 800x165 + RenderBody {BODY} at (8,16) size 784x141 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 472x17 text run at (0,0) width 472: "There should be a solid single uninterrupted smooth column of blue below." - RenderBlock {DIV} at (0,33) size 784x107 [color=#000080] + RenderBlock {DIV} at (0,34) size 784x107 [color=#000080] RenderBlock {DIV} at (0,0) size 784x32 RenderText {#text} at (0,0) size 32x32 text run at (0,0) width 32: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.png index f98349186c76..1ef9b5f63a35 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.txt index e2767e0037e0..44ab8cd3da5b 100644 --- a/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1507-c526-font-sz-03-f-a-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x165 - RenderBlock {HTML} at (0,0) size 800x165 - RenderBody {BODY} at (8,16) size 784x139 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x166 + RenderBlock {HTML} at (0,0) size 800x166 + RenderBody {BODY} at (8,16) size 784x140 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "The two boxes below should be the same size." - RenderBlock {DIV} at (0,33) size 784x106 [color=#000080] + RenderBlock {DIV} at (0,34) size 784x106 [color=#000080] RenderBlock {P} at (30,0) size 724x48 RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" diff --git a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.png index a9ef5f1b8a4d..a45457305800 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.txt index 768856f5b7d2..f2d9287d40d9 100644 --- a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-00-b-a-expected.txt @@ -1,38 +1,38 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x297 - RenderBlock {HTML} at (0,0) size 800x297 - RenderBody {BODY} at (8,16) size 784x273 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x298 + RenderBlock {HTML} at (0,0) size 800x298 + RenderBody {BODY} at (8,16) size 784x274 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be a tall solid unbroken column of blue below." - RenderBlock {DIV} at (0,33) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,34) size 432x24 [color=#0000FF] RenderText {#text} at (0,0) size 48x24 text run at (0,0) width 48: " x" - RenderBlock {DIV} at (0,57) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,58) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,81) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,82) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,105) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,106) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,129) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,130) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,153) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,154) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,177) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,178) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,201) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,202) size 432x24 [color=#0000FF] RenderText {#text} at (31,0) size 25x24 text run at (31,0) width 25: "x" - RenderBlock {DIV} at (0,225) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,226) size 432x24 [color=#0000FF] RenderText {#text} at (24,0) size 24x24 text run at (24,0) width 24: "x" - RenderBlock {DIV} at (0,249) size 432x24 [color=#0000FF] + RenderBlock {DIV} at (0,250) size 432x24 [color=#0000FF] RenderText {#text} at (0,0) size 48x24 text run at (0,0) width 48: " x" diff --git a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.png b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.png index f3b4f8952a1a..c13d942ded8f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.txt index 2f605596bbd4..879f38ed4a40 100644 --- a/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1601-c547-indent-01-d-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x226 - RenderBlock {HTML} at (0,0) size 800x226 - RenderBody {BODY} at (8,16) size 784x202 - RenderBlock {P} at (0,0) size 784x34 [bgcolor=#00FFFF] - RenderText {#text} at (392,0) size 751x34 +layer at (0,0) size 800x236 + RenderBlock {HTML} at (0,0) size 800x236 + RenderBody {BODY} at (8,16) size 784x212 + RenderBlock {P} at (0,0) size 784x36 [bgcolor=#00FFFF] + RenderText {#text} at (392,0) size 751x35 text run at (392,0) width 359: "The first line of this sentence should be indented halfway" - text run at (0,17) width 66: "across the " - text run at (66,17) width 415: "page, but the rest of it should be flush with the normal left margin " - text run at (481,17) width 74: "of the page." - RenderBlock {P} at (0,50) size 784x68 [bgcolor=#00FFFF] + text run at (0,18) width 66: "across the " + text run at (66,18) width 415: "page, but the rest of it should be flush with the normal left margin " + text run at (481,18) width 74: "of the page." + RenderBlock {P} at (0,52) size 784x72 [bgcolor=#00FFFF] RenderText {#text} at (80,0) size 211x17 text run at (80,0) width 211: "Only the first line of this sentence" RenderBR {BR} at (291,0) size 0x17 - RenderText {#text} at (0,17) size 123x17 - text run at (0,17) width 123: "should be indented," - RenderBR {BR} at (123,17) size 0x17 - RenderText {#text} at (0,34) size 145x17 - text run at (0,34) width 145: "the others should all be" - RenderBR {BR} at (145,34) size 0x17 + RenderText {#text} at (0,18) size 123x17 + text run at (0,18) width 123: "should be indented," + RenderBR {BR} at (123,18) size 0x17 + RenderText {#text} at (0,36) size 145x17 + text run at (0,36) width 145: "the others should all be" + RenderBR {BR} at (145,36) size 0x17 RenderInline {EM} at (0,0) size 113x17 - RenderText {#text} at (0,51) size 113x17 - text run at (0,51) width 113: "aligned on the left" - RenderText {#text} at (113,51) size 100x17 - text run at (113,51) width 100: " of the window." - RenderBlock {DIV} at (0,134) size 196x68 [bgcolor=#00FFFF] - RenderText {#text} at (392,0) size 404x68 + RenderText {#text} at (0,54) size 113x17 + text run at (0,54) width 113: "aligned on the left" + RenderText {#text} at (113,54) size 100x17 + text run at (113,54) width 100: " of the window." + RenderBlock {DIV} at (0,140) size 196x72 [bgcolor=#00FFFF] + RenderText {#text} at (392,0) size 404x71 text run at (392,0) width 12: "X" - text run at (0,17) width 169: "The X on the previous line" - text run at (0,34) width 184: "should be centered across the" - text run at (0,51) width 56: "window." + text run at (0,18) width 169: "The X on the previous line" + text run at (0,36) width 184: "should be centered across the" + text run at (0,54) width 56: "window." diff --git a/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.png index 7907111a2664..a6e52cbdc393 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.txt index 7c72e62707ce..5e66095b7a7b 100644 --- a/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1602-c43-center-00-d-ag-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x102 - RenderBlock {HTML} at (0,0) size 800x102 - RenderBody {BODY} at (8,16) size 784x78 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x103 + RenderBlock {HTML} at (0,0) size 800x103 + RenderBody {BODY} at (8,16) size 784x79 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 413x17 text run at (0,0) width 413: "There should be a single small column of blue below with no red:" - RenderBlock {DIV} at (0,33) size 784x15 + RenderBlock {DIV} at (0,34) size 784x15 RenderImage {IMG} at (384,0) size 16x15 - RenderBlock {DIV} at (0,48) size 784x15 + RenderBlock {DIV} at (0,49) size 784x15 RenderImage {IMG} at (384,0) size 16x15 - RenderBlock {DIV} at (0,63) size 784x15 [color=#0000FF] + RenderBlock {DIV} at (0,64) size 784x15 [color=#0000FF] RenderText {#text} at (384,0) size 16x15 text run at (384,0) width 16: "X" diff --git a/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.png b/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.png index 22489a28fa3d..8ecf2696b01e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.png and b/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.txt b/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.txt index cd34bda4bf95..623e92be2b64 100644 --- a/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1602-c546-txt-align-00-b-expected.txt @@ -1,55 +1,55 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x369 - RenderBlock {HTML} at (0,0) size 800x369 - RenderBody {BODY} at (8,16) size 784x337 - RenderBlock {P} at (0,0) size 784x17 [color=#000080] +layer at (0,0) size 800x386 + RenderBlock {HTML} at (0,0) size 800x386 + RenderBody {BODY} at (8,16) size 784x354 + RenderBlock {P} at (0,0) size 784x18 [color=#000080] RenderText {#text} at (0,0) size 234x17 text run at (0,0) width 234: "This sentence should be left-justified." - RenderBlock {P} at (0,33) size 784x17 [color=#000080] + RenderBlock {P} at (0,34) size 784x18 [color=#000080] RenderText {#text} at (541,0) size 243x17 text run at (541,0) width 243: "This sentence should be right-justified." - RenderBlock {P} at (0,66) size 784x17 [color=#000080] + RenderBlock {P} at (0,68) size 784x18 [color=#000080] RenderText {#text} at (286,0) size 212x17 text run at (286,0) width 212: "This sentence should be centered." - RenderBlock {P} at (0,99) size 784x238 [color=#000080] + RenderBlock {P} at (0,102) size 784x252 [color=#000080] RenderText {#text} at (0,0) size 498x17 text run at (0,0) width 393: "This paragraph should be justified (the right and left margins " text run at (392,0) width 106: "should line up). " - RenderInline {SPAN} at (0,0) size 784x238 [color=#C0C0C0] - RenderText {#text} at (497,0) size 784x238 + RenderInline {SPAN} at (0,0) size 784x251 [color=#C0C0C0] + RenderText {#text} at (497,0) size 784x251 text run at (497,0) width 287: "This is just lovely dummy text. Dummy text." - text run at (0,17) width 57: "Dummy " - text run at (56,17) width 530: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (585,17) width 199: "This is just lovely dummy text." - text run at (0,34) width 350: "This is just lovely dummy text. Dummy text. Dummy " - text run at (349,34) width 435: "text. This is just lovely dummy text. This is just lovely dummy text." - text run at (0,51) width 89: "Dummy text. " - text run at (88,51) width 551: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (638,51) width 146: "text. This is just lovely" - text run at (0,68) width 380: "dummy text. This is just lovely dummy text. Dummy text. " - text run at (379,68) width 405: "This is just lovely dummy text. This is just lovely dummy text." - text run at (0,85) width 146: "Dummy text. Dummy " - text run at (145,85) width 526: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (670,85) width 114: "This is just lovely" - text run at (0,102) width 435: "dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (434,102) width 350: "text. This is just lovely dummy text. This is just lovely" - text run at (0,119) width 171: "dummy text. Dummy text. " - text run at (170,119) width 541: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (710,119) width 74: "text. This is" - text run at (0,136) width 459: "just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (458,136) width 326: "This is just lovely dummy text. This is just lovely" - text run at (0,153) width 227: "dummy text. Dummy text. Dummy " - text run at (226,153) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (741,153) width 43: "This is" - text run at (0,170) width 506: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (505,170) width 279: "text. This is just lovely dummy text. This is" - text run at (0,187) width 242: "just lovely dummy text. Dummy text. " - text run at (242,187) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy" - text run at (0,204) width 517: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (516,204) width 268: "This is just lovely dummy text. This is just" - text run at (0,221) width 269: "lovely dummy text. Dummy text. Dummy " - text run at (269,221) width 118: "text. Dummy text. " - RenderText {#text} at (387,221) size 381x17 - text run at (387,221) width 260: "This sentence should be at the end of the " - text run at (647,221) width 121: "block, not justified." + text run at (0,18) width 57: "Dummy " + text run at (56,18) width 530: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (585,18) width 199: "This is just lovely dummy text." + text run at (0,36) width 350: "This is just lovely dummy text. Dummy text. Dummy " + text run at (349,36) width 435: "text. This is just lovely dummy text. This is just lovely dummy text." + text run at (0,54) width 89: "Dummy text. " + text run at (88,54) width 551: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (638,54) width 146: "text. This is just lovely" + text run at (0,72) width 380: "dummy text. This is just lovely dummy text. Dummy text. " + text run at (379,72) width 405: "This is just lovely dummy text. This is just lovely dummy text." + text run at (0,90) width 146: "Dummy text. Dummy " + text run at (145,90) width 526: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (670,90) width 114: "This is just lovely" + text run at (0,108) width 435: "dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (434,108) width 350: "text. This is just lovely dummy text. This is just lovely" + text run at (0,126) width 171: "dummy text. Dummy text. " + text run at (170,126) width 541: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (710,126) width 74: "text. This is" + text run at (0,144) width 459: "just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (458,144) width 326: "This is just lovely dummy text. This is just lovely" + text run at (0,162) width 227: "dummy text. Dummy text. Dummy " + text run at (226,162) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (741,162) width 43: "This is" + text run at (0,180) width 506: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (505,180) width 279: "text. This is just lovely dummy text. This is" + text run at (0,198) width 242: "just lovely dummy text. Dummy text. " + text run at (242,198) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy" + text run at (0,216) width 517: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (516,216) width 268: "This is just lovely dummy text. This is just" + text run at (0,234) width 269: "lovely dummy text. Dummy text. Dummy " + text run at (269,234) width 118: "text. Dummy text. " + RenderText {#text} at (387,234) size 381x17 + text run at (387,234) width 260: "This sentence should be at the end of the " + text run at (647,234) width 121: "block, not justified." diff --git a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.png index d5e2f8d4a175..18404ed7faf3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt index 26317d9b5157..a17821c62d3e 100644 --- a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt @@ -1,42 +1,42 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x345 - RenderBlock {HTML} at (0,0) size 800x345 - RenderBody {BODY} at (8,16) size 784x321 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x346 + RenderBlock {HTML} at (0,0) size 800x346 + RenderBody {BODY} at (8,16) size 784x322 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 708x17 text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)." - RenderBlock {DIV} at (0,33) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,34) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 360x24 text run at (0,0) width 360: "x x x x x x" - RenderBlock {DIV} at (0,57) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,58) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 360x24 text run at (0,0) width 360: "x x x x x x" - RenderBlock {DIV} at (0,81) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,82) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 360x24 text run at (0,0) width 360: "x x x x x x" - RenderBlock {DIV} at (0,105) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,106) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" - RenderBlock {DIV} at (0,129) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,130) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" - RenderBlock {DIV} at (0,153) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,154) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" - RenderBlock {DIV} at (0,177) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,178) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" - RenderBlock {DIV} at (0,201) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,202) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" - RenderBlock {DIV} at (0,225) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,226) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" - RenderBlock {DIV} at (0,249) size 432x48 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,250) size 432x48 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 277x48 text run at (0,0) width 277: "xx xx" text run at (0,24) width 111: "xx" - RenderBlock {DIV} at (0,297) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (0,298) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 384x24 text run at (0,0) width 384: "xx xx xx" diff --git a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.png b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.png index 63f76b33ce68..c28b5ec585d7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.png and b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt index 04a3147179d8..8115727f3840 100644 --- a/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt @@ -1,30 +1,30 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x201 - RenderBlock {HTML} at (0,0) size 800x201 - RenderBody {BODY} at (8,16) size 784x177 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x202 + RenderBlock {HTML} at (0,0) size 800x202 + RenderBody {BODY} at (8,16) size 784x178 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 708x17 text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)." - RenderBlock {DIV} at (48,33) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (48,34) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 312x24 text run at (0,0) width 312: "x x xx xx" - RenderBlock {DIV} at (48,57) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (48,58) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 312x24 text run at (0,0) width 312: "x x xx xx" - RenderBlock {DIV} at (48,81) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (48,82) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 312x24 text run at (0,0) width 312: "x x xx xx" - RenderBlock {DIV} at (48,105) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (48,106) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 216x24 text run at (0,0) width 216: "xx " RenderInline {SPAN} at (0,0) size 120x24 RenderText {#text} at (216,0) size 120x24 text run at (216,0) width 120: "xx xx" RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (48,129) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (48,130) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 312x24 text run at (0,0) width 312: "x x xx xx" - RenderBlock {DIV} at (48,153) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] + RenderBlock {DIV} at (48,154) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 300x24 text run at (0,0) width 300: "x x x x x x" diff --git a/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.png index 13a6653d01d9..42535d96c7ab 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt index a808071e6ac0..157f30ba44e9 100644 --- a/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x189 - RenderBlock {HTML} at (0,0) size 800x189 - RenderBody {BODY} at (8,8) size 784x173 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x190 + RenderBlock {HTML} at (0,0) size 800x190 + RenderBody {BODY} at (8,8) size 784x174 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 227x17 text run at (0,0) width 227: "There should be a green box below." - RenderBlock {DIV} at (0,17) size 326x156 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,18) size 326x156 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (3,3) size 320x30 RenderText {#text} at (0,0) size 230x10 text run at (0,0) width 230: "Xx xx x. (x.x. XX) x x " diff --git a/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.png b/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.png index 55221bb9a87b..3e3d0fd36bcf 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.png and b/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt b/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt index 79e7c5446a8d..1f292f3731ba 100644 --- a/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x153 - RenderBlock {HTML} at (0,0) size 800x153 - RenderBody {BODY} at (8,16) size 784x129 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x154 + RenderBlock {HTML} at (0,0) size 800x154 + RenderBody {BODY} at (8,16) size 784x130 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 279x17 text run at (0,0) width 279: "There should be a single green block below." - RenderBlock {DIV} at (0,33) size 231x96 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] + RenderBlock {DIV} at (0,34) size 231x96 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (3,3) size 225x45 RenderText {#text} at (0,0) size 165x45 text run at (0,0) width 120: "x x x" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-00-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-00-d-expected.txt index 2b63b6613722..e386c9b8a510 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-00-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-00-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.png index 9a3a35c76d8f..e7a2cbbb8b8e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.txt index d4afd20042df..0f61bc11e786 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-01-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 155x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 155x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 150x165 RenderTableRow {TR} at (0,0) size 150x55 RenderTableCell {TD} at (0,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (50,16) size 50x23 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (100,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableRow {TR} at (0,55) size 150x55 RenderTableCell {TD} at (0,70) size 50x25 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" - RenderTableCell {TD} at (50,73) size 50x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,72) size 50x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (100,70) size 50x25 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 43x18 - text run at (1,5) width 43: "double" + RenderText {#text} at (1,4) size 43x17 + text run at (1,4) width 43: "double" RenderTableRow {TR} at (0,110) size 150x55 RenderTableCell {TD} at (0,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" - RenderTableCell {TD} at (50,127) size 50x21 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 43x17 - text run at (4,1) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,126) size 50x23 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 43x18 + text run at (4,2) width 43: "double" RenderTableCell {TD} at (100,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.png index 3e1fc542c76e..cb3f250fc3de 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.txt index 399befe5d0fd..175bbcb7a0a7 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-02-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 124x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 124x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 119x165 RenderTableRow {TR} at (0,0) size 119x55 RenderTableCell {TD} at (0,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (37,16) size 45x23 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (82,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableRow {TR} at (0,55) size 119x55 RenderTableCell {TD} at (0,70) size 37x25 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (37,73) size 45x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,72) size 45x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (82,70) size 37x25 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 30x18 - text run at (1,5) width 30: "solid" + RenderText {#text} at (1,4) size 30x17 + text run at (1,4) width 30: "solid" RenderTableRow {TR} at (0,110) size 119x55 RenderTableCell {TD} at (0,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (37,127) size 45x21 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 30x17 - text run at (4,1) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,126) size 45x23 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 30x18 + text run at (4,2) width 30: "solid" RenderTableCell {TD} at (82,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.png index d21e24d40909..7f288c117c4d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.txt index bad3acc7d026..b4193dfae6d2 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-03-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 158x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 153x165 RenderTableRow {TR} at (0,0) size 153x55 RenderTableCell {TD} at (0,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (51,16) size 51x23 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (102,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableRow {TR} at (0,55) size 153x55 RenderTableCell {TD} at (0,70) size 51x25 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (51,73) size 51x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,72) size 51x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (102,70) size 51x25 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 44x18 - text run at (1,5) width 44: "dashed" + RenderText {#text} at (1,4) size 44x17 + text run at (1,4) width 44: "dashed" RenderTableRow {TR} at (0,110) size 153x55 RenderTableCell {TD} at (0,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (51,127) size 51x21 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 44x17 - text run at (4,1) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,126) size 51x23 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 44x18 + text run at (4,2) width 44: "dashed" RenderTableCell {TD} at (102,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.png index 5c9f1c1489cd..76e6cce8f7c6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.txt index f34fecc83b37..75c103b27701 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-04-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 143x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 143x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 138x165 RenderTableRow {TR} at (0,0) size 138x55 RenderTableCell {TD} at (0,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (46,16) size 46x23 [border: (3px dotted #00FF00) none (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (92,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableRow {TR} at (0,55) size 138x55 RenderTableCell {TD} at (0,70) size 46x25 [border: (3px dotted #00FF00) none (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (46,73) size 46x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (46,72) size 46x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (92,70) size 46x25 [border: (3px dotted #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 39x18 - text run at (1,5) width 39: "dotted" + RenderText {#text} at (1,4) size 39x17 + text run at (1,4) width 39: "dotted" RenderTableRow {TR} at (0,110) size 138x55 RenderTableCell {TD} at (0,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (46,127) size 46x21 [border: none (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 39x17 - text run at (4,1) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (46,126) size 46x23 [border: none (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 39x18 + text run at (4,2) width 39: "dotted" RenderTableCell {TD} at (92,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.png index bd6836b7c34d..e9a5a52b6718 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.txt index a45a384dcfbc..4f1bbd1bdb06 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-05-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 128x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 128x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 123x165 RenderTableRow {TR} at (0,0) size 123x55 RenderTableCell {TD} at (0,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (39,16) size 45x23 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (84,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,55) size 123x55 RenderTableCell {TD} at (0,70) size 39x25 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (39,73) size 45x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,72) size 45x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (84,70) size 39x25 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 32x18 - text run at (1,5) width 32: "ridge" + RenderText {#text} at (1,4) size 32x17 + text run at (1,4) width 32: "ridge" RenderTableRow {TR} at (0,110) size 123x55 RenderTableCell {TD} at (0,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (39,127) size 45x21 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 32x17 - text run at (4,1) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,126) size 45x23 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 32x18 + text run at (4,2) width 32: "ridge" RenderTableCell {TD} at (84,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.png index 2ef16ca793d7..83711d6091c3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.txt index 3eaae0d5f405..2548a20fe370 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-06-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 138x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 138x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 133x165 RenderTableRow {TR} at (0,0) size 133x55 RenderTableCell {TD} at (0,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (44,16) size 45x23 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (89,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,55) size 133x55 RenderTableCell {TD} at (0,70) size 44x25 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (44,73) size 45x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,72) size 45x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (89,70) size 44x25 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 37x18 - text run at (1,5) width 37: "outset" + RenderText {#text} at (1,4) size 37x17 + text run at (1,4) width 37: "outset" RenderTableRow {TR} at (0,110) size 133x55 RenderTableCell {TD} at (0,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (44,127) size 45x21 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 37x17 - text run at (4,1) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,126) size 45x23 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 37x18 + text run at (4,2) width 37: "outset" RenderTableCell {TD} at (89,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.png index c1810a84b470..3c9998639395 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.txt index 3966fa0cd41d..cc80c3a2ed80 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-07-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 158x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 153x165 RenderTableRow {TR} at (0,0) size 153x55 RenderTableCell {TD} at (0,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (51,16) size 51x23 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (102,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableRow {TR} at (0,55) size 153x55 RenderTableCell {TD} at (0,70) size 51x25 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (51,73) size 51x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,72) size 51x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (102,70) size 51x25 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 44x18 - text run at (1,5) width 44: "groove" + RenderText {#text} at (1,4) size 44x17 + text run at (1,4) width 44: "groove" RenderTableRow {TR} at (0,110) size 153x55 RenderTableCell {TD} at (0,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (51,127) size 51x21 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 44x17 - text run at (4,1) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,126) size 51x23 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 44x18 + text run at (4,2) width 44: "groove" RenderTableCell {TD} at (102,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.png index 033dd55670a7..310a317857c9 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.txt index 01ef1e3c5a78..c7f914b64c73 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-08-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 122x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 122x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 117x165 RenderTableRow {TR} at (0,0) size 117x55 RenderTableCell {TD} at (0,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (36,16) size 45x23 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (81,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableRow {TR} at (0,55) size 117x55 RenderTableCell {TD} at (0,70) size 36x25 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (36,73) size 45x19 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x17 - text run at (1,1) width 43: "hidden" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,72) size 45x21 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x18 + text run at (1,2) width 43: "hidden" RenderTableCell {TD} at (81,70) size 36x25 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 29x18 - text run at (1,5) width 29: "inset" + RenderText {#text} at (1,4) size 29x17 + text run at (1,4) width 29: "inset" RenderTableRow {TR} at (0,110) size 117x55 RenderTableCell {TD} at (0,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (36,127) size 45x21 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,1) size 29x17 - text run at (4,1) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,126) size 45x23 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,1) size 29x18 + text run at (4,2) width 29: "inset" RenderTableCell {TD} at (81,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-09-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-09-d-expected.txt index 1ae9e581ed18..2e16625cb3a6 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-09-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-09-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 111x150 + RenderTable {TABLE} at (0,34) size 111x150 RenderTableSection {TBODY} at (0,0) size 111x150 RenderTableRow {TR} at (0,0) size 111x50 RenderTableCell {TD} at (0,15) size 33x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (33,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (78,15) size 33x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableRow {TR} at (0,50) size 111x50 RenderTableCell {TD} at (0,65) size 33x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (33,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (78,65) size 33x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableRow {TR} at (0,100) size 111x50 RenderTableCell {TD} at (0,115) size 33x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (33,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (78,115) size 33x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-10-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-10-d-expected.txt index ed34e89ba963..1ddbd4e54aaf 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-10-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-10-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "double" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "double" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.png index 020ecfffcc13..536e9ba42cb3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.txt index 783757ff42c4..b90f72b4fa97 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-11-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 165x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 165x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 160x175 RenderTableRow {TR} at (0,0) size 160x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 55x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (108,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 55x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (108,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 160x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (108,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (108,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 160x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 55x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (108,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.png index 539d107398f2..8850ed907d7b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.txt index 511d0e1041eb..80a68144c078 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-12-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 139x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 139x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 134x175 RenderTableRow {TR} at (0,0) size 134x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 55x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (95,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 55x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (95,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 134x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (95,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (95,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 134x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 55x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (95,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png index bf61157f66f9..bd2bb511e5fd 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt index a5c5a7553b7e..c02862d02e8d 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-13-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 167x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 167x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 162x175 RenderTableRow {TR} at (0,0) size 162x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 55x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (109,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 55x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (109,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 162x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (109,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (109,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 162x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 55x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (109,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png index 86a7c9a54388..5c50a81b6206 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt index f2093a2aa565..6544aeef530a 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-14-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 157x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 157x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 152x175 RenderTableRow {TR} at (0,0) size 152x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 55x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (104,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 55x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (104,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 152x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (104,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (104,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 152x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 55x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (104,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png index 2140693ea603..0be0de350966 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt index 564287d52194..9805afd554c4 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-15-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 143x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 143x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 138x175 RenderTableRow {TR} at (0,0) size 138x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 55x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (97,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 55x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (97,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 138x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (97,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (97,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 138x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 55x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (97,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png index a61e323682a3..657df1074563 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt index 9b581c195d65..ca51b061ead9 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-16-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 153x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 153x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 148x175 RenderTableRow {TR} at (0,0) size 148x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 55x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (102,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 55x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (102,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 148x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (102,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (102,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 148x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 55x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (102,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png index 6924165221ce..3c89cb475c24 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt index 31c67e836ee6..25b232fd42a9 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-17-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 167x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 167x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 162x175 RenderTableRow {TR} at (0,0) size 162x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 55x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (109,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 55x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (109,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 162x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (109,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (109,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 162x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 55x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (109,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png index 359e2bc5d99e..b22c1a4e1e6c 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt index 371e421adea1..22bcd6f93125 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-18-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 137x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 137x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 132x175 RenderTableRow {TR} at (0,0) size 132x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 55x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (94,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 55x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (94,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 132x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" - RenderTableCell {TD} at (94,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (94,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 132x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 55x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (94,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png index 722ae6db0261..e00c491d2934 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt index 81f67ed2ad40..538ff3205938 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-19-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 131x170 + RenderTable {TABLE} at (0,34) size 131x170 RenderTableSection {TBODY} at (0,0) size 131x170 RenderTableRow {TR} at (0,0) size 131x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 55x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (93,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 55x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 131x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (93,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 131x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 55x30 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x18 - text run at (6,7) width 43: "double" + RenderText {#text} at (6,6) size 43x17 + text run at (6,6) width 43: "double" RenderTableCell {TD} at (93,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 131x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 55x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (93,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (93,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt index 00e1781f2008..25acc00622b5 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-20-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 30x18 - text run at (1,2) width 30: "solid" + RenderText {#text} at (1,1) size 30x17 + text run at (1,1) width 30: "solid" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png index 76b7ec998951..880f7f4244c8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt index 2360250df5a3..5ffd814ea167 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-21-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 160x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 155x175 RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (103,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 50x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (103,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 155x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png index cf6d8fee82ca..50a4da56fe5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt index 048418fd3bbf..c431d2b18f2d 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-22-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 126x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 126x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 121x175 RenderTableRow {TR} at (0,0) size 121x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 42x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (82,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 42x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (82,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 121x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (82,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (82,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 121x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 42x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (82,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png index 5370395175f4..482161223e48 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt index dccd1f670c91..d8d23134a15c 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-23-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png index fed2bbab3301..987639e3c285 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt index 52c6e0497b43..176c9c4d266e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-24-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 148x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 148x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 143x175 RenderTableRow {TR} at (0,0) size 143x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (95,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 143x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 46x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (95,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 143x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 46x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (95,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png index fb70607a37b4..424263efe199 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt index 06a3a0e7d9cb..f7edaccf727a 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-25-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 130x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 130x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 125x175 RenderTableRow {TR} at (0,0) size 125x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (84,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (84,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 125x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (84,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (84,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 125x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 42x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (84,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png index 9073f8363def..6c4883125c5d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt index 0c7ec6eff910..1981eec8a396 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-26-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 142x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 142x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 137x175 RenderTableRow {TR} at (0,0) size 137x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (91,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 137x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 44x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (91,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 137x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 44x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (91,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png index 1cc378a1b27d..0ea391f0ef7d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt index 1ffe1a94a061..e40eaba2dd20 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-27-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png index 52ed7ba739e3..1c4e64551e49 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt index 7440d3a40899..b46239789348 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-28-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 124x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 124x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 119x175 RenderTableRow {TR} at (0,0) size 119x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 42x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (81,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 42x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (81,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 119x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" - RenderTableCell {TD} at (81,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (81,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 119x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 42x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (81,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png index 243e23ed9c9a..0c7f96da0364 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt index 12400cd517aa..3b95667b8367 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-29-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 118x170 + RenderTable {TABLE} at (0,34) size 118x170 RenderTableSection {TBODY} at (0,0) size 118x170 RenderTableRow {TR} at (0,0) size 118x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 42x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (80,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 42x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 118x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (80,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 118x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 42x30 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x18 - text run at (6,7) width 30: "solid" + RenderText {#text} at (6,6) size 30x17 + text run at (6,6) width 30: "solid" RenderTableCell {TD} at (80,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 118x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 42x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (80,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (80,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt index a5e952e8c330..53936cf4aa62 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-30-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 136x150 + RenderTable {TABLE} at (0,34) size 136x150 RenderTableSection {TBODY} at (0,0) size 136x150 RenderTableRow {TR} at (0,0) size 136x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 46x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (91,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 136x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 46x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 44x18 - text run at (1,2) width 44: "dashed" + RenderText {#text} at (1,1) size 44x17 + text run at (1,1) width 44: "dashed" RenderTableCell {TD} at (91,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 136x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 46x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (91,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png index 8f7a169779fe..17e7eb294cf6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt index 380ee23b40ec..797d89684671 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-31-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 166x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 166x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 161x175 RenderTableRow {TR} at (0,0) size 161x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 56x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (109,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 56x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (109,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 161x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (109,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (109,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 161x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 56x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (109,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png index ecd2a613cca2..7a4e82e58007 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt index 43e0fd3e58ef..da21b880779e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-32-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 140x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 140x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 135x175 RenderTableRow {TR} at (0,0) size 135x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 56x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (96,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 56x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (96,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 135x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (96,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (96,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 135x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 56x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (96,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png index 1af118c3feb7..6dd90e1143ea 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt index b43bedbbf854..67562760e3ec 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-33-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 168x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 163x175 RenderTableRow {TR} at (0,0) size 163x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 56x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (110,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 56x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (110,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 163x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (110,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (110,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 163x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 56x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (110,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png index 6f35e2ac7839..3a45e3c6d5c2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt index 6aac9ede6efe..24ac2fbd6b2d 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-34-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 158x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 158x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 153x175 RenderTableRow {TR} at (0,0) size 153x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 56x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (105,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 56x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (105,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 153x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (105,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (105,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 153x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 56x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (105,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png index fc6addac1988..c7b71ddd2471 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt index 94232f9c8ea2..b3a3f1800909 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-35-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 144x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 144x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 139x175 RenderTableRow {TR} at (0,0) size 139x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 56x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (98,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 56x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (98,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 139x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (98,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (98,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 139x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 56x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (98,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png index b4da503cd0dd..d84d920967c8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt index 88e9472f6404..ba1cae5062f0 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-36-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 154x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 154x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 149x175 RenderTableRow {TR} at (0,0) size 149x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 56x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (103,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 56x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (103,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 149x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (103,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (103,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 149x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 56x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (103,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png index b478f4780911..80a155e27247 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt index 888b96d51067..ba3362c816ef 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-37-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 168x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 163x175 RenderTableRow {TR} at (0,0) size 163x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 56x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (110,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 56x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (110,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 163x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (110,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (110,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 163x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 56x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (110,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png index f991d69d14ae..41fefce3f3a0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt index e42ac8b12a0e..3144b89e3415 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-38-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 138x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 138x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 133x175 RenderTableRow {TR} at (0,0) size 133x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 56x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (95,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 56x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (95,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 133x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" - RenderTableCell {TD} at (95,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (95,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 133x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 56x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (95,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png index a6b384257439..4e5a29924a19 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt index 6edfd99d39da..d03670eb9d24 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-39-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 132x170 + RenderTable {TABLE} at (0,34) size 132x170 RenderTableSection {TBODY} at (0,0) size 132x170 RenderTableRow {TR} at (0,0) size 132x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 56x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (94,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 56x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 132x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (94,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 132x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 56x30 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "dashed" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "dashed" RenderTableCell {TD} at (94,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 132x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 56x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (94,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (94,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt index 45cff26306e2..25c20c34b0dd 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-40-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 39x18 - text run at (1,2) width 39: "dotted" + RenderText {#text} at (1,1) size 39x17 + text run at (1,1) width 39: "dotted" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png index 767d7ef1e2e5..2729135ccbb7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt index 622d18c304ca..d6e3a48467c9 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-41-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 161x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 161x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 156x175 RenderTableRow {TR} at (0,0) size 156x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (104,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (104,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 156x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (104,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (104,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 156x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 51x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (104,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png index 05bb6cf94453..8d48b09f25d1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt index 7c94da93a380..8bd64cb7eec2 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-42-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 135x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 130x175 RenderTableRow {TR} at (0,0) size 130x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 51x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (91,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 51x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (91,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 130x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (91,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (91,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 130x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 51x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (91,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png index 611039ea9436..a69cec9296d7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt index 11390afec413..dacc968fa5d5 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-43-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png index 0775417bf00f..cd06068b832e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt index e894d03b374c..109180150f05 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-44-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 153x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 153x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 148x175 RenderTableRow {TR} at (0,0) size 148x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 51x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (100,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 51x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (100,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 148x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (100,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (100,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 148x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 51x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (100,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png index 1ddfb53b6505..36c21dab3aae 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt index 8bc8db41991e..1953c4882dc8 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-45-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 139x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 139x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 134x175 RenderTableRow {TR} at (0,0) size 134x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 51x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (93,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 51x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (93,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 134x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (93,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (93,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 134x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 51x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (93,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png index 09345e229296..964224e4a8b0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt index 931524128e7d..1c0b7f1e3912 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-46-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 149x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 149x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 144x175 RenderTableRow {TR} at (0,0) size 144x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 51x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (98,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 51x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (98,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 144x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (98,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (98,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 144x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 51x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (98,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png index 326b0f62d618..7e5080e08fd7 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt index 6a20aa40dd30..a1ca84e5859b 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-47-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png index 342e56fd1bf9..70f82f7540fa 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt index 212786da8ebd..f1a281995797 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-48-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 133x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 133x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 128x175 RenderTableRow {TR} at (0,0) size 128x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 51x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (90,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 51x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (90,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 128x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" - RenderTableCell {TD} at (90,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" + RenderTableCell {TD} at (90,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 128x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 51x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (90,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png index c6cdef3db842..fd68fb911581 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt index 21af1919fc94..ce6bf0d20c3e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-49-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 127x170 + RenderTable {TABLE} at (0,34) size 127x170 RenderTableSection {TBODY} at (0,0) size 127x170 RenderTableRow {TR} at (0,0) size 127x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 51x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (89,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 51x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 127x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (89,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 127x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 51x30 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 39x18 - text run at (6,7) width 39: "dotted" + RenderText {#text} at (6,6) size 39x17 + text run at (6,6) width 39: "dotted" RenderTableCell {TD} at (89,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 127x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 51x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (89,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (89,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt index a90d8f5f4db9..69b61f8e89bf 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-50-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 32x18 - text run at (1,2) width 32: "ridge" + RenderText {#text} at (1,1) size 32x17 + text run at (1,1) width 32: "ridge" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png index 3533f78a1416..3215eca273ba 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt index 885e08642267..28b9dad45551 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-51-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 160x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 155x175 RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (103,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 50x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (103,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 155x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png index fdd1b822f48f..b17bd95ccc1f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt index 10a2f9c6a440..28a38a58fa87 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-52-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 128x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 128x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 123x175 RenderTableRow {TR} at (0,0) size 123x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (84,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 44x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (84,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 123x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (84,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (84,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 123x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 44x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (84,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png index 9c7186c8e305..60cd6dd27674 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt index 8c814f372374..0f651df71677 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-53-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png index a56afa1168f4..24fbf8beca1b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt index 062c6ef50a72..c407dbf0800c 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-54-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 148x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 148x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 143x175 RenderTableRow {TR} at (0,0) size 143x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (95,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 143x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 46x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (95,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 143x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 46x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (95,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png index aab72d6d4895..b00cef435483 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt index 11196fb8f4e9..d30b45fb519a 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-55-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 132x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 132x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 127x175 RenderTableRow {TR} at (0,0) size 127x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 44x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (86,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 44x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (86,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 127x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (86,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (86,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 127x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 44x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (86,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png index 0a5131fa552e..9a9189de9114 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt index d24f8d8dd213..f1cb1540b58e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-56-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 142x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 142x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 137x175 RenderTableRow {TR} at (0,0) size 137x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (91,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 137x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (91,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 137x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 44x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (91,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png index df0e62faf48e..682bfb89dd9d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt index d1555d8813bd..153270812810 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-57-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png index 0a92ecc776cc..37bd04797efa 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt index a374d0850577..ab92f42c5350 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-58-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 126x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 126x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 121x175 RenderTableRow {TR} at (0,0) size 121x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (83,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 44x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (83,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 121x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" - RenderTableCell {TD} at (83,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (83,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 121x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 44x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (83,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png index 8dbae958b06a..9b0e472ef41e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt index 4c050d055b28..80b282d849c9 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-59-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 120x170 + RenderTable {TABLE} at (0,34) size 120x170 RenderTableSection {TBODY} at (0,0) size 120x170 RenderTableRow {TR} at (0,0) size 120x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 44x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (82,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 44x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 120x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (82,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 120x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 44x30 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 32x18 - text run at (6,7) width 32: "ridge" + RenderText {#text} at (6,6) size 32x17 + text run at (6,6) width 32: "ridge" RenderTableCell {TD} at (82,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 120x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 44x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (82,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (82,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt index 98a7649b0745..d3afc8743cbb 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-60-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 37x18 - text run at (1,2) width 37: "outset" + RenderText {#text} at (1,1) size 37x17 + text run at (1,1) width 37: "outset" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png index d23fab8cb212..84bb764c3a47 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt index 892a84205dc8..37320c8a2e39 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-61-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 160x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 155x175 RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (103,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 50x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (103,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 155x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png index 53132d8b7fed..a39a7ba43287 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt index ba30b5dbe9e2..7bf53b023b0e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-62-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 133x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 133x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 128x175 RenderTableRow {TR} at (0,0) size 128x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 49x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (89,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 49x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (89,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 128x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (89,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (89,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 128x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 49x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (89,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png index b4df7dd90167..11d850b80758 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt index 52e777bb825b..b31120d5a9da 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-63-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png index 19555a48b9c3..6e133db7415e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt index 98fb277d8f09..24c79dac738e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-64-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 151x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 151x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 146x175 RenderTableRow {TR} at (0,0) size 146x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (98,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (98,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 146x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (98,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (98,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 146x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 49x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (98,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png index fdfb4d0ae469..bfa7a33b474a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt index e66ada0b5da1..5aa059062769 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-65-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 137x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 137x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 132x175 RenderTableRow {TR} at (0,0) size 132x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 49x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (91,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 49x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (91,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 132x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (91,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (91,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 132x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 49x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (91,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png index 348c855910ab..ec5841fddfc0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt index 7f72560ecb98..be004d6e4efb 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-66-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 147x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 147x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 142x175 RenderTableRow {TR} at (0,0) size 142x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 49x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (96,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 49x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (96,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 142x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (96,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (96,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 142x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 49x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (96,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png index aebb4e649bd6..8cbb1afb5b1e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt index af95cfa85d9b..c556d8e64b99 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-67-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png index 7b7353ccd359..92f0ad610b40 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt index 576b491e297d..b0267a65b5e7 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-68-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 131x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 131x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 126x175 RenderTableRow {TR} at (0,0) size 126x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 49x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (88,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 49x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (88,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 126x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" - RenderTableCell {TD} at (88,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (88,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 126x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 49x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (88,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png index 6a1f30d1ad09..0c97542e6f29 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt index ebdc94a61fd0..b96adbada6d2 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-69-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 125x170 + RenderTable {TABLE} at (0,34) size 125x170 RenderTableSection {TBODY} at (0,0) size 125x170 RenderTableRow {TR} at (0,0) size 125x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 49x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (87,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 49x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 125x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (87,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 125x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 49x30 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 37x18 - text run at (6,7) width 37: "outset" + RenderText {#text} at (6,6) size 37x17 + text run at (6,6) width 37: "outset" RenderTableCell {TD} at (87,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 125x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 49x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (87,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (87,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt index 1067f2406ab5..ed79906e406f 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-70-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 136x150 + RenderTable {TABLE} at (0,34) size 136x150 RenderTableSection {TBODY} at (0,0) size 136x150 RenderTableRow {TR} at (0,0) size 136x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 46x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (91,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 136x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 46x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 44x18 - text run at (1,2) width 44: "groove" + RenderText {#text} at (1,1) size 44x17 + text run at (1,1) width 44: "groove" RenderTableCell {TD} at (91,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 136x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 46x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (91,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png index 4cfd370f79f8..3589cb7f0098 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt index 81c9376fe725..73f051f2485f 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-71-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 166x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 166x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 161x175 RenderTableRow {TR} at (0,0) size 161x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 56x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (109,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 56x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (109,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 161x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (109,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (109,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 161x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 56x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (109,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png index d3900e3cfdfc..9c63550a8bb3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt index 0ad5fee4723a..85dc6642458d 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-72-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 140x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 140x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 135x175 RenderTableRow {TR} at (0,0) size 135x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 56x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (96,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 56x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (96,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 135x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (96,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (96,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 135x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 56x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (96,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png index 284e0d2fc5a7..9edc1677271d 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt index d5c2e4406c71..60a592ceffd3 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-73-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 168x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 163x175 RenderTableRow {TR} at (0,0) size 163x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 56x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (110,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 56x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (110,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 163x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (110,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (110,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 163x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 56x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (110,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png index 67ad62e5bfb2..4ee0da57034a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt index 67788c3c8c5c..781fe1a8ef8f 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-74-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 158x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 158x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 153x175 RenderTableRow {TR} at (0,0) size 153x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 56x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (105,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 56x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (105,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 153x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (105,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (105,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 153x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 56x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (105,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png index 85c8453a8d3c..1b3fdf51680f 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt index 707165a29c4b..7e6e9cd8495c 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-75-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 144x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 144x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 139x175 RenderTableRow {TR} at (0,0) size 139x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 56x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (98,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 56x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (98,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 139x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (98,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (98,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 139x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 56x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (98,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png index 4bef19358b4d..f1c9b50cd547 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt index e844bf36219e..cff988df9a74 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-76-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 154x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 154x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 149x175 RenderTableRow {TR} at (0,0) size 149x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 56x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (103,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 56x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (103,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 149x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (103,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (103,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 149x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 56x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (103,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png index 1879682c78eb..47211db3ea20 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt index 39276b791ddf..2aa01a82dbb0 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-77-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 168x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 168x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 163x175 RenderTableRow {TR} at (0,0) size 163x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 56x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (110,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 56x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (110,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 163x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (110,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (110,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 163x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 56x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (110,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png index 9aca0edcfa0f..0ff5e7dcb86b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt index b14d62f35ecf..6df7462f86dc 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-78-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 138x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 138x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 133x175 RenderTableRow {TR} at (0,0) size 133x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 56x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (95,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 56x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (95,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 133x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" - RenderTableCell {TD} at (95,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (95,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 133x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 56x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (95,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png index d0f7056b3e50..b00f5716c015 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt index e7a0dd8a4da6..b80062c3fc02 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-79-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 132x170 + RenderTable {TABLE} at (0,34) size 132x170 RenderTableSection {TBODY} at (0,0) size 132x170 RenderTableRow {TR} at (0,0) size 132x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 56x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (94,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 56x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 132x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (94,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 132x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 56x30 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 44x18 - text run at (6,7) width 44: "groove" + RenderText {#text} at (6,6) size 44x17 + text run at (6,6) width 44: "groove" RenderTableCell {TD} at (94,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 132x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 56x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (94,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (94,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt index 0c4f900df8bb..02c91d911805 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-80-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x18 - text run at (1,2) width 29: "inset" + RenderText {#text} at (1,1) size 29x17 + text run at (1,1) width 29: "inset" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png index efb8c95c6db3..8d63a3eb4fd0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt index 2e2401b40f4d..0be39063298c 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-81-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 160x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 160x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 155x175 RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,17) size 53x24 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" - RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 53x26 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 43x18 text run at (4,5) width 43: "double" - RenderTableCell {TD} at (103,17) size 52x24 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (53,15) size 50x28 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 43x17 text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,16) size 52x26 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,76) size 53x24 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x17 - text run at (4,4) width 43: "double" + RenderTableCell {TD} at (0,75) size 53x26 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x18 + text run at (4,5) width 43: "double" RenderTableCell {TD} at (53,73) size 50x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (103,76) size 52x24 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 43x17 - text run at (6,4) width 43: "double" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (103,75) size 52x26 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 43x18 + text run at (6,5) width 43: "double" RenderTableRow {TR} at (0,118) size 155x57 RenderTableCell {TD} at (0,134) size 53x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (53,133) size 50x27 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x18 - text run at (4,7) width 43: "double" + RenderText {#text} at (4,6) size 43x17 + text run at (4,6) width 43: "double" RenderTableCell {TD} at (103,134) size 52x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png index dfbf65f5906b..319994e36ae0 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt index 51096bac1584..674c653f0805 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-82-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 125x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 125x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 120x175 RenderTableRow {TR} at (0,0) size 120x58 - RenderTableCell {TD} at (0,17) size 40x24 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" - RenderTableCell {TD} at (40,15) size 41x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 40x26 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 30x18 text run at (4,5) width 30: "solid" - RenderTableCell {TD} at (81,17) size 39x24 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (40,15) size 41x28 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 30x17 text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (81,16) size 39x26 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableRow {TR} at (0,58) size 120x60 - RenderTableCell {TD} at (0,76) size 40x24 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x17 - text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (0,75) size 40x26 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x18 + text run at (4,5) width 30: "solid" RenderTableCell {TD} at (40,73) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (81,76) size 39x24 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 30x17 - text run at (6,4) width 30: "solid" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (81,75) size 39x26 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 30x18 + text run at (6,5) width 30: "solid" RenderTableRow {TR} at (0,118) size 120x57 RenderTableCell {TD} at (0,134) size 40x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (40,133) size 41x27 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x18 - text run at (4,7) width 30: "solid" + RenderText {#text} at (4,6) size 30x17 + text run at (4,6) width 30: "solid" RenderTableCell {TD} at (81,134) size 39x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png index 6253324a8168..2caf5332aa14 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt index 5d387e15b4f1..e671c89fb163 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-83-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "dashed" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "dashed" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "dashed" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "dashed" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "dashed" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "dashed" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png index ca93fefe82d5..25d6a4510217 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt index 08a048a85f97..5cca4fd8c8f9 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-84-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 148x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 148x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 143x175 RenderTableRow {TR} at (0,0) size 143x58 - RenderTableCell {TD} at (0,17) size 49x24 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 49x26 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x18 text run at (4,5) width 39: "dotted" - RenderTableCell {TD} at (95,17) size 48x24 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,15) size 46x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x17 text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (95,16) size 48x26 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableRow {TR} at (0,58) size 143x60 - RenderTableCell {TD} at (0,76) size 49x24 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x17 - text run at (4,4) width 39: "dotted" + RenderTableCell {TD} at (0,75) size 49x26 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 39x18 + text run at (4,5) width 39: "dotted" RenderTableCell {TD} at (49,73) size 46x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (95,76) size 48x24 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 39x17 - text run at (6,4) width 39: "dotted" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (95,75) size 48x26 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 39x18 + text run at (6,5) width 39: "dotted" RenderTableRow {TR} at (0,118) size 143x57 RenderTableCell {TD} at (0,134) size 49x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,133) size 46x27 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 39x18 - text run at (4,7) width 39: "dotted" + RenderText {#text} at (4,6) size 39x17 + text run at (4,6) width 39: "dotted" RenderTableCell {TD} at (95,134) size 48x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png index fee2c895a135..40061abb6f44 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt index c4dabfbe6151..1b1922e1d617 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-85-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 129x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 129x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 124x175 RenderTableRow {TR} at (0,0) size 124x58 - RenderTableCell {TD} at (0,17) size 42x24 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" - RenderTableCell {TD} at (42,15) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 42x26 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 32x18 text run at (4,5) width 32: "ridge" - RenderTableCell {TD} at (83,17) size 41x24 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (42,15) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 32x17 text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (83,16) size 41x26 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableRow {TR} at (0,58) size 124x60 - RenderTableCell {TD} at (0,76) size 42x24 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x17 - text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (0,75) size 42x26 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x18 + text run at (4,5) width 32: "ridge" RenderTableCell {TD} at (42,73) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (83,76) size 41x24 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 32x17 - text run at (6,4) width 32: "ridge" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (83,75) size 41x26 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 32x18 + text run at (6,5) width 32: "ridge" RenderTableRow {TR} at (0,118) size 124x57 RenderTableCell {TD} at (0,134) size 42x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (42,133) size 41x27 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 32x18 - text run at (4,7) width 32: "ridge" + RenderText {#text} at (4,6) size 32x17 + text run at (4,6) width 32: "ridge" RenderTableCell {TD} at (83,134) size 41x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png index d643895dd4cc..0dbb76d6dbe8 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt index a7c3ac0e7b27..280847677ce0 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-86-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 142x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 142x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 137x175 RenderTableRow {TR} at (0,0) size 137x58 - RenderTableCell {TD} at (0,17) size 47x24 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" - RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 47x26 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 37x18 text run at (4,5) width 37: "outset" - RenderTableCell {TD} at (91,17) size 46x24 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (47,15) size 44x28 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 37x17 text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (91,16) size 46x26 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableRow {TR} at (0,58) size 137x60 - RenderTableCell {TD} at (0,76) size 47x24 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x17 - text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (0,75) size 47x26 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x18 + text run at (4,5) width 37: "outset" RenderTableCell {TD} at (47,73) size 44x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (91,76) size 46x24 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 37x17 - text run at (6,4) width 37: "outset" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (91,75) size 46x26 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 37x18 + text run at (6,5) width 37: "outset" RenderTableRow {TR} at (0,118) size 137x57 RenderTableCell {TD} at (0,134) size 47x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (47,133) size 44x27 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 37x18 - text run at (4,7) width 37: "outset" + RenderText {#text} at (4,6) size 37x17 + text run at (4,6) width 37: "outset" RenderTableCell {TD} at (91,134) size 46x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png index 701a59c18448..7813add426f2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt index 4179c13a2c1a..f3f946be91cb 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-87-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 163x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 163x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 158x175 RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,17) size 54x24 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" - RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 54x26 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 44x18 text run at (4,5) width 44: "groove" - RenderTableCell {TD} at (105,17) size 53x24 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,15) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 44x17 text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,16) size 53x26 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,76) size 54x24 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x17 - text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (0,75) size 54x26 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x18 + text run at (4,5) width 44: "groove" RenderTableCell {TD} at (54,73) size 51x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (105,76) size 53x24 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 44x17 - text run at (6,4) width 44: "groove" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (105,75) size 53x26 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 44x18 + text run at (6,5) width 44: "groove" RenderTableRow {TR} at (0,118) size 158x57 RenderTableCell {TD} at (0,134) size 54x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (54,133) size 51x27 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 44x18 - text run at (4,7) width 44: "groove" + RenderText {#text} at (4,6) size 44x17 + text run at (4,6) width 44: "groove" RenderTableCell {TD} at (105,134) size 53x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png index 731c432c134b..e8b6953798e3 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt index 615afae0f34c..03dae7fbf0a9 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-88-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x237 - RenderBlock {HTML} at (0,0) size 800x237 - RenderBody {BODY} at (8,16) size 784x213 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x238 + RenderBlock {HTML} at (0,0) size 800x238 + RenderBody {BODY} at (8,16) size 784x214 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 123x180 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 123x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 118x175 RenderTableRow {TR} at (0,0) size 118x58 - RenderTableCell {TD} at (0,17) size 39x24 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" - RenderTableCell {TD} at (39,15) size 41x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,16) size 39x26 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 29x18 text run at (4,5) width 29: "inset" - RenderTableCell {TD} at (80,17) size 38x24 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (39,15) size 41x28 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 29x17 text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (80,16) size 38x26 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableRow {TR} at (0,58) size 118x60 - RenderTableCell {TD} at (0,76) size 39x24 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x17 - text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (0,75) size 39x26 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x18 + text run at (4,5) width 29: "inset" RenderTableCell {TD} at (39,73) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" - RenderTableCell {TD} at (80,76) size 38x24 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,4) size 29x17 - text run at (6,4) width 29: "inset" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (80,75) size 38x26 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,4) size 29x18 + text run at (6,5) width 29: "inset" RenderTableRow {TR} at (0,118) size 118x57 RenderTableCell {TD} at (0,134) size 39x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (39,133) size 41x27 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 29x18 - text run at (4,7) width 29: "inset" + RenderText {#text} at (4,6) size 29x17 + text run at (4,6) width 29: "inset" RenderTableCell {TD} at (80,134) size 38x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png index 0611b91e55b1..ba2e27ad6265 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt index 9838fcdd3c9b..e53a256ab848 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-89-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 117x170 + RenderTable {TABLE} at (0,34) size 117x170 RenderTableSection {TBODY} at (0,0) size 117x170 RenderTableRow {TR} at (0,0) size 117x55 - RenderTableCell {TD} at (0,18) size 38x19 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" - RenderTableCell {TD} at (38,15) size 41x25 [border: none] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (0,17) size 38x21 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" - RenderTableCell {TD} at (79,18) size 38x19 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (38,15) size 41x25 [border: none] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 31x17 text run at (1,1) width 31: "none" - RenderTableRow {TR} at (0,55) size 117x60 - RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (79,17) size 38x21 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 31x18 text run at (1,2) width 31: "none" + RenderTableRow {TR} at (0,55) size 117x60 + RenderTableCell {TD} at (0,75) size 38x20 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (38,70) size 41x30 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 29x18 - text run at (6,7) width 29: "inset" + RenderText {#text} at (6,6) size 29x17 + text run at (6,6) width 29: "inset" RenderTableCell {TD} at (79,75) size 38x20 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 31x18 - text run at (6,2) width 31: "none" + RenderText {#text} at (6,1) size 31x17 + text run at (6,1) width 31: "none" RenderTableRow {TR} at (0,115) size 117x55 - RenderTableCell {TD} at (0,133) size 38x19 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderTableCell {TD} at (0,132) size 38x21 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" RenderTableCell {TD} at (38,130) size 41x25 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 31x18 - text run at (1,7) width 31: "none" - RenderTableCell {TD} at (79,133) size 38x19 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x17 - text run at (1,1) width 31: "none" + RenderText {#text} at (1,6) size 31x17 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (79,132) size 38x21 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x18 + text run at (1,2) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt index 90c55cf0721d..0ce1a055821a 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-90-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 135x150 + RenderTable {TABLE} at (0,34) size 135x150 RenderTableSection {TBODY} at (0,0) size 135x150 RenderTableRow {TR} at (0,0) size 135x50 RenderTableCell {TD} at (0,15) size 45x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,15) size 45x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,15) size 45x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,50) size 135x50 RenderTableCell {TD} at (0,65) size 45x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,65) size 45x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (90,65) size 45x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableRow {TR} at (0,100) size 135x50 RenderTableCell {TD} at (0,115) size 45x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (45,115) size 45x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (90,115) size 45x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x18 - text run at (1,2) width 43: "hidden" + RenderText {#text} at (1,1) size 43x17 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png index e457cfd95a29..2e0a0c68fcf6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt index b7e9c6f51423..59ca6ccb2e44 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-91-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 155x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 155x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 150x165 RenderTableRow {TR} at (0,0) size 150x55 RenderTableCell {TD} at (0,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (50,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (100,15) size 50x25 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableRow {TR} at (0,55) size 150x55 RenderTableCell {TD} at (0,70) size 50x25 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (50,70) size 50x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (100,70) size 50x25 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableRow {TR} at (0,110) size 150x55 RenderTableCell {TD} at (0,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (50,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" RenderTableCell {TD} at (100,125) size 50x25 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x18 - text run at (4,5) width 43: "double" + RenderText {#text} at (4,4) size 43x17 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png index 77920cda75e1..953144e01b3e 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt index b3a33da28e64..265ba1d0c33b 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-92-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 117x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 117x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 112x165 RenderTableRow {TR} at (0,0) size 112x55 RenderTableCell {TD} at (0,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (37,15) size 38x25 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (75,15) size 37x25 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableRow {TR} at (0,55) size 112x55 RenderTableCell {TD} at (0,70) size 37x25 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (37,70) size 38x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (75,70) size 37x25 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableRow {TR} at (0,110) size 112x55 RenderTableCell {TD} at (0,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (37,125) size 38x25 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" RenderTableCell {TD} at (75,125) size 37x25 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x18 - text run at (4,5) width 30: "solid" + RenderText {#text} at (4,4) size 30x17 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png index fbac4f0d1d45..159b9d0af5e5 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt index c0f6b9e71912..456be135c337 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-93-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 158x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 153x165 RenderTableRow {TR} at (0,0) size 153x55 RenderTableCell {TD} at (0,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (51,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (102,15) size 51x25 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableRow {TR} at (0,55) size 153x55 RenderTableCell {TD} at (0,70) size 51x25 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (51,70) size 51x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (102,70) size 51x25 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableRow {TR} at (0,110) size 153x55 RenderTableCell {TD} at (0,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (51,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" RenderTableCell {TD} at (102,125) size 51x25 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "dashed" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png index 14886f68265d..fb37bc35aa2a 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt index 528f5709c08c..923bdb054a7e 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-94-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 143x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 143x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 138x165 RenderTableRow {TR} at (0,0) size 138x55 RenderTableCell {TD} at (0,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (46,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (92,15) size 46x25 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableRow {TR} at (0,55) size 138x55 RenderTableCell {TD} at (0,70) size 46x25 [border: (3px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (46,70) size 46x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (92,70) size 46x25 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableRow {TR} at (0,110) size 138x55 RenderTableCell {TD} at (0,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (46,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (92,125) size 46x25 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 39x18 - text run at (4,5) width 39: "dotted" + RenderText {#text} at (4,4) size 39x17 + text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png index 657562e48bae..7d285ef24acb 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt index b924eb42ee62..9a4e8dec7656 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-95-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 122x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 122x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 117x165 RenderTableRow {TR} at (0,0) size 117x55 RenderTableCell {TD} at (0,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (39,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (78,15) size 39x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,55) size 117x55 RenderTableCell {TD} at (0,70) size 39x25 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (39,70) size 39x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (78,70) size 39x25 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,110) size 117x55 RenderTableCell {TD} at (0,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (39,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (78,125) size 39x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 32x18 - text run at (4,5) width 32: "ridge" + RenderText {#text} at (4,4) size 32x17 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png index bc3594a7221f..72e58f9d4f55 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt index 5b332a82dc4d..c76b72d68e87 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-96-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 137x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 137x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 132x165 RenderTableRow {TR} at (0,0) size 132x55 RenderTableCell {TD} at (0,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (44,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (88,15) size 44x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,55) size 132x55 RenderTableCell {TD} at (0,70) size 44x25 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (44,70) size 44x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (88,70) size 44x25 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,110) size 132x55 RenderTableCell {TD} at (0,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (44,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (88,125) size 44x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 37x18 - text run at (4,5) width 37: "outset" + RenderText {#text} at (4,4) size 37x17 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png index 0e8c4f6ef7ad..1a8004e82109 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt index d8087bcb7e2d..073ad1f9b7e0 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-97-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 158x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 158x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 153x165 RenderTableRow {TR} at (0,0) size 153x55 RenderTableCell {TD} at (0,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (51,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (102,15) size 51x25 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableRow {TR} at (0,55) size 153x55 RenderTableCell {TD} at (0,70) size 51x25 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (51,70) size 51x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (102,70) size 51x25 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableRow {TR} at (0,110) size 153x55 RenderTableCell {TD} at (0,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (51,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" RenderTableCell {TD} at (102,125) size 51x25 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 44x18 - text run at (4,5) width 44: "groove" + RenderText {#text} at (4,4) size 44x17 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png index 5033ef70e5e5..b126a09c13fa 100644 Binary files a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png and b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt index 277b70062923..9e91f7f96b57 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-98-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x227 - RenderBlock {HTML} at (0,0) size 800x227 - RenderBody {BODY} at (8,16) size 784x203 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x228 + RenderBlock {HTML} at (0,0) size 800x228 + RenderBody {BODY} at (8,16) size 784x204 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 115x170 [border: (2px none #808080)] + RenderTable {TABLE} at (0,34) size 115x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 110x165 RenderTableRow {TR} at (0,0) size 110x55 RenderTableCell {TD} at (0,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (36,15) size 38x25 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (74,15) size 36x25 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableRow {TR} at (0,55) size 110x55 RenderTableCell {TD} at (0,70) size 36x25 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (36,70) size 38x25 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 31x18 - text run at (4,5) width 31: "none" + RenderText {#text} at (4,4) size 31x17 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (74,70) size 36x25 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableRow {TR} at (0,110) size 110x55 RenderTableCell {TD} at (0,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (36,125) size 38x25 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" RenderTableCell {TD} at (74,125) size 36x25 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x18 - text run at (4,5) width 29: "inset" + RenderText {#text} at (4,4) size 29x17 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt index 1a1085c5cc94..52176f9f428f 100644 --- a/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/t170602-bdr-conflct-w-99-d-expected.txt @@ -1,40 +1,40 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x207 - RenderBlock {HTML} at (0,0) size 800x207 - RenderBody {BODY} at (8,16) size 784x183 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x208 + RenderBlock {HTML} at (0,0) size 800x208 + RenderBody {BODY} at (8,16) size 784x184 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 317x17 text run at (0,0) width 317: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,33) size 99x150 + RenderTable {TABLE} at (0,34) size 99x150 RenderTableSection {TBODY} at (0,0) size 99x150 RenderTableRow {TR} at (0,0) size 99x50 RenderTableCell {TD} at (0,15) size 33x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (33,15) size 33x20 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (66,15) size 33x20 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableRow {TR} at (0,50) size 99x50 RenderTableCell {TD} at (0,65) size 33x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (33,65) size 33x20 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (66,65) size 33x20 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableRow {TR} at (0,100) size 99x50 RenderTableCell {TD} at (0,115) size 33x20 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (33,115) size 33x20 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" RenderTableCell {TD} at (66,115) size 33x20 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 31x18 - text run at (1,2) width 31: "none" + RenderText {#text} at (1,1) size 31x17 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.txt index 38fa5be5c21f..713e60746eba 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-015-expected.txt @@ -1,25 +1,25 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] - RenderTable at (1,1) size 76x36 - RenderTableSection (anonymous) at (0,0) size 76x36 - RenderTableRow (anonymous) at (0,0) size 76x36 - RenderTableCell {span} at (0,0) size 38x36 [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] + RenderTable at (1,1) size 76x37 + RenderTableSection (anonymous) at (0,0) size 76x37 + RenderTableRow (anonymous) at (0,0) size 76x37 + RenderTableCell {span} at (0,0) size 38x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "a b" - RenderTableCell {span} at (38,0) size 38x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (38,0) size 38x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "c d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.txt index 0c4510db6be0..a7c675623dff 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-016-expected.txt @@ -1,25 +1,25 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] - RenderTable at (1,1) size 76x36 - RenderTableSection (anonymous) at (0,0) size 76x36 - RenderTableRow (anonymous) at (0,0) size 76x36 - RenderTableCell {span} at (0,0) size 38x36 [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] + RenderTable at (1,1) size 76x37 + RenderTableSection (anonymous) at (0,0) size 76x37 + RenderTableRow (anonymous) at (0,0) size 76x37 + RenderTableCell {span} at (0,0) size 38x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "a b" - RenderTableCell {span} at (38,0) size 38x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (38,0) size 38x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "c d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.png index b05c7520fe11..4aeb5ec785c1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.txt index 23f8e78f4c9a..b0da300dd589 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-023-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {html} at (0,0) size 800x113 - RenderBody {body} at (8,16) size 784x89 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x115 + RenderBlock {html} at (0,0) size 800x115 + RenderBody {body} at (8,16) size 784x91 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x56 - RenderBlock (relative positioned) {div} at (0,33) size 784x56 -layer at (8,49) size 784x56 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x56 [color=#FF0000] - RenderTable {table} at (1,1) size 147x54 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 137x44 - RenderTableRow {tr} at (0,2) size 137x40 - RenderTableCell {td} at (2,2) size 133x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x57 + RenderBlock (relative positioned) {div} at (0,34) size 784x57 +layer at (8,50) size 784x57 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 129x36 text run at (2,2) width 129: "Some text" -layer at (8,49) size 149x56 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 149x56 [color=#008000] - RenderTable {table} at (1,1) size 147x54 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 137x44 - RenderTableRow {tr} at (0,2) size 137x40 - RenderTableCell {td} at (2,2) size 133x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 149x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 149x57 [color=#008000] + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 129x36 text run at (2,2) width 129: "Some text" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.png index b05c7520fe11..4aeb5ec785c1 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.txt index 23f8e78f4c9a..b0da300dd589 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-024-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {html} at (0,0) size 800x113 - RenderBody {body} at (8,16) size 784x89 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x115 + RenderBlock {html} at (0,0) size 800x115 + RenderBody {body} at (8,16) size 784x91 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x56 - RenderBlock (relative positioned) {div} at (0,33) size 784x56 -layer at (8,49) size 784x56 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x56 [color=#FF0000] - RenderTable {table} at (1,1) size 147x54 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 137x44 - RenderTableRow {tr} at (0,2) size 137x40 - RenderTableCell {td} at (2,2) size 133x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x57 + RenderBlock (relative positioned) {div} at (0,34) size 784x57 +layer at (8,50) size 784x57 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 129x36 text run at (2,2) width 129: "Some text" -layer at (8,49) size 149x56 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 149x56 [color=#008000] - RenderTable {table} at (1,1) size 147x54 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 137x44 - RenderTableRow {tr} at (0,2) size 137x40 - RenderTableCell {td} at (2,2) size 133x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 149x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 149x57 [color=#008000] + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 129x36 text run at (2,2) width 129: "Some text" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.png index 22f8662a4fea..e69b59bbe2b6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.txt index 9db45f77b79d..fe2efb83a956 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-035-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {html} at (0,0) size 800x113 - RenderBody {body} at (8,16) size 784x89 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x115 + RenderBlock {html} at (0,0) size 800x115 + RenderBody {body} at (8,16) size 784x91 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x56 - RenderBlock (relative positioned) {div} at (0,33) size 784x56 -layer at (8,49) size 784x56 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x56 [color=#FF0000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x57 + RenderBlock (relative positioned) {div} at (0,34) size 784x57 +layer at (8,50) size 784x57 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 63x56 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x56 [color=#008000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.png index 22f8662a4fea..e69b59bbe2b6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.txt index 9db45f77b79d..fe2efb83a956 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-036-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {html} at (0,0) size 800x113 - RenderBody {body} at (8,16) size 784x89 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x115 + RenderBlock {html} at (0,0) size 800x115 + RenderBody {body} at (8,16) size 784x91 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x56 - RenderBlock (relative positioned) {div} at (0,33) size 784x56 -layer at (8,49) size 784x56 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x56 [color=#FF0000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x57 + RenderBlock (relative positioned) {div} at (0,34) size 784x57 +layer at (8,50) size 784x57 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 63x56 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x56 [color=#008000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.png index 22f8662a4fea..e69b59bbe2b6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.txt index 9db45f77b79d..fe2efb83a956 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-037-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {html} at (0,0) size 800x113 - RenderBody {body} at (8,16) size 784x89 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x115 + RenderBlock {html} at (0,0) size 800x115 + RenderBody {body} at (8,16) size 784x91 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x56 - RenderBlock (relative positioned) {div} at (0,33) size 784x56 -layer at (8,49) size 784x56 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x56 [color=#FF0000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x57 + RenderBlock (relative positioned) {div} at (0,34) size 784x57 +layer at (8,50) size 784x57 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 63x56 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x56 [color=#008000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.png index 22f8662a4fea..e69b59bbe2b6 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.txt index 9db45f77b79d..fe2efb83a956 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-038-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x113 - RenderBlock {html} at (0,0) size 800x113 - RenderBody {body} at (8,16) size 784x89 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x115 + RenderBlock {html} at (0,0) size 800x115 + RenderBody {body} at (8,16) size 784x91 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x56 - RenderBlock (relative positioned) {div} at (0,33) size 784x56 -layer at (8,49) size 784x56 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x56 [color=#FF0000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x57 + RenderBlock (relative positioned) {div} at (0,34) size 784x57 +layer at (8,50) size 784x57 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 63x56 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x56 [color=#008000] - RenderTable {table} at (1,1) size 61x54 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.png index f68b7654d85a..3886fce24d86 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.txt index 210cff2ae8fe..2e52bcd019c2 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-045-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {html} at (0,0) size 800x105 - RenderBody {body} at (8,16) size 784x81 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x107 + RenderBlock {html} at (0,0) size 800x107 + RenderBody {body} at (8,16) size 784x83 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x48 - RenderBlock (relative positioned) {div} at (0,33) size 784x48 -layer at (8,49) size 784x48 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x48 [color=#FF0000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x49 + RenderBlock (relative positioned) {div} at (0,34) size 784x49 +layer at (8,50) size 784x49 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 55x48 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x48 [color=#008000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.png index f68b7654d85a..3886fce24d86 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.txt index 210cff2ae8fe..2e52bcd019c2 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-046-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {html} at (0,0) size 800x105 - RenderBody {body} at (8,16) size 784x81 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x107 + RenderBlock {html} at (0,0) size 800x107 + RenderBody {body} at (8,16) size 784x83 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x48 - RenderBlock (relative positioned) {div} at (0,33) size 784x48 -layer at (8,49) size 784x48 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x48 [color=#FF0000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x49 + RenderBlock (relative positioned) {div} at (0,34) size 784x49 +layer at (8,50) size 784x49 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 55x48 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x48 [color=#008000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.png index f68b7654d85a..3886fce24d86 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.txt index 210cff2ae8fe..2e52bcd019c2 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-047-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {html} at (0,0) size 800x105 - RenderBody {body} at (8,16) size 784x81 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x107 + RenderBlock {html} at (0,0) size 800x107 + RenderBody {body} at (8,16) size 784x83 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x48 - RenderBlock (relative positioned) {div} at (0,33) size 784x48 -layer at (8,49) size 784x48 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x48 [color=#FF0000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x49 + RenderBlock (relative positioned) {div} at (0,34) size 784x49 +layer at (8,50) size 784x49 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 55x48 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x48 [color=#008000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.png index f68b7654d85a..3886fce24d86 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.txt index 210cff2ae8fe..2e52bcd019c2 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-048-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {html} at (0,0) size 800x105 - RenderBody {body} at (8,16) size 784x81 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x107 + RenderBlock {html} at (0,0) size 800x107 + RenderBody {body} at (8,16) size 784x83 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x48 - RenderBlock (relative positioned) {div} at (0,33) size 784x48 -layer at (8,49) size 784x48 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x48 [color=#FF0000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x49 + RenderBlock (relative positioned) {div} at (0,34) size 784x49 +layer at (8,50) size 784x49 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 55x48 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x48 [color=#008000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.png index f68b7654d85a..3886fce24d86 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.txt index 210cff2ae8fe..2e52bcd019c2 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-049-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {html} at (0,0) size 800x105 - RenderBody {body} at (8,16) size 784x81 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x107 + RenderBlock {html} at (0,0) size 800x107 + RenderBody {body} at (8,16) size 784x83 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x48 - RenderBlock (relative positioned) {div} at (0,33) size 784x48 -layer at (8,49) size 784x48 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x48 [color=#FF0000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x49 + RenderBlock (relative positioned) {div} at (0,34) size 784x49 +layer at (8,50) size 784x49 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 55x48 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x48 [color=#008000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.png index f68b7654d85a..3886fce24d86 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.txt index 210cff2ae8fe..2e52bcd019c2 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-050-expected.txt @@ -1,26 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x105 - RenderBlock {html} at (0,0) size 800x105 - RenderBody {body} at (8,16) size 784x81 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x107 + RenderBlock {html} at (0,0) size 800x107 + RenderBody {body} at (8,16) size 784x83 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x48 - RenderBlock (relative positioned) {div} at (0,33) size 784x48 -layer at (8,49) size 784x48 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x48 [color=#FF0000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 784x49 + RenderBlock (relative positioned) {div} at (0,34) size 784x49 +layer at (8,50) size 784x49 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" -layer at (8,49) size 55x48 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x48 [color=#008000] - RenderTable {table} at (1,1) size 53x46 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 51x44 - RenderTableRow {tr} at (0,2) size 51x40 - RenderTableCell {td} at (2,2) size 47x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (8,50) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 43x36 text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.png index d55536281977..1c77ea9443ef 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.txt index 064c462db388..d1d15072d98d 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-055-expected.txt @@ -1,66 +1,66 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x303 - RenderBlock {html} at (0,0) size 800x303 - RenderBody {body} at (8,16) size 784x279 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x307 + RenderBlock {html} at (0,0) size 800x307 + RenderBody {body} at (8,16) size 784x283 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x246 - RenderBlock (relative positioned) {div} at (0,33) size 784x246 -layer at (8,49) size 784x246 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x246 [color=#FF0000] - RenderBlock {div} at (1,1) size 782x244 [border: (1px solid #000000)] +layer at (8,50) size 784x249 + RenderBlock (relative positioned) {div} at (0,34) size 784x249 +layer at (8,50) size 784x249 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x249 [color=#FF0000] + RenderBlock {div} at (1,1) size 782x247 [border: (1px solid #000000)] RenderBlock {div} at (1,33) size 780x0 - RenderBlock {div} at (1,33) size 780x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,33) size 780x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,103) size 780x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,104) size 780x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,173) size 780x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,175) size 780x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" -layer at (8,49) size 159x246 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 159x246 [color=#008000] - RenderBlock {div} at (1,1) size 157x244 [border: (1px solid #000000)] +layer at (8,50) size 159x249 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 159x249 [color=#008000] + RenderBlock {div} at (1,1) size 157x247 [border: (1px solid #000000)] RenderBlock {div} at (1,33) size 155x0 - RenderBlock {div} at (1,33) size 155x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,33) size 155x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,103) size 155x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,104) size 155x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,173) size 155x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,175) size 155x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.png index d55536281977..1c77ea9443ef 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.txt index 064c462db388..d1d15072d98d 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-056-expected.txt @@ -1,66 +1,66 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x303 - RenderBlock {html} at (0,0) size 800x303 - RenderBody {body} at (8,16) size 784x279 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x307 + RenderBlock {html} at (0,0) size 800x307 + RenderBody {body} at (8,16) size 784x283 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x246 - RenderBlock (relative positioned) {div} at (0,33) size 784x246 -layer at (8,49) size 784x246 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x246 [color=#FF0000] - RenderBlock {div} at (1,1) size 782x244 [border: (1px solid #000000)] +layer at (8,50) size 784x249 + RenderBlock (relative positioned) {div} at (0,34) size 784x249 +layer at (8,50) size 784x249 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x249 [color=#FF0000] + RenderBlock {div} at (1,1) size 782x247 [border: (1px solid #000000)] RenderBlock {div} at (1,33) size 780x0 - RenderBlock {div} at (1,33) size 780x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,33) size 780x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,103) size 780x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,104) size 780x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,173) size 780x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,175) size 780x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" -layer at (8,49) size 159x246 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 159x246 [color=#008000] - RenderBlock {div} at (1,1) size 157x244 [border: (1px solid #000000)] +layer at (8,50) size 159x249 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 159x249 [color=#008000] + RenderBlock {div} at (1,1) size 157x247 [border: (1px solid #000000)] RenderBlock {div} at (1,33) size 155x0 - RenderBlock {div} at (1,33) size 155x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,33) size 155x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,103) size 155x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,104) size 155x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" - RenderBlock {div} at (1,173) size 155x38 - RenderTable at (0,0) size 155x38 - RenderTableSection (anonymous) at (0,0) size 155x38 - RenderTableRow (anonymous) at (0,0) size 155x38 - RenderTableCell {span} at (0,0) size 155x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderBlock {div} at (1,175) size 155x39 + RenderTable at (0,0) size 155x39 + RenderTableSection (anonymous) at (0,0) size 155x39 + RenderTableRow (anonymous) at (0,0) size 155x39 + RenderTableCell {span} at (0,0) size 155x39 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] RenderInline {b} at (0,0) size 153x36 RenderText {#text} at (1,1) size 153x36 text run at (1,1) width 153: "Hello Kitty" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-115-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-115-expected.txt index 71a4c9a273d8..63499b13700f 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-115-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-115-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] - RenderBlock {div} at (1,1) size 782x36 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] + RenderBlock {div} at (1,1) size 782x37 RenderInline {span} at (0,0) size 38x36 RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "a b" @@ -18,7 +18,7 @@ layer at (8,49) size 784x38 RenderText {#text} at (38,0) size 38x36 text run at (38,0) width 38: "c d" RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-116-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-116-expected.txt index a5f0acfe4f5c..a2cf0818dc48 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-116-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-116-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] - RenderBlock {div} at (1,1) size 76x36 +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] + RenderBlock {div} at (1,1) size 76x37 RenderInline {span} at (0,0) size 38x36 RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "a b" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-117-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-117-expected.txt index 86927448e841..a21460253ad3 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-117-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-117-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 68x36 RenderText {#text} at (0,0) size 0x0 RenderInline {span} at (0,0) size 14x36 @@ -22,7 +22,7 @@ layer at (8,49) size 784x38 text run at (15,1) width 54: "bc d" RenderText {#text} at (0,0) size 0x0 RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 70x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x38 [color=#008000] +layer at (8,50) size 70x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 68x36 text run at (1,1) width 68: "abc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-118-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-118-expected.txt index f303d9fdaa18..ac337aff2ca5 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-118-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-118-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 68x36 text run at (1,1) width 68: "abc d" -layer at (8,49) size 70x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x38 [color=#008000] +layer at (8,50) size 70x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x39 [color=#008000] RenderInline {span} at (0,0) size 68x36 RenderText {#text} at (0,0) size 0x0 RenderInline {span} at (0,0) size 14x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-119-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-119-expected.txt index 85b18b5f06d9..c67c84202901 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-119-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-119-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 68x36 RenderText {#text} at (0,0) size 0x0 RenderInline {span} at (0,0) size 14x36 @@ -22,7 +22,7 @@ layer at (8,49) size 784x38 text run at (15,1) width 54: "bc d" RenderText {#text} at (0,0) size 0x0 RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 70x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x38 [color=#008000] +layer at (8,50) size 70x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 68x36 text run at (1,1) width 68: "abc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-120-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-120-expected.txt index 72dd752bd3e4..ecdf7dce38de 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-120-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-120-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 68x36 text run at (1,1) width 68: "abc d" -layer at (8,49) size 70x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x38 [color=#008000] +layer at (8,50) size 70x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 70x39 [color=#008000] RenderInline {span} at (0,0) size 68x36 RenderText {#text} at (0,0) size 0x0 RenderInline {span} at (0,0) size 14x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-121-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-121-expected.txt index 71a4c9a273d8..63499b13700f 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-121-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-121-expected.txt @@ -1,16 +1,16 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] - RenderBlock {div} at (1,1) size 782x36 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] + RenderBlock {div} at (1,1) size 782x37 RenderInline {span} at (0,0) size 38x36 RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "a b" @@ -18,7 +18,7 @@ layer at (8,49) size 784x38 RenderText {#text} at (38,0) size 38x36 text run at (38,0) width 38: "c d" RenderText {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-122-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-122-expected.txt index a5f0acfe4f5c..a2cf0818dc48 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-122-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-122-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] - RenderBlock {div} at (1,1) size 76x36 +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] + RenderBlock {div} at (1,1) size 76x37 RenderInline {span} at (0,0) size 38x36 RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "a b" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.txt index 258961d44628..26f8ae469a53 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-177-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderText {#text} at (1,1) size 22x36 text run at (1,1) width 22: "a " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 text run at (53,1) width 8: " " text run at (61,1) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.txt index 394fbb329dd1..558bfafec9e7 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-178-expected.txt @@ -1,29 +1,29 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderText {#text} at (1,1) size 22x36 text run at (1,1) width 22: "a " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.txt index 258961d44628..26f8ae469a53 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-179-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderText {#text} at (1,1) size 22x36 text run at (1,1) width 22: "a " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 text run at (53,1) width 8: " " text run at (61,1) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.txt index 394fbb329dd1..558bfafec9e7 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-180-expected.txt @@ -1,29 +1,29 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderText {#text} at (1,1) size 22x36 text run at (1,1) width 22: "a " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-181-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-181-expected.txt index e54c5d9886b1..71ca32e156ad 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-181-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-181-expected.txt @@ -3,20 +3,20 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x8 RenderBlock {html} at (0,0) size 800x8 RenderBody {body} at (8,8) size 784x0 -layer at (8,0) size 20x17 - RenderBlock (positioned) zI: 1 {div} at (8,0) size 20x17 [color=#FF0000] +layer at (8,0) size 20x18 + RenderBlock (positioned) zI: 1 {div} at (8,0) size 20x18 [color=#FF0000] RenderInline {span} at (0,0) size 20x17 - RenderTable at (0,0) size 8x17 - RenderTableSection (anonymous) at (0,0) size 8x17 - RenderTableRow (anonymous) at (0,0) size 8x17 - RenderTableCell {span} at (0,0) size 8x17 [r=0 c=0 rs=1 cs=1] + RenderTable at (0,0) size 8x18 + RenderTableSection (anonymous) at (0,0) size 8x18 + RenderTableRow (anonymous) at (0,0) size 8x18 + RenderTableCell {span} at (0,0) size 8x18 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 8x17 text run at (0,0) width 8: "b" RenderInline (generated) at (0,0) size 12x17 RenderText at (8,0) size 12x17 text run at (8,0) width 12: " d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,0) size 20x17 - RenderBlock (positioned) zI: 2 {div} at (8,0) size 20x17 [color=#008000] +layer at (8,0) size 20x18 + RenderBlock (positioned) zI: 2 {div} at (8,0) size 20x18 [color=#008000] RenderText zI: 2 {#text} at (0,0) size 20x17 text run at (0,0) width 20: "b d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.txt index 2c4a85f9e6b8..e83bf29f1a20 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-189-expected.txt @@ -1,35 +1,35 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 text run at (53,1) width 8: " " text run at (61,1) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.txt index 8fa8888ad3d1..5d901c872902 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-190-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.txt index 2c4a85f9e6b8..e83bf29f1a20 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-191-expected.txt @@ -1,35 +1,35 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 text run at (53,1) width 8: " " text run at (61,1) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.txt index 8fa8888ad3d1..5d901c872902 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-192-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.txt index 2c4a85f9e6b8..e83bf29f1a20 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-193-expected.txt @@ -1,35 +1,35 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 text run at (53,1) width 8: " " text run at (61,1) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.txt index 8fa8888ad3d1..5d901c872902 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-194-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.txt index 2c4a85f9e6b8..e83bf29f1a20 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-195-expected.txt @@ -1,35 +1,35 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 text run at (53,1) width 8: " " text run at (61,1) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.txt index 8fa8888ad3d1..5d901c872902 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-196-expected.txt @@ -1,32 +1,32 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderInline (generated) at (0,0) size 14x36 RenderText at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 30x36 - RenderTableSection (anonymous) at (0,0) size 30x36 - RenderTableRow (anonymous) at (0,0) size 30x36 - RenderTableCell {span} at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 30x37 + RenderTableSection (anonymous) at (0,0) size 30x37 + RenderTableRow (anonymous) at (0,0) size 30x37 + RenderTableCell {span} at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 16x36 text run at (0,0) width 16: "b" - RenderTableCell {span} at (16,0) size 14x36 [r=0 c=1 rs=1 cs=1] + RenderTableCell {span} at (16,0) size 14x37 [r=0 c=1 rs=1 cs=1] RenderText {#text} at (0,0) size 14x36 text run at (0,0) width 14: "c" RenderText {#text} at (53,1) size 24x36 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.txt index a057da3a7ed2..e8990eb9f72c 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-205-expected.txt @@ -1,34 +1,34 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderInline {span} at (0,0) size 76x36 RenderText {#text} at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 38x36 - RenderTableSection (anonymous) at (0,0) size 38x36 - RenderTableRow (anonymous) at (0,0) size 38x36 - RenderTableCell {span} at (0,0) size 38x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 38x37 + RenderTableSection (anonymous) at (0,0) size 38x37 + RenderTableRow (anonymous) at (0,0) size 38x37 + RenderTableCell {span} at (0,0) size 38x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "bc " - RenderTable at (61,1) size 16x36 - RenderTableSection (anonymous) at (0,0) size 16x36 - RenderTableRow (anonymous) at (0,0) size 16x36 - RenderTableCell (anonymous) at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (61,1) size 16x37 + RenderTableSection (anonymous) at (0,0) size 16x37 + RenderTableRow (anonymous) at (0,0) size 16x37 + RenderTableCell (anonymous) at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText at (0,0) size 16x36 text run at (0,0) width 16: "d" RenderText zI: 1 {#text} at (0,0) size 0x0 -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderText zI: 2 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.png index d3b818321ac2..fa3c2c8bab4b 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.txt index 7390b61b9bfc..82cbfeb56d75 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-206-expected.txt @@ -1,34 +1,34 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x95 - RenderBlock {html} at (0,0) size 800x95 - RenderBody {body} at (8,16) size 784x71 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x97 + RenderBlock {html} at (0,0) size 800x97 + RenderBody {body} at (8,16) size 784x73 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x38 - RenderBlock (relative positioned) {div} at (0,33) size 784x38 -layer at (8,49) size 784x38 - RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x38 [color=#FF0000] +layer at (8,50) size 784x39 + RenderBlock (relative positioned) {div} at (0,34) size 784x39 +layer at (8,50) size 784x39 + RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x39 [color=#FF0000] RenderText zI: 1 {#text} at (1,1) size 76x36 text run at (1,1) width 76: "a bc d" -layer at (8,49) size 78x38 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x38 [color=#008000] +layer at (8,50) size 78x39 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 78x39 [color=#008000] RenderInline {span} at (0,0) size 76x36 RenderText {#text} at (1,1) size 14x36 text run at (1,1) width 14: "a" RenderText {#text} at (15,1) size 8x36 text run at (15,1) width 8: " " - RenderTable at (23,1) size 38x36 - RenderTableSection (anonymous) at (0,0) size 38x36 - RenderTableRow (anonymous) at (0,0) size 38x36 - RenderTableCell {span} at (0,0) size 38x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (23,1) size 38x37 + RenderTableSection (anonymous) at (0,0) size 38x37 + RenderTableRow (anonymous) at (0,0) size 38x37 + RenderTableCell {span} at (0,0) size 38x37 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (0,0) size 38x36 text run at (0,0) width 38: "bc " - RenderTable at (61,1) size 16x36 - RenderTableSection (anonymous) at (0,0) size 16x36 - RenderTableRow (anonymous) at (0,0) size 16x36 - RenderTableCell (anonymous) at (0,0) size 16x36 [r=0 c=0 rs=1 cs=1] + RenderTable at (61,1) size 16x37 + RenderTableSection (anonymous) at (0,0) size 16x37 + RenderTableRow (anonymous) at (0,0) size 16x37 + RenderTableCell (anonymous) at (0,0) size 16x37 [r=0 c=0 rs=1 cs=1] RenderText at (0,0) size 16x36 text run at (0,0) width 16: "d" RenderText zI: 2 {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.png index 30046066e559..f1671d9c38e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.txt index 6fcba6cd1af0..d1f2f2ec66f5 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-207-expected.txt @@ -1,14 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x89 - RenderBlock {html} at (0,0) size 800x89 - RenderBody {body} at (8,16) size 784x65 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x90 + RenderBlock {html} at (0,0) size 800x90 + RenderBody {body} at (8,16) size 784x66 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x32 - RenderBlock (relative positioned) {div} at (0,33) size 784x32 -layer at (8,49) size 784x32 +layer at (8,50) size 784x32 + RenderBlock (relative positioned) {div} at (0,34) size 784x32 +layer at (8,50) size 784x32 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x32 [color=#FF0000] RenderBlock {div} at (1,1) size 260x30 RenderInline {span} at (0,0) size 112x30 @@ -28,7 +28,7 @@ layer at (8,49) size 784x32 RenderTableCell (anonymous) at (0,0) size 48x30 [r=0 c=0 rs=1 cs=1] RenderText at (0,0) size 48x30 text run at (0,0) width 48: " cd" -layer at (8,49) size 114x32 +layer at (8,50) size 114x32 RenderBlock (positioned) zI: 2 {div} at (0,0) size 114x32 [color=#008000] RenderBlock {div} at (1,1) size 112x30 RenderText {#text} at (0,0) size 112x30 diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.png b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.png index 30046066e559..f1671d9c38e2 100644 Binary files a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.png and b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.png differ diff --git a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.txt b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.txt index 07a1d8310a59..179d2fffecea 100644 --- a/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.txt +++ b/LayoutTests/platform/gtk/css2.1/tables/table-anonymous-objects-208-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x89 - RenderBlock {html} at (0,0) size 800x89 - RenderBody {body} at (8,16) size 784x65 - RenderBlock {p} at (0,0) size 784x17 +layer at (0,0) size 800x90 + RenderBlock {html} at (0,0) size 800x90 + RenderBody {body} at (8,16) size 784x66 + RenderBlock {p} at (0,0) size 784x18 RenderText {#text} at (0,0) size 380x17 text run at (0,0) width 380: "There should be no red below, except for antialiasing issues." -layer at (8,49) size 784x32 - RenderBlock (relative positioned) {div} at (0,33) size 784x32 -layer at (8,49) size 784x32 +layer at (8,50) size 784x32 + RenderBlock (relative positioned) {div} at (0,34) size 784x32 +layer at (8,50) size 784x32 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x32 [color=#FF0000] RenderBlock {div} at (1,1) size 782x30 RenderText {#text} at (0,0) size 112x30 text run at (0,0) width 112: "a b cd" -layer at (8,49) size 262x32 +layer at (8,50) size 262x32 RenderBlock (positioned) zI: 2 {div} at (0,0) size 262x32 [color=#008000] RenderBlock {div} at (1,1) size 260x30 RenderInline {span} at (0,0) size 112x30 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.png b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.png index 7857713a36bb..840c9a2b4c76 100644 Binary files a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.png and b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.txt index 3dcb05388f66..8ff6a115463f 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-blend-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x460 - RenderBlock {HTML} at (0,0) size 800x460 - RenderBody {BODY} at (8,16) size 784x436 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x462 + RenderBlock {HTML} at (0,0) size 800x462 + RenderBody {BODY} at (8,16) size 784x438 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 534x17 text run at (0,0) width 534: "Test for isolation caused by blending. This test passes if the whole rectangle is green." - RenderBlock (anonymous) at (0,33) size 784x403 - RenderSVGRoot {svg} at (8,49) size 160x160 - RenderSVGContainer {g} at (8,49) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] - RenderSVGRect {rect} at (8,49) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] - RenderSVGContainer {g} at (48,89) size 80x80 - RenderSVGRect {rect} at (48,89) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] + RenderBlock (anonymous) at (0,34) size 784x404 + RenderSVGRoot {svg} at (8,50) size 160x160 + RenderSVGContainer {g} at (8,50) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] + RenderSVGRect {rect} at (8,50) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] + RenderSVGContainer {g} at (48,90) size 80x80 + RenderSVGRect {rect} at (48,90) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.png b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.png index 95dc26f2946e..476c5e2505da 100644 Binary files a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.png and b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.txt index fc828d3ab29a..3f95f52f34e4 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-filter-expected.txt @@ -1,20 +1,20 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x460 - RenderBlock {HTML} at (0,0) size 800x460 - RenderBody {BODY} at (8,16) size 784x436 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x462 + RenderBlock {HTML} at (0,0) size 800x462 + RenderBody {BODY} at (8,16) size 784x438 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 519x17 text run at (0,0) width 519: "Test for isolation caused by a filter. This test passes if the whole rectangle is green." - RenderBlock (anonymous) at (0,33) size 784x403 - RenderSVGRoot {svg} at (8,49) size 160x160 + RenderBlock (anonymous) at (0,34) size 784x404 + RenderSVGRoot {svg} at (8,50) size 160x160 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGResourceFilter {filter} [id="f1"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse] [feGaussianBlur stdDeviation="15.00, 15.00"] [SourceGraphic] - RenderSVGContainer {g} at (8,49) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] - RenderSVGRect {rect} at (8,49) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] - RenderSVGContainer {g} at (48,89) size 96x96 + RenderSVGContainer {g} at (8,50) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] + RenderSVGRect {rect} at (8,50) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] + RenderSVGContainer {g} at (48,90) size 96x96 [filter="f1"] RenderSVGResourceFilter {filter} at (10,10) size 24x24 - RenderSVGRect {rect} at (48,89) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] + RenderSVGRect {rect} at (48,90) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.png b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.png index 68067bd2b418..8085cb3fc65f 100644 Binary files a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.png and b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.txt index 8128d2569689..50f06275b66f 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-mask-expected.txt @@ -1,19 +1,19 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x460 - RenderBlock {HTML} at (0,0) size 800x460 - RenderBody {BODY} at (8,16) size 784x436 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x462 + RenderBlock {HTML} at (0,0) size 800x462 + RenderBody {BODY} at (8,16) size 784x438 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 523x17 text run at (0,0) width 523: "Test for isolation caused by a mask. This test passes if the whole rectangle is green." - RenderBlock (anonymous) at (0,33) size 784x403 - RenderSVGRoot {svg} at (8,49) size 160x160 + RenderBlock (anonymous) at (0,34) size 784x404 + RenderSVGRoot {svg} at (8,50) size 160x160 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGResourceMasker {mask} [id="msk"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse] - RenderSVGRect {rect} at (18,59) size 20x20 [fill={[type=SOLID] [color=#FFFFFF]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] - RenderSVGContainer {g} at (8,49) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] - RenderSVGRect {rect} at (8,49) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] - RenderSVGContainer {g} at (48,89) size 80x80 + RenderSVGRect {rect} at (18,60) size 20x20 [fill={[type=SOLID] [color=#FFFFFF]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] + RenderSVGContainer {g} at (8,50) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] + RenderSVGRect {rect} at (8,50) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] + RenderSVGContainer {g} at (48,90) size 80x80 [masker="msk"] RenderSVGResourceMasker {mask} at (10,10) size 20x20 - RenderSVGRect {rect} at (48,89) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] + RenderSVGRect {rect} at (48,90) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.png b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.png index 5b1cee62f70e..60e98a862de8 100644 Binary files a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.png and b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.txt index 474db6ed204b..6f4cf3f27060 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-opacity-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x460 - RenderBlock {HTML} at (0,0) size 800x460 - RenderBody {BODY} at (8,16) size 784x436 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x462 + RenderBlock {HTML} at (0,0) size 800x462 + RenderBody {BODY} at (8,16) size 784x438 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 525x17 text run at (0,0) width 525: "Test for isolation caused by opacity. This test passes if the whole rectangle is green." - RenderBlock (anonymous) at (0,33) size 784x403 - RenderSVGRoot {svg} at (8,49) size 160x160 - RenderSVGContainer {g} at (8,49) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] - RenderSVGRect {rect} at (8,49) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] - RenderSVGContainer {g} at (48,89) size 80x80 [opacity=0.50] - RenderSVGRect {rect} at (48,89) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] + RenderBlock (anonymous) at (0,34) size 784x404 + RenderSVGRoot {svg} at (8,50) size 160x160 + RenderSVGContainer {g} at (8,50) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] + RenderSVGRect {rect} at (8,50) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] + RenderSVGContainer {g} at (48,90) size 80x80 [opacity=0.50] + RenderSVGRect {rect} at (48,90) size 80x80 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.png b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.png index dda68602b2dc..07ee651f1651 100644 Binary files a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.png and b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.txt index 265698fae81c..59a61c64f5ac 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-layer-shadow-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x460 - RenderBlock {HTML} at (0,0) size 800x460 - RenderBody {BODY} at (8,16) size 784x436 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x462 + RenderBlock {HTML} at (0,0) size 800x462 + RenderBody {BODY} at (8,16) size 784x438 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 614x17 text run at (0,0) width 614: "Test for isolation caused by a webkit-svg-shadow. This test passes if the whole rectangle is green." - RenderBlock (anonymous) at (0,33) size 784x403 - RenderSVGRoot {svg} at (8,49) size 160x160 - RenderSVGContainer {g} at (8,49) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] - RenderSVGRect {rect} at (8,49) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] - RenderSVGContainer {g} at (24,65) size 128x128 - RenderSVGRect {rect} at (40,81) size 96x96 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] + RenderBlock (anonymous) at (0,34) size 784x404 + RenderSVGRoot {svg} at (8,50) size 160x160 + RenderSVGContainer {g} at (8,50) size 160x160 [transform={m=((4.00,0.00)(0.00,4.00)) t=(0.00,0.00)}] + RenderSVGRect {rect} at (8,50) size 160x160 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=40.00] [height=40.00] + RenderSVGContainer {g} at (24,66) size 128x128 + RenderSVGRect {rect} at (40,82) size 96x96 [fill={[type=SOLID] [color=#00FF00]}] [x=10.00] [y=10.00] [width=20.00] [height=20.00] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-multiply-alpha-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-multiply-alpha-expected.txt index ed36e8dcfdd3..5e6de7e1517d 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-multiply-alpha-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-multiply-alpha-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x419 - RenderBlock {HTML} at (0,0) size 800x419 - RenderBody {BODY} at (8,8) size 784x403 +layer at (0,0) size 800x420 + RenderBlock {HTML} at (0,0) size 800x420 + RenderBody {BODY} at (8,8) size 784x404 RenderSVGRoot {svg} at (8,8) size 160x160 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGContainer {g} at (8,8) size 40x40 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-normal-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-normal-expected.txt index 33015bd6df0e..41e2833fa03d 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-normal-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-normal-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x419 - RenderBlock {HTML} at (0,0) size 800x419 - RenderBody {BODY} at (8,8) size 784x403 +layer at (0,0) size 800x420 + RenderBlock {HTML} at (0,0) size 800x420 + RenderBody {BODY} at (8,8) size 784x404 RenderSVGRoot {svg} at (8,8) size 160x160 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGContainer {g} at (8,8) size 40x40 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-darker-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-darker-expected.txt index 33015bd6df0e..41e2833fa03d 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-darker-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-darker-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x419 - RenderBlock {HTML} at (0,0) size 800x419 - RenderBody {BODY} at (8,8) size 784x403 +layer at (0,0) size 800x420 + RenderBlock {HTML} at (0,0) size 800x420 + RenderBody {BODY} at (8,8) size 784x404 RenderSVGRoot {svg} at (8,8) size 160x160 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGContainer {g} at (8,8) size 40x40 diff --git a/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-lighter-expected.txt b/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-lighter-expected.txt index 33015bd6df0e..41e2833fa03d 100644 --- a/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-lighter-expected.txt +++ b/LayoutTests/platform/gtk/css3/blending/svg-blend-plus-lighter-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x419 - RenderBlock {HTML} at (0,0) size 800x419 - RenderBody {BODY} at (8,8) size 784x403 +layer at (0,0) size 800x420 + RenderBlock {HTML} at (0,0) size 800x420 + RenderBody {BODY} at (8,8) size 784x404 RenderSVGRoot {svg} at (8,8) size 160x160 RenderSVGHiddenContainer {defs} at (0,0) size 0x0 RenderSVGContainer {g} at (8,8) size 40x40 diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.png b/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.png index 26bbd2dc618e..e7768cdd2bb7 100644 Binary files a/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.png and b/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt index 30bf577c94a3..930882a0fdc2 100644 --- a/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt +++ b/LayoutTests/platform/gtk/css3/css3-modsel-33-expected.txt @@ -1,42 +1,42 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x130 - RenderBlock {HTML} at (0,0) size 800x130 - RenderBody {BODY} at (8,8) size 784x106 - RenderBlock {DIV} at (0,0) size 784x73 - RenderTable {TABLE} at (0,0) size 123x73 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 121x71 - RenderTableRow {TR} at (0,2) size 121x21 - RenderTableCell {TD} at (2,2) size 24x21 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] +layer at (0,0) size 800x134 + RenderBlock {HTML} at (0,0) size 800x134 + RenderBody {BODY} at (8,8) size 784x110 + RenderBlock {DIV} at (0,0) size 784x76 + RenderTable {TABLE} at (0,0) size 123x76 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 121x74 + RenderTableRow {TR} at (0,2) size 121x22 + RenderTableCell {TD} at (2,2) size 24x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 20x17 text run at (2,2) width 20: "1.1" - RenderTableCell {TD} at (28,2) size 24x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (28,2) size 24x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (2,2) size 20x17 text run at (2,2) width 20: "1.2" - RenderTableCell {TD} at (54,2) size 65x21 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,2) size 65x22 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] RenderText {#text} at (2,2) size 61x17 text run at (2,2) width 61: "green cell" - RenderTableRow {TR} at (0,25) size 121x21 - RenderTableCell {TD} at (2,25) size 24x21 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,26) size 121x22 + RenderTableCell {TD} at (2,26) size 24x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 20x17 text run at (2,2) width 20: "2.1" - RenderTableCell {TD} at (28,25) size 24x21 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (28,26) size 24x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (2,2) size 20x17 text run at (2,2) width 20: "2.2" - RenderTableCell {TD} at (54,25) size 65x21 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,26) size 65x22 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (2,2) size 61x17 text run at (2,2) width 61: "green cell" - RenderTableRow {TR} at (0,48) size 121x21 - RenderTableCell {TD} at (2,48) size 24x21 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,50) size 121x22 + RenderTableCell {TD} at (2,50) size 24x22 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] RenderText {#text} at (2,2) size 20x17 text run at (2,2) width 20: "3.1" - RenderTableCell {TD} at (28,48) size 24x21 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (28,50) size 24x22 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] RenderText {#text} at (2,2) size 20x17 text run at (2,2) width 20: "3.2" - RenderTableCell {TD} at (54,48) size 65x21 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1] + RenderTableCell {TD} at (54,50) size 65x22 [bgcolor=#00FF00] [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1] RenderText {#text} at (2,2) size 61x17 text run at (2,2) width 61: "green cell" - RenderBlock {P} at (0,89) size 784x17 + RenderBlock {P} at (0,92) size 784x18 RenderInline {SPAN} at (0,0) size 431x17 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 431x17 text run at (0,0) width 272: "This paragraph contains a span that should " diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.png b/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.png index 1c0eb5b4e5ab..88ee991d2e36 100644 Binary files a/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.png and b/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt index 3560563ede26..90891049c41d 100644 --- a/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt +++ b/LayoutTests/platform/gtk/css3/css3-modsel-35-expected.txt @@ -1,18 +1,18 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x132 - RenderBlock {HTML} at (0,0) size 800x132 - RenderBody {BODY} at (8,8) size 784x116 - RenderBlock {DIV} at (0,0) size 784x116 - RenderBlock {ADDRESS} at (16,0) size 768x17 +layer at (0,0) size 800x136 + RenderBlock {HTML} at (0,0) size 800x136 + RenderBody {BODY} at (8,8) size 784x120 + RenderBlock {DIV} at (0,0) size 784x120 + RenderBlock {ADDRESS} at (16,0) size 768x18 RenderText {#text} at (0,0) size 252x17 text run at (0,0) width 252: "A first address with normal background" - RenderBlock {ADDRESS} at (16,33) size 768x17 + RenderBlock {ADDRESS} at (16,34) size 768x18 RenderText {#text} at (0,0) size 272x17 text run at (0,0) width 272: "A second address with normal background" - RenderBlock {ADDRESS} at (16,66) size 768x17 [bgcolor=#00FF00] + RenderBlock {ADDRESS} at (16,68) size 768x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 337x17 text run at (0,0) width 337: "A third address that should have a green background" - RenderBlock (anonymous) at (0,99) size 784x17 + RenderBlock (anonymous) at (0,102) size 784x18 RenderText {#text} at (0,0) size 314x17 text run at (0,0) width 314: "This div contains 3 addresses above this sentence." diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.png b/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.png index 71f514c3795b..d893e929022b 100644 Binary files a/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.png and b/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt index b2c031db19a7..536ea3c96acc 100644 --- a/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt +++ b/LayoutTests/platform/gtk/css3/css3-modsel-36-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 302x17 text run at (0,0) width 302: "This paragraph should have normal background" - RenderBlock {DIV} at (0,33) size 784x50 - RenderBlock (anonymous) at (0,0) size 784x17 + RenderBlock {DIV} at (0,34) size 784x52 + RenderBlock (anonymous) at (0,0) size 784x18 RenderText {#text} at (0,0) size 234x17 text run at (0,0) width 234: "This div contains only one paragraph" - RenderBlock {P} at (0,33) size 784x17 [bgcolor=#00FF00] + RenderBlock {P} at (0,34) size 784x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 293x17 text run at (0,0) width 293: "This paragraph should have green background" diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.png b/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.png index 8d4e6ce17f1c..bcc559eb1452 100644 Binary files a/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.png and b/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt b/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt index d4b89db5dbb5..46597f0ef5fa 100644 --- a/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt +++ b/LayoutTests/platform/gtk/css3/css3-modsel-37-expected.txt @@ -1,15 +1,15 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x115 - RenderBlock {HTML} at (0,0) size 800x115 - RenderBody {BODY} at (8,16) size 784x83 - RenderBlock {DIV} at (0,0) size 784x83 - RenderBlock {P} at (0,0) size 784x17 +layer at (0,0) size 800x118 + RenderBlock {HTML} at (0,0) size 800x118 + RenderBody {BODY} at (8,16) size 784x86 + RenderBlock {DIV} at (0,0) size 784x86 + RenderBlock {P} at (0,0) size 784x18 RenderText {#text} at (0,0) size 302x17 text run at (0,0) width 302: "This paragraph should have normal background" - RenderBlock {ADDRESS} at (0,33) size 784x17 [bgcolor=#00FF00] + RenderBlock {ADDRESS} at (0,34) size 784x18 [bgcolor=#00FF00] RenderText {#text} at (0,0) size 301x17 text run at (0,0) width 301: "But this address should have green background" - RenderBlock {P} at (0,66) size 784x17 + RenderBlock {P} at (0,68) size 784x18 RenderText {#text} at (0,0) size 302x17 text run at (0,0) width 302: "This paragraph should have normal background" diff --git a/LayoutTests/platform/gtk/css3/filters/composited-during-transition-layertree-expected.txt b/LayoutTests/platform/gtk/css3/filters/composited-during-transition-layertree-expected.txt index 317b13c4cc87..d88c4657a3a6 100644 --- a/LayoutTests/platform/gtk/css3/filters/composited-during-transition-layertree-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/composited-during-transition-layertree-expected.txt @@ -15,15 +15,15 @@ (bounds 160.00 90.00) ) (GraphicsLayer - (position 18.00 131.00) + (position 18.00 132.00) (bounds 160.00 90.00) ) (GraphicsLayer - (position 18.00 244.00) + (position 18.00 246.00) (bounds 160.00 90.00) ) (GraphicsLayer - (position 18.00 357.00) + (position 18.00 360.00) (bounds 160.00 90.00) ) ) diff --git a/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.png index 6f4ab0aa8ea5..6d27f39c09cf 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.txt index 7f5735cceb4e..8eeae68d481c 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-combined-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (548,96) width 4: " " RenderText {#text} at (732,96) size 4x17 text run at (732,96) width 4: " " - RenderText {#text} at (180,209) size 4x17 - text run at (180,209) width 4: " " + RenderText {#text} at (180,210) size 4x17 + text run at (180,210) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (18,18) size 160x90 RenderImage {IMG} at (10,10) size 160x90 @@ -22,7 +22,7 @@ layer at (386,18) size 160x90 RenderImage {IMG} at (378,10) size 160x90 layer at (570,18) size 160x90 RenderImage {IMG} at (562,10) size 160x90 -layer at (18,131) size 160x90 - RenderImage {IMG} at (10,123) size 160x90 -layer at (202,131) size 160x90 - RenderImage {IMG} at (194,123) size 160x90 +layer at (18,132) size 160x90 + RenderImage {IMG} at (10,124) size 160x90 +layer at (202,132) size 160x90 + RenderImage {IMG} at (194,124) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.png index aafd5becb396..4cca61113554 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.txt index 7f5735cceb4e..8eeae68d481c 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-combined-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (548,96) width 4: " " RenderText {#text} at (732,96) size 4x17 text run at (732,96) width 4: " " - RenderText {#text} at (180,209) size 4x17 - text run at (180,209) width 4: " " + RenderText {#text} at (180,210) size 4x17 + text run at (180,210) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (18,18) size 160x90 RenderImage {IMG} at (10,10) size 160x90 @@ -22,7 +22,7 @@ layer at (386,18) size 160x90 RenderImage {IMG} at (378,10) size 160x90 layer at (570,18) size 160x90 RenderImage {IMG} at (562,10) size 160x90 -layer at (18,131) size 160x90 - RenderImage {IMG} at (10,123) size 160x90 -layer at (202,131) size 160x90 - RenderImage {IMG} at (194,123) size 160x90 +layer at (18,132) size 160x90 + RenderImage {IMG} at (10,124) size 160x90 +layer at (202,132) size 160x90 + RenderImage {IMG} at (194,124) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.png index 757453806571..b25a3d79cb31 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-contrast-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.png index adbd0e604cec..1dd7e4999942 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-contrast-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.png index 639cbb49a8e7..e61a15725a34 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.png index 639cbb49a8e7..e61a15725a34 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-grayscale-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.png index d95d06ed82fa..e9a2d1e8f244 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.png index d95d06ed82fa..e9a2d1e8f244 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-hue-rotate-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.png index 9c854d2a4ff4..1e4028db2d3a 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-invert-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.png index 5c2c782a78e3..16d384f92d8a 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-invert-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.png index 49cf558e9b85..8490b681ac63 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-opacity-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.png index 0ee845ae63c4..70771ff09417 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-opacity-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.png index 98fd971f28e2..3cdeda349a79 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.txt index 9dfc4a9587fb..243ac8522b54 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-expected.txt @@ -55,5 +55,5 @@ layer at (390,18) size 160x90 RenderImage {IMG} at (382,10) size 160x90 layer at (574,18) size 160x90 RenderImage {IMG} at (566,10) size 160x90 -layer at (18,131) size 160x90 - RenderImage {IMG} at (10,123) size 160x90 +layer at (18,132) size 160x90 + RenderImage {IMG} at (10,124) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.png index 98fd971f28e2..3cdeda349a79 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.txt index 9dfc4a9587fb..243ac8522b54 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-reference-composite-hw-expected.txt @@ -55,5 +55,5 @@ layer at (390,18) size 160x90 RenderImage {IMG} at (382,10) size 160x90 layer at (574,18) size 160x90 RenderImage {IMG} at (566,10) size 160x90 -layer at (18,131) size 160x90 - RenderImage {IMG} at (10,123) size 160x90 +layer at (18,132) size 160x90 + RenderImage {IMG} at (10,124) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.png index bd4137fe8e4c..590a39ebf24b 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.txt index 7f2131afb22f..d34e560329a5 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-reference-expected.txt @@ -54,16 +54,16 @@ layer at (0,0) size 800x600 text run at (552,96) width 4: " " RenderText {#text} at (736,96) size 4x17 text run at (736,96) width 4: " " - RenderText {#text} at (180,209) size 4x17 - text run at (180,209) width 4: " " - RenderText {#text} at (364,209) size 4x17 - text run at (364,209) width 4: " " - RenderText {#text} at (548,209) size 4x17 - text run at (548,209) width 4: " " - RenderText {#text} at (732,209) size 4x17 - text run at (732,209) width 4: " " - RenderText {#text} at (180,322) size 4x17 - text run at (180,322) width 4: " " + RenderText {#text} at (180,210) size 4x17 + text run at (180,210) width 4: " " + RenderText {#text} at (364,210) size 4x17 + text run at (364,210) width 4: " " + RenderText {#text} at (548,210) size 4x17 + text run at (548,210) width 4: " " + RenderText {#text} at (732,210) size 4x17 + text run at (732,210) width 4: " " + RenderText {#text} at (180,324) size 4x17 + text run at (180,324) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (206,18) size 160x90 RenderImage {IMG} at (198,10) size 160x90 @@ -71,15 +71,15 @@ layer at (390,18) size 160x90 RenderImage {IMG} at (382,10) size 160x90 layer at (574,18) size 160x90 RenderImage {IMG} at (566,10) size 160x90 -layer at (18,131) size 160x90 - RenderImage {IMG} at (10,123) size 160x90 -layer at (202,131) size 160x90 - RenderImage {IMG} at (194,123) size 160x90 -layer at (386,131) size 160x90 - RenderImage {IMG} at (378,123) size 160x90 -layer at (570,131) size 160x90 - RenderImage {IMG} at (562,123) size 160x90 -layer at (18,244) size 160x90 - RenderImage {IMG} at (10,236) size 160x90 -layer at (202,244) size 160x90 - RenderImage {IMG} at (194,236) size 160x90 +layer at (18,132) size 160x90 + RenderImage {IMG} at (10,124) size 160x90 +layer at (202,132) size 160x90 + RenderImage {IMG} at (194,124) size 160x90 +layer at (386,132) size 160x90 + RenderImage {IMG} at (378,124) size 160x90 +layer at (570,132) size 160x90 + RenderImage {IMG} at (562,124) size 160x90 +layer at (18,246) size 160x90 + RenderImage {IMG} at (10,238) size 160x90 +layer at (202,246) size 160x90 + RenderImage {IMG} at (194,238) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.png index 581279535ad4..a69864155654 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.txt index 62d27174fe59..2ecce9c9a069 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-reference-hw-expected.txt @@ -53,16 +53,16 @@ layer at (0,0) size 800x600 text run at (552,96) width 4: " " RenderText {#text} at (736,96) size 4x17 text run at (736,96) width 4: " " - RenderText {#text} at (180,209) size 4x17 - text run at (180,209) width 4: " " - RenderText {#text} at (364,209) size 4x17 - text run at (364,209) width 4: " " - RenderText {#text} at (548,209) size 4x17 - text run at (548,209) width 4: " " - RenderText {#text} at (732,209) size 4x17 - text run at (732,209) width 4: " " - RenderText {#text} at (180,322) size 4x17 - text run at (180,322) width 4: " " + RenderText {#text} at (180,210) size 4x17 + text run at (180,210) width 4: " " + RenderText {#text} at (364,210) size 4x17 + text run at (364,210) width 4: " " + RenderText {#text} at (548,210) size 4x17 + text run at (548,210) width 4: " " + RenderText {#text} at (732,210) size 4x17 + text run at (732,210) width 4: " " + RenderText {#text} at (180,324) size 4x17 + text run at (180,324) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (22,18) size 160x90 RenderImage {IMG} at (14,10) size 160x90 @@ -72,15 +72,15 @@ layer at (390,18) size 160x90 RenderImage {IMG} at (382,10) size 160x90 layer at (574,18) size 160x90 RenderImage {IMG} at (566,10) size 160x90 -layer at (18,131) size 160x90 - RenderImage {IMG} at (10,123) size 160x90 -layer at (202,131) size 160x90 - RenderImage {IMG} at (194,123) size 160x90 -layer at (386,131) size 160x90 - RenderImage {IMG} at (378,123) size 160x90 -layer at (570,131) size 160x90 - RenderImage {IMG} at (562,123) size 160x90 -layer at (18,244) size 160x90 - RenderImage {IMG} at (10,236) size 160x90 -layer at (202,244) size 160x90 - RenderImage {IMG} at (194,236) size 160x90 +layer at (18,132) size 160x90 + RenderImage {IMG} at (10,124) size 160x90 +layer at (202,132) size 160x90 + RenderImage {IMG} at (194,124) size 160x90 +layer at (386,132) size 160x90 + RenderImage {IMG} at (378,124) size 160x90 +layer at (570,132) size 160x90 + RenderImage {IMG} at (562,124) size 160x90 +layer at (18,246) size 160x90 + RenderImage {IMG} at (10,238) size 160x90 +layer at (202,246) size 160x90 + RenderImage {IMG} at (194,238) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.png index b798a89177bb..42db83ba869c 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-saturate-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.png index b798a89177bb..42db83ba869c 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-saturate-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.png index 0a7924d12632..794f561a4b4d 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-sepia-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.png b/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.png index 0a7924d12632..794f561a4b4d 100644 Binary files a/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.png and b/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.txt b/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.txt index a1ce46a2742a..dc43c42378c7 100644 --- a/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.txt +++ b/LayoutTests/platform/gtk/css3/filters/effect-sepia-hw-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 text run at (488,76) width 4: " " RenderText {#text} at (652,76) size 4x17 text run at (652,76) width 4: " " - RenderText {#text} at (160,169) size 4x17 - text run at (160,169) width 4: " " + RenderText {#text} at (160,170) size 4x17 + text run at (160,170) width 4: " " RenderText {#text} at (0,0) size 0x0 layer at (8,8) size 160x90 RenderImage {IMG} at (0,0) size 160x90 @@ -22,7 +22,7 @@ layer at (336,8) size 160x90 RenderImage {IMG} at (328,0) size 160x90 layer at (500,8) size 160x90 RenderImage {IMG} at (492,0) size 160x90 -layer at (8,101) size 160x90 - RenderImage {IMG} at (0,93) size 160x90 -layer at (172,101) size 160x90 - RenderImage {IMG} at (164,93) size 160x90 +layer at (8,102) size 160x90 + RenderImage {IMG} at (0,94) size 160x90 +layer at (172,102) size 160x90 + RenderImage {IMG} at (164,94) size 160x90 diff --git a/LayoutTests/platform/gtk/css3/flexbox/button-expected.png b/LayoutTests/platform/gtk/css3/flexbox/button-expected.png index 4c6bcb055f54..69ed1145de81 100644 Binary files a/LayoutTests/platform/gtk/css3/flexbox/button-expected.png and b/LayoutTests/platform/gtk/css3/flexbox/button-expected.png differ diff --git a/LayoutTests/platform/gtk/css3/flexbox/button-expected.txt b/LayoutTests/platform/gtk/css3/flexbox/button-expected.txt index c4bfcb0cd56a..5f26b7a53293 100644 --- a/LayoutTests/platform/gtk/css3/flexbox/button-expected.txt +++ b/LayoutTests/platform/gtk/css3/flexbox/button-expected.txt @@ -1,35 +1,35 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x252 - RenderBlock {HTML} at (0,0) size 800x252 - RenderBody {BODY} at (8,8) size 784x236 - RenderBlock (anonymous) at (0,0) size 784x34 - RenderText {#text} at (0,0) size 765x34 +layer at (0,0) size 800x258 + RenderBlock {HTML} at (0,0) size 800x258 + RenderBody {BODY} at (8,8) size 784x242 + RenderBlock (anonymous) at (0,0) size 784x36 + RenderText {#text} at (0,0) size 765x35 text run at (0,0) width 403: "Test for empty buttons, which inherit from RenderFlexibleBox. " text run at (403,0) width 362: "Empty buttons should not collapse, which makes" - text run at (0,17) width 487: "them different from most flex boxes. Empty