| Index: LayoutTests/platform/mac/compositing/overflow/nested-scrolling-expected.txt
|
| diff --git a/LayoutTests/platform/mac/compositing/overflow/nested-scrolling-expected.txt b/LayoutTests/platform/mac/compositing/overflow/nested-scrolling-expected.txt
|
| index a3474da9728894e253e0c89c113346d3b053393f..b81a7cfa7f1b4801864fce0dd577ea4286c3fc2f 100644
|
| --- a/LayoutTests/platform/mac/compositing/overflow/nested-scrolling-expected.txt
|
| +++ b/LayoutTests/platform/mac/compositing/overflow/nested-scrolling-expected.txt
|
| @@ -1,56 +1,56 @@
|
| -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 834
|
| +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 836
|
| RenderView at (0,0) size 800x600
|
| -layer at (0,0) size 785x834 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - RenderBlock {HTML} at (0,0) size 785x834
|
| - RenderBody {BODY} at (8,8) size 769x818
|
| - RenderBlock (anonymous) at (0,0) size 769x16
|
| - RenderText {#text} at (0,0) size 84x16
|
| +layer at (0,0) size 785x836 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| + RenderBlock {HTML} at (0,0) size 785x836
|
| + RenderBody {BODY} at (8,8) size 769x820
|
| + RenderBlock (anonymous) at (0,0) size 769x18
|
| + RenderText {#text} at (0,0) size 84x18
|
| text run at (0,0) width 84: "Text outside."
|
| -layer at (8,24) size 702x802 backgroundClip at (8,24) size 702x576 clip at (9,25) size 685x575 outlineClip at (0,0) size 785x600 scrollHeight 1286
|
| - RenderBlock {DIV} at (0,16) size 702x802 [border: (1px solid #000000)]
|
| +layer at (8,26) size 702x802 backgroundClip at (8,26) size 702x574 clip at (9,27) size 685x573 outlineClip at (0,0) size 785x600 scrollHeight 1286
|
| + RenderBlock {DIV} at (0,18) size 702x802 [border: (1px solid #000000)]
|
| RenderBlock {P} at (1,17) size 685x165
|
| - RenderText {#text} at (0,8) size 668x148
|
| - text run at (0,8) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| - text run at (0,41) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| - text run at (0,74) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| - text run at (0,107) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| - text run at (0,140) width 174: "mollit anim id est laborum."
|
| + RenderText {#text} at (0,7) size 668x150
|
| + text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| + text run at (0,40) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| + text run at (0,73) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| + text run at (0,106) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| + text run at (0,139) width 174: "mollit anim id est laborum."
|
| RenderBlock {P} at (1,230) size 685x165
|
| - RenderText {#text} at (0,8) size 668x148
|
| - text run at (0,8) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| - text run at (0,41) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| - text run at (0,74) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| - text run at (0,107) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| - text run at (0,140) width 174: "mollit anim id est laborum."
|
| + RenderText {#text} at (0,7) size 668x150
|
| + text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| + text run at (0,40) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| + text run at (0,73) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| + text run at (0,106) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| + text run at (0,139) width 174: "mollit anim id est laborum."
|
| RenderBlock {P} at (1,861) size 685x165
|
| - RenderText {#text} at (0,8) size 668x148
|
| - text run at (0,8) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| - text run at (0,41) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| - text run at (0,74) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| - text run at (0,107) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| - text run at (0,140) width 174: "mollit anim id est laborum."
|
| + RenderText {#text} at (0,7) size 668x150
|
| + text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| + text run at (0,40) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| + text run at (0,73) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| + text run at (0,106) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| + text run at (0,139) width 174: "mollit anim id est laborum."
|
| RenderBlock {P} at (1,1074) size 685x165
|
| - RenderText {#text} at (0,8) size 668x148
|
| - text run at (0,8) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| - text run at (0,41) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| - text run at (0,74) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| - text run at (0,107) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| - text run at (0,140) width 174: "mollit anim id est laborum."
|
| -layer at (19,467) size 602x402 backgroundClip at (19,467) size 602x133 clip at (20,468) size 585x132 outlineClip at (9,25) size 685x575 scrollHeight 508
|
| + RenderText {#text} at (0,7) size 668x150
|
| + text run at (0,7) width 659: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et"
|
| + text run at (0,40) width 668: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip"
|
| + text run at (0,73) width 668: "ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu"
|
| + text run at (0,106) width 653: "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt"
|
| + text run at (0,139) width 174: "mollit anim id est laborum."
|
| +layer at (19,469) size 602x402 backgroundClip at (19,469) size 602x131 clip at (20,470) size 585x130 outlineClip at (9,27) size 685x573 scrollHeight 508
|
| RenderBlock {DIV} at (11,443) size 602x402 [border: (1px solid #000000)]
|
| RenderBlock {P} at (1,17) size 585x198
|
| - RenderText {#text} at (0,8) size 583x181
|
| - text run at (0,8) width 583: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt"
|
| - text run at (0,41) width 549: "ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"
|
| - text run at (0,74) width 522: "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in"
|
| - text run at (0,107) width 569: "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint"
|
| - text run at (0,140) width 538: "occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est"
|
| - text run at (0,173) width 58: "laborum."
|
| + RenderText {#text} at (0,7) size 583x183
|
| + text run at (0,7) width 583: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt"
|
| + text run at (0,40) width 549: "ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"
|
| + text run at (0,73) width 522: "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in"
|
| + text run at (0,106) width 569: "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint"
|
| + text run at (0,139) width 538: "occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est"
|
| + text run at (0,172) width 58: "laborum."
|
| RenderBlock {P} at (1,263) size 585x198
|
| - RenderText {#text} at (0,8) size 583x181
|
| - text run at (0,8) width 583: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt"
|
| - text run at (0,41) width 549: "ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"
|
| - text run at (0,74) width 522: "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in"
|
| - text run at (0,107) width 569: "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint"
|
| - text run at (0,140) width 538: "occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est"
|
| - text run at (0,173) width 58: "laborum."
|
| + RenderText {#text} at (0,7) size 583x183
|
| + text run at (0,7) width 583: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt"
|
| + text run at (0,40) width 549: "ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"
|
| + text run at (0,73) width 522: "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in"
|
| + text run at (0,106) width 569: "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint"
|
| + text run at (0,139) width 538: "occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est"
|
| + text run at (0,172) width 58: "laborum."
|
|
|