Index: LayoutTests/platform/mac/compositing/overflow/overflow-scroll-expected.txt |
diff --git a/LayoutTests/platform/mac/compositing/overflow/overflow-scroll-expected.txt b/LayoutTests/platform/mac/compositing/overflow/overflow-scroll-expected.txt |
index 10921f24f11afe079de8bfc0f2279a943b85032a..2f61f98495ee0056e9085166baf185686078c106 100644 |
--- a/LayoutTests/platform/mac/compositing/overflow/overflow-scroll-expected.txt |
+++ b/LayoutTests/platform/mac/compositing/overflow/overflow-scroll-expected.txt |
@@ -1,128 +1,128 @@ |
layer at (0,0) size 800x600 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 800x584 |
- RenderBlock {HTML} at (0,0) size 800x584 |
- RenderBody {BODY} at (8,16) size 784x560 |
- RenderBlock {P} at (0,0) size 784x16 |
- RenderText {#text} at (0,0) size 247x16 |
+layer at (0,0) size 800x586 |
+ RenderBlock {HTML} at (0,0) size 800x586 |
+ RenderBody {BODY} at (8,16) size 784x562 |
+ RenderBlock {P} at (0,0) size 784x18 |
+ RenderText {#text} at (0,0) size 247x18 |
text run at (0,0) width 247: "All of the boxes should look the same." |
- RenderBlock (anonymous) at (0,32) size 784x528 |
- RenderText {#text} at (172,160) size 4x16 |
- text run at (172,160) width 4: " " |
- RenderText {#text} at (348,160) size 4x16 |
- text run at (348,160) width 4: " " |
- RenderText {#text} at (524,160) size 4x16 |
- text run at (524,160) width 4: " " |
- RenderText {#text} at (700,160) size 4x16 |
- text run at (700,160) width 4: " " |
+ RenderBlock (anonymous) at (0,34) size 784x528 |
+ RenderText {#text} at (172,158) size 4x18 |
+ text run at (172,158) width 4: " " |
+ RenderText {#text} at (348,158) size 4x18 |
+ text run at (348,158) width 4: " " |
+ RenderText {#text} at (524,158) size 4x18 |
+ text run at (524,158) width 4: " " |
+ RenderText {#text} at (700,158) size 4x18 |
+ text run at (700,158) width 4: " " |
RenderBR {BR} at (0,0) size 0x0 |
- RenderText {#text} at (172,336) size 4x16 |
- text run at (172,336) width 4: " " |
- RenderText {#text} at (348,336) size 4x16 |
- text run at (348,336) width 4: " " |
- RenderText {#text} at (524,336) size 4x16 |
- text run at (524,336) width 4: " " |
- RenderText {#text} at (700,336) size 4x16 |
- text run at (700,336) width 4: " " |
+ RenderText {#text} at (172,334) size 4x18 |
+ text run at (172,334) width 4: " " |
+ RenderText {#text} at (348,334) size 4x18 |
+ text run at (348,334) width 4: " " |
+ RenderText {#text} at (524,334) size 4x18 |
+ text run at (524,334) width 4: " " |
+ RenderText {#text} at (700,334) size 4x18 |
+ text run at (700,334) width 4: " " |
RenderBR {BR} at (0,0) size 0x0 |
- RenderText {#text} at (172,512) size 4x16 |
- text run at (172,512) width 4: " " |
- RenderText {#text} at (348,512) size 4x16 |
- text run at (348,512) width 4: " " |
- RenderText {#text} at (524,512) size 4x16 |
- text run at (524,512) width 4: " " |
+ RenderText {#text} at (172,510) size 4x18 |
+ text run at (172,510) width 4: " " |
+ RenderText {#text} at (348,510) size 4x18 |
+ text run at (348,510) width 4: " " |
+ RenderText {#text} at (524,510) size 4x18 |
+ text run at (524,510) width 4: " " |
RenderText {#text} at (0,0) size 0x0 |
-layer at (18,58) size 152x152 clip at (19,59) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+layer at (18,60) size 152x152 clip at (19,61) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock {DIV} at (10,10) size 152x152 [border: (1px solid #000000)] |
-layer at (194,58) size 152x152 clip at (195,59) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+layer at (194,60) size 152x152 clip at (195,61) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock {DIV} at (186,10) size 152x152 [border: (1px solid #000000)] |
-layer at (19,9) size 210x510 backgroundClip at (19,59) size 135x135 clip at (19,59) size 135x135 outlineClip at (19,59) size 135x135 |
+layer at (19,11) size 210x510 backgroundClip at (19,61) size 135x135 clip at (19,61) size 135x135 outlineClip at (19,61) size 135x135 |
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (195,9) size 210x510 backgroundClip at (195,59) size 135x135 clip at (195,59) size 135x135 outlineClip at (195,59) size 135x135 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (195,11) size 210x510 backgroundClip at (195,61) size 135x135 clip at (195,61) size 135x135 outlineClip at (195,61) size 135x135 |
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (370,58) size 152x152 clip at (371,59) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (370,60) size 152x152 clip at (371,61) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock (relative positioned) {DIV} at (362,10) size 152x152 [border: (1px solid #000000)] |
-layer at (371,9) size 210x510 backgroundClip at (371,59) size 135x135 clip at (371,59) size 135x135 outlineClip at (371,59) size 135x135 |
+layer at (371,11) size 210x510 backgroundClip at (371,61) size 135x135 clip at (371,61) size 135x135 outlineClip at (371,61) size 135x135 |
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (546,58) size 152x152 clip at (547,59) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (546,60) size 152x152 clip at (547,61) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock (relative positioned) {DIV} at (538,10) size 152x152 [border: (1px solid #000000)] |
-layer at (547,9) size 210x510 backgroundClip at (547,59) size 135x135 clip at (547,59) size 135x135 outlineClip at (547,59) size 135x135 |
+layer at (547,11) size 210x510 backgroundClip at (547,61) size 135x135 clip at (547,61) size 135x135 outlineClip at (547,61) size 135x135 |
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (18,234) size 152x152 clip at (19,235) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (18,236) size 152x152 clip at (19,237) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock {DIV} at (10,186) size 152x152 [border: (1px solid #000000)] |
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (194,234) size 152x152 clip at (195,235) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (194,236) size 152x152 clip at (195,237) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock {DIV} at (186,186) size 152x152 [border: (1px solid #000000)] |
-layer at (195,185) size 210x510 backgroundClip at (195,235) size 135x135 clip at (195,235) size 135x135 outlineClip at (195,235) size 135x135 |
+layer at (195,187) size 210x510 backgroundClip at (195,237) size 135x135 clip at (195,237) size 135x135 outlineClip at (195,237) size 135x135 |
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (370,234) size 152x152 clip at (371,235) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (370,236) size 152x152 clip at (371,237) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock {DIV} at (362,186) size 152x152 [border: (1px solid #000000)] |
-layer at (371,185) size 210x510 backgroundClip at (371,235) size 135x135 clip at (371,235) size 135x135 outlineClip at (371,235) size 135x135 |
+layer at (371,187) size 210x510 backgroundClip at (371,237) size 135x135 clip at (371,237) size 135x135 outlineClip at (371,237) size 135x135 |
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (546,234) size 152x152 clip at (547,235) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (546,236) size 152x152 clip at (547,237) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock {DIV} at (538,186) size 152x152 [border: (1px solid #000000)] |
-layer at (547,185) size 210x510 backgroundClip at (547,235) size 135x135 clip at (547,235) size 135x135 outlineClip at (547,235) size 135x135 |
+layer at (547,187) size 210x510 backgroundClip at (547,237) size 135x135 clip at (547,237) size 135x135 outlineClip at (547,237) size 135x135 |
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (18,410) size 152x152 clip at (19,411) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (18,412) size 152x152 clip at (19,413) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock (relative positioned) {DIV} at (10,362) size 152x152 [border: (1px solid #000000)] |
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (194,410) size 152x152 clip at (195,411) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (194,412) size 152x152 clip at (195,413) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock (relative positioned) {DIV} at (186,362) size 152x152 [border: (1px solid #000000)] |
-layer at (195,361) size 210x510 backgroundClip at (195,411) size 135x135 clip at (195,411) size 135x135 outlineClip at (195,411) size 135x135 |
+layer at (195,363) size 210x510 backgroundClip at (195,413) size 135x135 clip at (195,413) size 135x135 outlineClip at (195,413) size 135x135 |
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (370,410) size 152x152 clip at (371,411) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (370,412) size 152x152 clip at (371,413) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock (relative positioned) {DIV} at (362,362) size 152x152 [border: (1px solid #000000)] |
-layer at (371,361) size 210x510 backgroundClip at (371,411) size 135x135 clip at (371,411) size 135x135 outlineClip at (371,411) size 135x135 |
+layer at (371,363) size 210x510 backgroundClip at (371,413) size 135x135 clip at (371,413) size 135x135 outlineClip at (371,413) size 135x135 |
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
-layer at (546,410) size 152x152 clip at (547,411) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
+ text run at (0,28) width 111: "that scrolls." |
+layer at (546,412) size 152x152 clip at (547,413) size 135x135 scrollY 50.00 scrollWidth 210 scrollHeight 510 |
RenderBlock (relative positioned) {DIV} at (538,362) size 152x152 [border: (1px solid #000000)] |
-layer at (547,361) size 210x510 backgroundClip at (547,411) size 135x135 clip at (547,411) size 135x135 outlineClip at (547,411) size 135x135 |
+layer at (547,363) size 210x510 backgroundClip at (547,413) size 135x135 clip at (547,413) size 135x135 outlineClip at (547,413) size 135x135 |
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] |
- RenderBlock {P} at (5,29) size 200x48 |
- RenderText {#text} at (0,0) size 192x48 |
+ RenderBlock {P} at (5,29) size 200x56 |
+ RenderText {#text} at (0,0) size 192x56 |
text run at (0,0) width 192: "This is the inner div" |
- text run at (0,24) width 111: "that scrolls." |
+ text run at (0,28) width 111: "that scrolls." |