Changeset 41742 in webkit
- Timestamp:
- Mar 16, 2009 2:34:26 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 63 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r41741 r41742 1 2009-03-16 David Hyatt <hyatt@apple.com> 2 3 Reviewed by Eric Seidel 4 5 https://bugs.webkit.org/show_bug.cgi?id=13632 6 7 Overflow scrolling needs to account for the bottom/right padding on the object itself as well 8 as for bottom/right margins on children. 9 10 * platform/mac/fast/body-propagation/overflow/002-expected.checksum: 11 * platform/mac/fast/body-propagation/overflow/002-expected.png: 12 * platform/mac/fast/body-propagation/overflow/002-expected.txt: 13 * platform/mac/fast/body-propagation/overflow/002-xhtml-expected.checksum: 14 * platform/mac/fast/body-propagation/overflow/002-xhtml-expected.png: 15 * platform/mac/fast/body-propagation/overflow/002-xhtml-expected.txt: 16 * platform/mac/fast/body-propagation/overflow/003-declarative-expected.checksum: 17 * platform/mac/fast/body-propagation/overflow/003-declarative-expected.png: 18 * platform/mac/fast/body-propagation/overflow/003-declarative-expected.txt: 19 * platform/mac/fast/body-propagation/overflow/003-expected.checksum: 20 * platform/mac/fast/body-propagation/overflow/003-expected.png: 21 * platform/mac/fast/body-propagation/overflow/003-expected.txt: 22 * platform/mac/fast/body-propagation/overflow/003-xhtml-expected.checksum: 23 * platform/mac/fast/body-propagation/overflow/003-xhtml-expected.png: 24 * platform/mac/fast/body-propagation/overflow/003-xhtml-expected.txt: 25 * platform/mac/fast/body-propagation/overflow/004-declarative-expected.checksum: 26 * platform/mac/fast/body-propagation/overflow/004-declarative-expected.png: 27 * platform/mac/fast/body-propagation/overflow/004-declarative-expected.txt: 28 * platform/mac/fast/body-propagation/overflow/004-expected.checksum: 29 * platform/mac/fast/body-propagation/overflow/004-expected.png: 30 * platform/mac/fast/body-propagation/overflow/004-expected.txt: 31 * platform/mac/fast/body-propagation/overflow/004-xhtml-expected.checksum: 32 * platform/mac/fast/body-propagation/overflow/004-xhtml-expected.png: 33 * platform/mac/fast/body-propagation/overflow/004-xhtml-expected.txt: 34 * platform/mac/fast/body-propagation/overflow/007-declarative-expected.checksum: 35 * platform/mac/fast/body-propagation/overflow/007-declarative-expected.png: 36 * platform/mac/fast/body-propagation/overflow/007-declarative-expected.txt: 37 * platform/mac/fast/body-propagation/overflow/007-expected.checksum: 38 * platform/mac/fast/body-propagation/overflow/007-expected.png: 39 * platform/mac/fast/body-propagation/overflow/007-expected.txt: 40 * platform/mac/fast/body-propagation/overflow/007-xhtml-expected.checksum: 41 * platform/mac/fast/body-propagation/overflow/007-xhtml-expected.png: 42 * platform/mac/fast/body-propagation/overflow/007-xhtml-expected.txt: 43 * platform/mac/fast/forms/basic-textareas-expected.txt: 44 * platform/mac/fast/forms/input-disabled-color-expected.txt: 45 * platform/mac/fast/forms/input-readonly-autoscroll-expected.checksum: 46 * platform/mac/fast/forms/input-readonly-autoscroll-expected.png: 47 * platform/mac/fast/forms/input-readonly-autoscroll-expected.txt: 48 * platform/mac/fast/forms/input-readonly-dimmed-expected.txt: 49 * platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.checksum: 50 * platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.png: 51 * platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.txt: 52 * platform/mac/fast/overflow/003-expected.checksum: 53 * platform/mac/fast/overflow/003-expected.png: 54 * platform/mac/fast/overflow/003-expected.txt: 55 * platform/mac/fast/overflow/004-expected.checksum: 56 * platform/mac/fast/overflow/004-expected.png: 57 * platform/mac/fast/overflow/007-expected.checksum: 58 * platform/mac/fast/overflow/007-expected.png: 59 * platform/mac/fast/overflow/007-expected.txt: 60 * platform/mac/fast/overflow/clip-rects-fixed-ancestor-expected.txt: 61 * platform/mac/fast/repaint/selection-gap-overflow-scroll-expected.checksum: 62 * platform/mac/fast/repaint/selection-gap-overflow-scroll-expected.png: 63 * platform/mac/fast/repaint/selection-gap-overflow-scroll-expected.txt: 64 * platform/mac/fast/replaced/width100percent-textarea-expected.checksum: 65 * platform/mac/fast/replaced/width100percent-textarea-expected.png: 66 * platform/mac/fast/replaced/width100percent-textarea-expected.txt: 67 * platform/mac/scrollbars/overflow-scrollbar-combinations-expected.txt: 68 * platform/mac/tables/mozilla/bugs/bug83786-expected.txt: 69 * platform/mac/tables/mozilla_expected_failures/bugs/bug106966-expected.txt: 70 1 71 2009-03-16 Sam Weinig <sam@webkit.org> 2 72 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/002-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/002-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x178 4 4 RenderBlock {HTML} at (0,0) size 800x178 5 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 065 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 6 6 RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {P} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/002-xhtml-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/002-xhtml-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x178 4 4 RenderBlock {html} at (0,0) size 800x178 5 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 065 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 6 6 RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/003-declarative-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/003-declarative-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x178 4 4 RenderBlock {html} at (0,0) size 800x178 5 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 065 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 6 6 RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/003-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/003-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x178 4 4 RenderBlock {html} at (0,0) size 800x178 5 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 065 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 6 6 RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {P} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/003-xhtml-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/003-xhtml-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x178 4 4 RenderBlock {html} at (0,0) size 800x178 5 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 065 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 6 6 RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/004-declarative-expected.checksum
r38121 r41742 1 9eca55ff07b39f5c7463a4a470ece8d1 1 b7e8a93fb552b270edfe31f24e511dc6 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/004-declarative-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x162 4 4 RenderBlock {html} at (0,0) size 800x162 5 layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 2 065 layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 222 6 6 RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/004-expected.checksum
r38121 r41742 1 9eca55ff07b39f5c7463a4a470ece8d1 1 b7e8a93fb552b270edfe31f24e511dc6 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/004-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x162 4 4 RenderBlock {HTML} at (0,0) size 800x162 5 layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 2 065 layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 222 6 6 RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {P} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/004-xhtml-expected.checksum
r38121 r41742 1 9eca55ff07b39f5c7463a4a470ece8d1 1 b7e8a93fb552b270edfe31f24e511dc6 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/004-xhtml-expected.txt
r37591 r41742 3 3 layer at (0,0) size 800x162 4 4 RenderBlock {html} at (0,0) size 800x162 5 layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 2 065 layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 222 6 6 RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)] 7 7 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/007-declarative-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/007-declarative-expected.txt
r37591 r41742 8 8 RenderBlock (anonymous) at (0,178) size 800x0 9 9 RenderInline {bogus} at (0,0) size 0x0 10 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 0610 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 11 11 RenderBody {body} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)] 12 12 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/007-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/007-expected.txt
r37591 r41742 8 8 RenderBlock (anonymous) at (0,178) size 800x0 9 9 RenderInline {BOGUS} at (0,0) size 0x0 10 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 0610 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 11 11 RenderBody {BODY} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)] 12 12 RenderBlock {P} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/007-xhtml-expected.checksum
r38121 r41742 1 e bbd6fc065019a275db9f93a69f651d11 e7594630320691acc621a84e73cd3093 -
trunk/LayoutTests/platform/mac/fast/body-propagation/overflow/007-xhtml-expected.txt
r37591 r41742 8 8 RenderBlock (anonymous) at (0,178) size 800x0 9 9 RenderInline {bogus} at (0,0) size 0x0 10 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 2 0610 layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 222 11 11 RenderBody {body} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)] 12 12 RenderBlock {p} at (1,17) size 145x54 -
trunk/LayoutTests/platform/mac/fast/forms/basic-textareas-expected.txt
r41690 r41742 532 532 text run at (3,143) width 31: "mnop" 533 533 text run at (3,156) width 34: "qrstuv" 534 layer at (86,521) size 161x41 clip at (86,521) size 161x26 scrollWidth 42 5534 layer at (86,521) size 161x41 clip at (86,521) size 161x26 scrollWidth 427 535 535 RenderBlock {DIV} at (1,1) size 161x41 536 536 RenderText {#text} at (3,0) size 421x13 … … 811 811 text run at (3,143) width 31: "mnop" 812 812 text run at (3,156) width 34: "qrstuv" 813 layer at (454,176) size 18x26 clip at (454,176) size 3x11 scrollWidth 1 5scrollHeight 819813 layer at (454,176) size 18x26 clip at (454,176) size 3x11 scrollWidth 17 scrollHeight 819 814 814 RenderBlock {DIV} at (21,21) size 18x26 815 815 RenderText {#text} at (3,0) size 11x819 … … 1136 1136 text run at (3,143) width 31: "mnop" 1137 1137 text run at (3,156) width 34: "qrstuv" 1138 layer at (4,480) size 161x41 clip at (4,480) size 161x26 scrollWidth 42 51138 layer at (4,480) size 161x41 clip at (4,480) size 161x26 scrollWidth 427 1139 1139 RenderBlock {DIV} at (1,1) size 161x41 1140 1140 RenderText {#text} at (3,0) size 421x13 -
trunk/LayoutTests/platform/mac/fast/forms/input-disabled-color-expected.txt
r37123 r41742 62 62 RenderTextControl {INPUT} at (158,250) size 148x19 [color=#808080] [bgcolor=#FF0000] [border: (2px inset #808080)] 63 63 RenderBR {BR} at (308,264) size 0x0 64 layer at (13,31) size 142x13 scrollWidth 35 664 layer at (13,31) size 142x13 scrollWidth 357 65 65 RenderBlock {DIV} at (3,3) size 142x13 [color=#545454] 66 66 RenderText {#text} at (1,0) size 355x13 … … 70 70 RenderText {#text} at (1,0) size 156x13 71 71 text run at (1,0) width 156: "This text field is not disabled" 72 layer at (13,54) size 142x13 scrollWidth 35 672 layer at (13,54) size 142x13 scrollWidth 357 73 73 RenderBlock {DIV} at (3,3) size 142x13 74 74 RenderText {#text} at (1,0) size 355x13 … … 78 78 RenderText {#text} at (1,0) size 156x13 79 79 text run at (1,0) width 156: "This text field is not disabled" 80 layer at (13,77) size 142x13 scrollWidth 35 680 layer at (13,77) size 142x13 scrollWidth 357 81 81 RenderBlock {DIV} at (3,3) size 142x13 [color=#545454] 82 82 RenderText {#text} at (1,0) size 355x13 … … 86 86 RenderText {#text} at (1,0) size 156x13 87 87 text run at (1,0) width 156: "This text field is not disabled" 88 layer at (13,100) size 142x13 scrollWidth 35 688 layer at (13,100) size 142x13 scrollWidth 357 89 89 RenderBlock {DIV} at (3,3) size 142x13 [color=#AB0000] 90 90 RenderText {#text} at (1,0) size 355x13 … … 94 94 RenderText {#text} at (1,0) size 156x13 95 95 text run at (1,0) width 156: "This text field is not disabled" 96 layer at (13,123) size 142x13 scrollWidth 35 696 layer at (13,123) size 142x13 scrollWidth 357 97 97 RenderBlock {DIV} at (3,3) size 142x13 [color=#545454] 98 98 RenderText {#text} at (1,0) size 355x13 … … 102 102 RenderText {#text} at (1,0) size 156x13 103 103 text run at (1,0) width 156: "This text field is not disabled" 104 layer at (13,146) size 142x13 scrollWidth 35 6104 layer at (13,146) size 142x13 scrollWidth 357 105 105 RenderBlock {DIV} at (3,3) size 142x13 [color=#ABABAB] 106 106 RenderText {#text} at (1,0) size 355x13 … … 110 110 RenderText {#text} at (1,0) size 156x13 111 111 text run at (1,0) width 156: "This text field is not disabled" 112 layer at (13,169) size 142x13 scrollWidth 35 6112 layer at (13,169) size 142x13 scrollWidth 357 113 113 RenderBlock {DIV} at (3,3) size 142x13 [color=#545454] 114 114 RenderText {#text} at (1,0) size 355x13 … … 118 118 RenderText {#text} at (1,0) size 156x13 119 119 text run at (1,0) width 156: "This text field is not disabled" 120 layer at (13,192) size 142x13 scrollWidth 35 6120 layer at (13,192) size 142x13 scrollWidth 357 121 121 RenderBlock {DIV} at (3,3) size 142x13 122 122 RenderText {#text} at (1,0) size 355x13 … … 126 126 RenderText {#text} at (1,0) size 156x13 127 127 text run at (1,0) width 156: "This text field is not disabled" 128 layer at (13,215) size 142x13 scrollWidth 35 6128 layer at (13,215) size 142x13 scrollWidth 357 129 129 RenderBlock {DIV} at (3,3) size 142x13 [color=#2C2C2C] 130 130 RenderText {#text} at (1,0) size 355x13 … … 134 134 RenderText {#text} at (1,0) size 156x13 135 135 text run at (1,0) width 156: "This text field is not disabled" 136 layer at (13,238) size 142x13 scrollWidth 35 6136 layer at (13,238) size 142x13 scrollWidth 357 137 137 RenderBlock {DIV} at (3,3) size 142x13 138 138 RenderText {#text} at (1,0) size 355x13 … … 142 142 RenderText {#text} at (1,0) size 156x13 143 143 text run at (1,0) width 156: "This text field is not disabled" 144 layer at (13,261) size 142x13 scrollWidth 35 6144 layer at (13,261) size 142x13 scrollWidth 357 145 145 RenderBlock {DIV} at (3,3) size 142x13 [color=#2C2C2C] 146 146 RenderText {#text} at (1,0) size 355x13 -
trunk/LayoutTests/platform/mac/fast/forms/input-readonly-autoscroll-expected.checksum
r38121 r41742 1 ed03e7bcf4bc1ab228f2e302dfd675c2 1 0ffd8977853ebc4ebbe41d12f60ef47a -
trunk/LayoutTests/platform/mac/fast/forms/input-readonly-autoscroll-expected.txt
r30635 r41742 20 20 RenderBlock {DIV} at (0,91) size 784x18 21 21 RenderText {#text} at (0,0) size 87x18 22 text run at (0,0) width 87: "ScrollLeft: 1 7"22 text run at (0,0) width 87: "ScrollLeft: 18" 23 23 RenderBR {BR} at (87,14) size 0x0 24 layer at (13,81) size 142x13 scrollX 1 7 scrollWidth 15924 layer at (13,81) size 142x13 scrollX 18 scrollWidth 160 25 25 RenderBlock {DIV} at (3,3) size 142x13 26 26 RenderText {#text} at (1,0) size 158x13 -
trunk/LayoutTests/platform/mac/fast/forms/input-readonly-dimmed-expected.txt
r30635 r41742 10 10 RenderText {#text} at (0,0) size 0x0 11 11 RenderText {#text} at (0,0) size 0x0 12 layer at (13,31) size 142x13 scrollWidth 16 712 layer at (13,31) size 142x13 scrollWidth 168 13 13 RenderBlock {DIV} at (3,3) size 142x13 14 14 RenderText {#text} at (1,0) size 166x13 -
trunk/LayoutTests/platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.checksum
r41690 r41742 1 a982a121d2c058f404a2ef5f4e489524 1 cca21180369222b796e7533da2780a15 -
trunk/LayoutTests/platform/mac/fast/forms/linebox-overflow-in-textarea-padding-expected.txt
r41690 r41742 19 19 text run at (165,-17) width 18: " " 20 20 text run at (3,-6) width 162: "ggggggggg" 21 layer at (312,8) size 300x50 clip at (315,11) size 2 94x4421 layer at (312,8) size 300x50 clip at (315,11) size 279x44 scrollHeight 52 22 22 RenderBlock {DIV} at (304,0) size 300x50 [color=#0000FF] [border: (3px solid #FFFF00)] 23 RenderBlock {DIV} at (18,18) size 2 64x2223 RenderBlock {DIV} at (18,18) size 249x22 24 24 RenderText {#text} at (0,-17) size 162x46 25 25 text run at (0,-17) width 162: "ggggggggg" -
trunk/LayoutTests/platform/mac/fast/overflow/003-expected.checksum
r38121 r41742 1 8dcf7d413b27ca6bcbcea22d026b4646 1 de41952e4e60185a21d153b75e0c8a4c -
trunk/LayoutTests/platform/mac/fast/overflow/003-expected.txt
r25970 r41742 3 3 layer at (10,10) size 780x302 4 4 RenderBlock {fake} at (10,10) size 780x302 [bgcolor=#FFFF00] 5 layer at (10,10) size 282x302 clip at (11,11) size 265x300 scrollHeight 1 2925 layer at (10,10) size 282x302 clip at (11,11) size 265x300 scrollHeight 1302 6 6 RenderBlock {channel} at (0,0) size 282x302 [bgcolor=#EEEEEE] [border: (1px solid #000000)] 7 7 RenderBlock {title} at (11,11) size 255x19 -
trunk/LayoutTests/platform/mac/fast/overflow/004-expected.checksum
r38121 r41742 1 425e1058ac5e2a36394c198064da99e0 1 565185230b519cff00aa40ec0770d6ce -
trunk/LayoutTests/platform/mac/fast/overflow/007-expected.checksum
r38121 r41742 1 d497d1927de370992a9888521b39397a 1 903d7f027896fde4c1169c76e6917f07 -
trunk/LayoutTests/platform/mac/fast/overflow/007-expected.txt
r25970 r41742 4 4 RenderBlock {HTML} at (0,0) size 800x388 5 5 RenderBody {BODY} at (32,32) size 736x324 [bgcolor=#CCCCCC] 6 layer at (143,32) size 514x146 clip at (144,33) size 497x144 scrollHeight 2846 layer at (143,32) size 514x146 clip at (144,33) size 497x144 scrollHeight 312 7 7 RenderBlock {DIV} at (111,0) size 514x146 [bgcolor=#FFFFFF] [border: (1px solid #999999)] 8 8 RenderBlock {P} at (17,17) size 465x72 … … 49 49 RenderText {#text} at (8,8) size 24x18 50 50 text run at (8,8) width 24: "hi 1" 51 layer at (143,210) size 514x146 clip at (144,211) size 497x144 scrollHeight 3 3651 layer at (143,210) size 514x146 clip at (144,211) size 497x144 scrollHeight 364 52 52 RenderBlock (relative positioned) {DIV} at (111,178) size 514x146 [bgcolor=#FFFFFF] [border: (1px solid #999999)] 53 53 RenderBlock {P} at (17,17) size 465x36 -
trunk/LayoutTests/platform/mac/fast/overflow/clip-rects-fixed-ancestor-expected.txt
r30635 r41742 115 115 RenderText {#text} at (0,0) size 108x18 116 116 text run at (0,0) width 108: ".overflowHidden" 117 layer at (327,427) size 118x30 clip at (328,428) size 116x28 117 layer at (327,427) size 118x30 clip at (328,428) size 116x28 scrollWidth 118 118 118 RenderBlock {DIV} at (11,29) size 118x30 [border: (1px solid #999999)] 119 119 RenderText {#text} at (6,6) size 108x18 … … 157 157 RenderText {#text} at (0,0) size 108x18 158 158 text run at (0,0) width 108: ".overflowHidden" 159 layer at (527,427) size 118x30 clip at (528,428) size 116x28 159 layer at (527,427) size 118x30 clip at (528,428) size 116x28 scrollWidth 118 160 160 RenderBlock {DIV} at (11,29) size 118x30 [border: (1px solid #999999)] 161 161 RenderText {#text} at (6,6) size 108x18 … … 204 204 RenderText {#text} at (0,0) size 108x18 205 205 text run at (0,0) width 108: ".overflowHidden" 206 layer at (738,456) size 96x30 backgroundClip at (738,456) size 47x30 clip at (739,457) size 46x28 outlineClip at (728,428) size 57x68 scrollWidth 11 3206 layer at (738,456) size 96x30 backgroundClip at (738,456) size 47x30 clip at (739,457) size 46x28 outlineClip at (728,428) size 57x68 scrollWidth 118 207 207 RenderBlock {DIV} at (11,29) size 96x30 [border: (1px solid #999999)] 208 208 RenderText {#text} at (6,6) size 108x18 -
trunk/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-expected.checksum
r38121 r41742 1 944184c0b5e423869b33972d809d793a1 d2d421e8870e799ec73ae783ec936aea -
trunk/LayoutTests/platform/mac/fast/repaint/selection-gap-overflow-scroll-expected.txt
r30635 r41742 17 17 RenderText {#text} at (84,18) size 4x18 18 18 text run at (84,18) width 4: "." 19 layer at (13,60) size 126x126 clip at (16,63) size 105x120 scrollY 26 scrollHeight 14619 layer at (13,60) size 126x126 clip at (16,63) size 105x120 scrollY 36 scrollHeight 156 20 20 RenderBlock {DIV} at (5,52) size 126x126 [border: (3px solid #000000)] 21 21 RenderBlock {DIV} at (13,13) size 85x100 -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-textarea-expected.checksum
r38121 r41742 1 4aabc04c7cac2710f2bdd3dcfbd522ee 1 0c5a03fe099d270e74cd6870ea2ce014 -
trunk/LayoutTests/platform/mac/fast/replaced/width100percent-textarea-expected.txt
r32226 r41742 38 38 RenderText {#text} at (3,0) size 20x13 39 39 text run at (3,0) width 20: "one" 40 layer at (177,31) size 6x26 clip at (0,0) size 0x0 scrollWidth 1 3scrollHeight 3940 layer at (177,31) size 6x26 clip at (0,0) size 0x0 scrollWidth 15 scrollHeight 39 41 41 RenderBlock {DIV} at (1,1) size 6x26 42 42 RenderText {#text} at (3,0) size 9x39 … … 44 44 text run at (3,13) width 9: "w" 45 45 text run at (3,26) width 7: "o" 46 layer at (182,31) size 6x26 clip at (0,0) size 0x0 scrollWidth 1 1scrollHeight 6546 layer at (182,31) size 6x26 clip at (0,0) size 0x0 scrollWidth 13 scrollHeight 65 47 47 RenderBlock {DIV} at (1,1) size 6x26 48 48 RenderText {#text} at (3,0) size 7x65 … … 56 56 RenderText {#text} at (3,0) size 74x13 57 57 text run at (3,0) width 74: "one two three" 58 layer at (246,103) size 6x26 clip at (0,0) size 0x0 scrollWidth 1 3scrollHeight 3958 layer at (246,103) size 6x26 clip at (0,0) size 0x0 scrollWidth 15 scrollHeight 39 59 59 RenderBlock {DIV} at (1,1) size 6x26 60 60 RenderText {#text} at (3,0) size 9x39 … … 62 62 text run at (3,13) width 9: "w" 63 63 text run at (3,26) width 7: "o" 64 layer at (251,103) size 6x26 clip at (0,0) size 0x0 scrollWidth 1 1scrollHeight 6564 layer at (251,103) size 6x26 clip at (0,0) size 0x0 scrollWidth 13 scrollHeight 65 65 65 RenderBlock {DIV} at (1,1) size 6x26 66 66 RenderText {#text} at (3,0) size 7x65 -
trunk/LayoutTests/platform/mac/scrollbars/overflow-scrollbar-combinations-expected.txt
r37565 r41742 30 30 text run at (334,420) width 4: " " 31 31 RenderText {#text} at (0,0) size 0x0 32 layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 20 2032 layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 2030 33 33 RenderBlock {DIV} at (20,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] 34 34 RenderText {#text} at (11,11) size 89x780 … … 171 171 text run at (11,1991) width 90: "Proin imperdiet" 172 172 text run at (11,2006) width 89: "lacus eu tellus." 173 layer at (197,28) size 125x100 clip at (198,29) size 110x98 scrollHeight 20 20173 layer at (197,28) size 125x100 clip at (198,29) size 110x98 scrollHeight 2030 174 174 RenderBlock {DIV} at (189,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] 175 175 RenderText {#text} at (11,11) size 89x780 … … 348 348 text run at (10,400) width 372: "Nulla facilisi. Proin varius pede et dui lacinia dapibus. Morbi nec" 349 349 text run at (10,415) width 228: "augue. Proin imperdiet lacus eu tellus." 350 layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 20 20350 layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 2030 351 351 RenderBlock {DIV} at (527,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] 352 352 RenderText {#text} at (11,11) size 89x780 … … 489 489 text run at (11,1991) width 90: "Proin imperdiet" 490 490 text run at (11,2006) width 89: "lacus eu tellus." 491 layer at (28,168) size 125x100 clip at (29,169) size 110x98 scrollHeight 20 20491 layer at (28,168) size 125x100 clip at (29,169) size 110x98 scrollHeight 2030 492 492 RenderBlock {DIV} at (20,160) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] 493 493 RenderText {#text} at (11,11) size 89x780 … … 666 666 text run at (10,400) width 372: "Nulla facilisi. Proin varius pede et dui lacinia dapibus. Morbi nec" 667 667 text run at (10,415) width 228: "augue. Proin imperdiet lacus eu tellus." 668 layer at (366,168) size 125x100 clip at (367,169) size 110x98 scrollHeight 20 20668 layer at (366,168) size 125x100 clip at (367,169) size 110x98 scrollHeight 2030 669 669 RenderBlock {DIV} at (358,160) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] 670 670 RenderText {#text} at (11,11) size 89x780 … … 821 821 text run at (10,130) width 377: "condimentum ut, tortor. Integer est. Quisque viverra. Praesent" 822 822 text run at (10,145) width 338: "sed arcu. Maecenas id lorem a leo lobortis condimentum." 823 layer at (28,308) size 125x100 clip at (29,309) size 110x98 scrollHeight 20 20823 layer at (28,308) size 125x100 clip at (29,309) size 110x98 scrollHeight 2030 824 824 RenderBlock {DIV} at (20,300) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] 825 825 RenderText {#text} at (11,11) size 89x780 -
trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug83786-expected.txt
r30635 r41742 4 4 RenderBlock {HTML} at (0,0) size 800x136 5 5 RenderBody {BODY} at (0,0) size 800x136 6 layer at (0,0) size 266x136 clip at (3,3) size 260x130 scroll Height 1446 layer at (0,0) size 266x136 clip at (3,3) size 260x130 scrollWidth 324 scrollHeight 144 7 7 RenderBlock {DIV} at (0,0) size 266x136 [border: (3px solid #008000)] 8 8 RenderTable {TABLE} at (16,3) size 64x143 -
trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug106966-expected.txt
r30635 r41742 177 177 RenderText {#text} at (1,1) size 30x18 178 178 text run at (1,1) width 30: "cell1" 179 layer at (115,1333) size 53x20 scrollWidth 13 0179 layer at (115,1333) size 53x20 scrollWidth 131 180 180 RenderTableCell {TD} at (82,15) size 53x20 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] 181 181 RenderText {#text} at (1,1) size 129x18 -
trunk/WebCore/ChangeLog
r41741 r41742 1 2009-03-12 David Hyatt <hyatt@apple.com> 2 3 Reviewed by Eric Seidel 4 5 https://bugs.webkit.org/show_bug.cgi?id=13632 6 7 Overflow scrolling needs to account for the bottom/right padding on the object itself as well 8 as for bottom/right margins on children. 9 10 Existing tests cover this. 11 12 * rendering/RenderBlock.cpp: 13 (WebCore::RenderBlock::lowestPosition): 14 (WebCore::RenderBlock::rightmostPosition): 15 1 16 2009-03-16 Sam Weinig <sam@webkit.org> 2 17 -
trunk/WebCore/rendering/RenderBlock.cpp
r41537 r41742 2718 2718 } 2719 2719 2720 if (!includeSelf && lastLineBox()) { 2721 int lp = lastLineBox()->y() + lastLineBox()->height(); 2722 bottom = max(bottom, lp); 2720 if (!includeSelf) { 2721 bottom = max(bottom, borderTop() + paddingTop() + paddingBottom()); 2722 if (childrenInline()) { 2723 if (lastLineBox()) { 2724 int childBottomEdge = lastLineBox()->y() + lastLineBox()->height(); 2725 bottom = max(bottom, childBottomEdge + paddingBottom()); 2726 } 2727 } else { 2728 // Find the last normal flow child. 2729 RenderBox* currBox = lastChildBox(); 2730 while (currBox && currBox->isFloatingOrPositioned()) 2731 currBox = currBox->previousSiblingBox(); 2732 if (currBox) { 2733 int childBottomEdge = currBox->y() + currBox->height() + currBox->collapsedMarginBottom(); 2734 bottom = max(bottom, childBottomEdge + paddingBottom()); 2735 } 2736 } 2723 2737 } 2724 2738 … … 2794 2808 } 2795 2809 2796 if (!includeSelf && firstLineBox()) { 2797 for (InlineRunBox* currBox = firstLineBox(); currBox; currBox = currBox->nextLineBox()) { 2798 int rp = currBox->x() + currBox->width(); 2799 // If this node is a root editable element, then the rightmostPosition should account for a caret at the end. 2800 // FIXME: Need to find another way to do this, since scrollbars could show when we don't want them to. 2801 if (node() && node()->isContentEditable() && node() == node()->rootEditableElement() && style()->direction() == LTR) 2802 rp += 1; 2803 right = max(right, rp); 2810 if (!includeSelf) { 2811 right = max(right, borderLeft() + paddingLeft() + paddingRight()); 2812 if (childrenInline()) { 2813 for (InlineRunBox* currBox = firstLineBox(); currBox; currBox = currBox->nextLineBox()) { 2814 int childRightEdge = currBox->x() + currBox->width(); 2815 2816 // If this node is a root editable element, then the rightmostPosition should account for a caret at the end. 2817 // FIXME: Need to find another way to do this, since scrollbars could show when we don't want them to. 2818 if (node() && node()->isContentEditable() && node() == node()->rootEditableElement() && style()->direction() == LTR && !paddingRight()) 2819 childRightEdge += 1; 2820 right = max(right, childRightEdge + paddingRight()); 2821 } 2822 } else { 2823 // Walk all normal flow children. 2824 for (RenderBox* currBox = firstChildBox(); currBox; currBox = currBox->nextSiblingBox()) { 2825 if (currBox->isFloatingOrPositioned()) 2826 continue; 2827 int childRightEdge = currBox->x() + currBox->width() + currBox->marginRight(); 2828 right = max(right, childRightEdge + paddingRight()); 2829 } 2804 2830 } 2805 2831 }
Note: See TracChangeset
for help on using the changeset viewer.