Index: LayoutTests/platform/linux/fast/block/margin-collapse/103-expected.txt |
diff --git a/LayoutTests/platform/linux/fast/block/margin-collapse/103-expected.txt b/LayoutTests/platform/linux/fast/block/margin-collapse/103-expected.txt |
index bba63b31494d6f20321c42ba901c85ce50c89c76..de2c8eed06d21d93f23622f6e3b83feeea90d9e9 100644 |
--- a/LayoutTests/platform/linux/fast/block/margin-collapse/103-expected.txt |
+++ b/LayoutTests/platform/linux/fast/block/margin-collapse/103-expected.txt |
@@ -1,11 +1,11 @@ |
-layer at (0,0) size 785x1750 |
+layer at (0,0) size 785x1736 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x1750 |
- RenderBlock {HTML} at (0,0) size 785x1749.95 |
- RenderBody {BODY} at (8,20) size 769x1709.95 [bgcolor=#A6A972] |
- RenderBlock {DIV} at (83.50,0) size 602x1709.95 [bgcolor=#FDFDE9] [border: (1px solid #000000)] |
+layer at (0,0) size 785x1736 |
+ RenderBlock {HTML} at (0,0) size 785x1735.95 |
+ RenderBody {BODY} at (8,20) size 769x1695.95 [bgcolor=#A6A972] |
+ RenderBlock {DIV} at (83.50,0) size 602x1695.95 [bgcolor=#FDFDE9] [border: (1px solid #000000)] |
RenderBlock {DIV} at (1,31) size 600x70 |
- RenderBlock {DIV} at (1,114.33) size 600x1523.63 |
+ RenderBlock {DIV} at (1,114.33) size 600x1509.63 |
RenderBlock {P} at (20,0) size 560x80 [color=#333333] |
RenderText {#text} at (0,1) size 524x38 |
text run at (0,1) width 524: "We are trying to understand how UVic students perform Shakespeare related research for" |
@@ -22,7 +22,7 @@ layer at (0,0) size 785x1750 |
RenderBlock {P} at (20,93.33) size 560x20 [color=#333333] |
RenderText {#text} at (0,1) size 459x18 |
text run at (0,1) width 459: "Please take the time to carefully review and complete the following questions." |
- RenderBlock {FORM} at (20,138.33) size 560x1351.97 |
+ RenderBlock {FORM} at (20,138.33) size 560x1337.97 |
RenderBlock {H2} at (0,0) size 560x17 [color=#333333] |
RenderText {#text} at (0,0) size 203x17 |
text run at (0,0) width 203: "PERSONAL INFORMATION" |
@@ -30,74 +30,74 @@ layer at (0,0) size 785x1750 |
RenderText {#text} at (0,1) size 68x18 |
text run at (0,1) width 68: "Your Name*" |
RenderTextControl {INPUT} at (325,27) size 184x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)] |
- RenderBlock (floating) {SPAN} at (0,51) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,49) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 121x18 |
text run at (0,1) width 121: "Your e-mail address*" |
- RenderTextControl {INPUT} at (325,51) size 184x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)] |
- RenderBlock (floating) {SPAN} at (0,75) size 325x20 [color=#333333] |
+ RenderTextControl {INPUT} at (325,49) size 184x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)] |
+ RenderBlock (floating) {SPAN} at (0,71) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 128x18 |
text run at (0,1) width 128: "Your degree program*" |
- RenderMenuList {SELECT} at (325,75) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,71) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 95x16 |
text run at (4,1) width 95: "Program options" |
- RenderBlock (floating) {SPAN} at (0,97) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,91) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 111x18 |
text run at (0,1) width 111: "Your year of study*" |
- RenderMenuList {SELECT} at (325,97) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,91) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 134x16 |
text run at (4,1) width 134: "Years you've been here" |
- RenderBlock (floating) {SPAN} at (0,119) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,111) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 156x18 |
text run at (0,1) width 156: "Shakespeare classes taken" |
- RenderMenuList {SELECT} at (325,119) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,111) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 81x16 |
text run at (4,1) width 81: "Number taken" |
- RenderBlock {P} at (0,152.33) size 560x20 [color=#333333] |
+ RenderBlock {P} at (0,144.33) size 560x20 [color=#333333] |
RenderText {#text} at (0,1) size 156x18 |
text run at (0,1) width 156: "* indicates a required field" |
- RenderBlock {H2} at (0,197.33) size 560x17 [color=#333333] |
+ RenderBlock {H2} at (0,189.33) size 560x17 [color=#333333] |
RenderText {#text} at (0,0) size 296x17 |
text run at (0,0) width 296: "SHAKESPEARE RESEARCH QUESTIONS" |
- RenderBlock (floating) {SPAN} at (0,224.33) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,216.33) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 324x18 |
text run at (0,1) width 324: "What percentage of your research time is spent online?" |
- RenderMenuList {SELECT} at (325,224.33) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,216.33) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 116x16 |
text run at (4,1) width 116: "Percentages of time" |
- RenderBlock (floating) {SPAN} at (0,246.33) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,236.33) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 302x38 |
text run at (0,1) width 302: "What is holding you back from doing more research" |
text run at (0,21) width 40: "online?" |
- RenderMenuList {SELECT} at (325,246.33) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,236.33) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 51x16 |
text run at (4,1) width 51: "Reasons" |
- RenderBlock (floating) {SPAN} at (0,268.33) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,256.33) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 222x18 |
text run at (0,1) width 222: "Your research is primarily focused on:" |
- RenderBlock {SPAN} at (325,268.33) size 180x21 [color=#333333] |
+ RenderBlock {SPAN} at (325,256.33) size 180x21 [color=#333333] |
RenderBlock {INPUT} at (5,3) size 13x13 [color=#000000] |
RenderText {#text} at (21,2) size 33x18 |
text run at (21,2) width 33: "Texts" |
- RenderBlock {SPAN} at (325,289.33) size 180x21 [color=#333333] |
+ RenderBlock {SPAN} at (325,277.33) size 180x21 [color=#333333] |
RenderBlock {INPUT} at (5,3) size 13x13 [color=#000000] |
RenderText {#text} at (21,2) size 133x18 |
text run at (21,2) width 133: "Performance materials" |
- RenderBlock {SPAN} at (325,310.33) size 180x21 [color=#333333] |
+ RenderBlock {SPAN} at (325,298.33) size 180x21 [color=#333333] |
RenderBlock {INPUT} at (5,3) size 13x13 [color=#000000] |
RenderText {#text} at (21,2) size 21x18 |
text run at (21,2) width 21: "n/a" |
- RenderBlock {H2} at (0,356.33) size 560x17 [color=#333333] |
+ RenderBlock {H2} at (0,344.33) size 560x17 [color=#333333] |
RenderText {#text} at (0,0) size 378x17 |
text run at (0,0) width 378: "INTERNET SHAKESPEARE EDITIONS QUESTIONS" |
- RenderBlock (floating) {SPAN} at (0,383.33) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,371.33) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 307x18 |
text run at (0,1) width 307: "Have you used UVic's Internet Shakespeare Editions?" |
- RenderBlock {SPAN} at (325,383.33) size 180x21 [color=#333333] |
+ RenderBlock {SPAN} at (325,371.33) size 180x21 [color=#333333] |
RenderText {#text} at (0,2) size 20x18 |
text run at (0,2) width 20: "Yes" |
RenderBlock {INPUT} at (25,3) size 13x13 [color=#000000] |
@@ -106,77 +106,77 @@ layer at (0,0) size 785x1750 |
text run at (45,2) width 15: "No" |
RenderBlock {INPUT} at (65,3) size 13x13 [color=#000000] |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,417.66) size 560x20 [color=#333333] |
+ RenderBlock {P} at (0,405.66) size 560x20 [color=#333333] |
RenderText {#text} at (0,1) size 382x18 |
text run at (0,1) width 382: "-- If you answered no to this question, skip to the next section --" |
- RenderBlock (floating) {SPAN} at (0,450.98) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,438.98) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 277x18 |
text run at (0,1) width 277: "Which area of the ISE did you find most useful?" |
- RenderMenuList {SELECT} at (325,450.98) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,438.98) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 112x16 |
text run at (4,1) width 112: "Sections of the ISE" |
- RenderBlock (floating) {SPAN} at (0,472.98) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,458.98) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 253x18 |
text run at (0,1) width 253: "How did you find the navigation of the ISE?" |
- RenderMenuList {SELECT} at (325,472.98) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
+ RenderMenuList {SELECT} at (325,458.98) size 180x20 [bgcolor=#C0C0C0] [border: (1px solid #A9A9A9)] |
RenderBlock (anonymous) at (1,1) size 178x18 |
RenderText at (4,1) size 94x16 |
text run at (4,1) width 94: "Level of difficulty" |
- RenderBlock (floating) {SPAN} at (0,494.98) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,478.98) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 209x18 |
text run at (0,1) width 209: "Please describe your use of the ISE." |
- RenderBlock {H2} at (0,648.98) size 560x17 [color=#333333] |
+ RenderBlock {H2} at (0,634.98) size 560x17 [color=#333333] |
RenderText {#text} at (0,0) size 293x17 |
text run at (0,0) width 293: "TOOLS IN DEVELOPMENT QUESTIONS" |
- RenderBlock {P} at (0,679.31) size 560x60 [color=#333333] |
+ RenderBlock {P} at (0,665.31) size 560x60 [color=#333333] |
RenderText {#text} at (0,1) size 555x58 |
text run at (0,1) width 453: "We are in the process of both making new material available and developing " |
text run at (453,1) width 102: "new tools to view" |
text run at (0,21) width 356: "and extrapolate information from Shakespeare's works. The " |
text run at (356,21) width 159: "following images are visual" |
text run at (0,41) width 346: "representations of some of the ideas being thrown around." |
- RenderBlock {P} at (0,752.64) size 560x20 [color=#333333] |
+ RenderBlock {P} at (0,738.64) size 560x20 [color=#333333] |
RenderText {#text} at (0,1) size 334x18 |
text run at (0,1) width 334: "Please review them carefully and provide feedback below" |
- RenderBlock (floating) {SPAN} at (0,785.97) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,771.97) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 146x18 |
text run at (0,1) width 146: "Your comments on Fig. 1" |
- RenderBlock (floating) {SPAN} at (0,916.97) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,902.97) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 146x18 |
text run at (0,1) width 146: "Your comments on Fig. 2" |
- RenderBlock (floating) {SPAN} at (0,1047.97) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,1033.97) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 146x18 |
text run at (0,1) width 146: "Your comments on Fig. 3" |
- RenderBlock {H2} at (0,1198.97) size 560x17 [color=#333333] |
+ RenderBlock {H2} at (0,1184.97) size 560x17 [color=#333333] |
RenderText {#text} at (0,0) size 141x17 |
text run at (0,0) width 141: "OTHER FEEDBACK" |
- RenderBlock (floating) {SPAN} at (0,1225.97) size 325x20 [color=#333333] |
+ RenderBlock (floating) {SPAN} at (0,1211.97) size 325x20 [color=#333333] |
RenderText {#text} at (0,1) size 221x18 |
text run at (0,1) width 221: "Please enter any other thoughts here." |
- RenderBlock {P} at (20,1503.63) size 560x20 [color=#333333] |
+ RenderBlock {P} at (20,1489.63) size 560x20 [color=#333333] |
RenderText {#text} at (0,1) size 232x18 |
text run at (0,1) width 232: "Thank you for your time filling this out." |
- RenderBlock {DIV} at (1,1657.95) size 600x51 [border: (1px dashed #A6A972) none] |
+ RenderBlock {DIV} at (1,1643.95) size 600x51 [border: (1px dashed #A6A972) none] |
RenderBlock {SPAN} at (0,16) size 600x20 [color=#333333] |
RenderText {#text} at (245,1) size 110x18 |
text run at (245,1) width 110: "\x{A9}2003 Kevin Davis" |
layer at (440,303) size 180x16 |
RenderBlock {DIV} at (2,3) size 180x16 |
-layer at (440,327) size 180x16 |
+layer at (440,325) size 180x16 |
RenderBlock {DIV} at (2,3) size 180x16 |
-layer at (113,791) size 506x106 clip at (114,792) size 504x104 |
- RenderTextControl {TEXTAREA} at (0,517.98) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
+layer at (113,777) size 506x106 clip at (114,778) size 504x104 |
+ RenderTextControl {TEXTAREA} at (0,503.98) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
RenderBlock {DIV} at (3,3) size 500x16 |
-layer at (113,1079) size 506x106 clip at (114,1080) size 504x104 |
- RenderTextControl {TEXTAREA} at (0,805.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
+layer at (113,1065) size 506x106 clip at (114,1066) size 504x104 |
+ RenderTextControl {TEXTAREA} at (0,791.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
RenderBlock {DIV} at (3,3) size 500x16 |
-layer at (113,1210) size 506x106 clip at (114,1211) size 504x104 |
- RenderTextControl {TEXTAREA} at (0,936.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
+layer at (113,1196) size 506x106 clip at (114,1197) size 504x104 |
+ RenderTextControl {TEXTAREA} at (0,922.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
RenderBlock {DIV} at (3,3) size 500x16 |
-layer at (113,1341) size 506x106 clip at (114,1342) size 504x104 |
- RenderTextControl {TEXTAREA} at (0,1067.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
+layer at (113,1327) size 506x106 clip at (114,1328) size 504x104 |
+ RenderTextControl {TEXTAREA} at (0,1053.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
RenderBlock {DIV} at (3,3) size 500x16 |
-layer at (113,1519) size 506x106 clip at (114,1520) size 504x104 |
- RenderTextControl {TEXTAREA} at (0,1245.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
+layer at (113,1505) size 506x106 clip at (114,1506) size 504x104 |
+ RenderTextControl {TEXTAREA} at (0,1231.97) size 506x106 [bgcolor=#FFFFFF] [border: (1px solid #A9A9A9)] |
RenderBlock {DIV} at (3,3) size 500x16 |