Changeset 128517 in webkit
- Timestamp:
- Sep 13, 2012 3:56:07 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r128516 r128517 1 2012-09-13 Ojan Vafai <ojan@chromium.org> 2 3 percentage heights in quirks mode with auto-sized body are computed incorrectly 4 https://bugs.webkit.org/show_bug.cgi?id=96426 5 6 Reviewed by Tony Chang. 7 8 * fast/css/percentage-height-auto-sized-body-quirks-expected.txt: Added. 9 * fast/css/percentage-height-auto-sized-body-quirks.html: Added. 10 Verified that this matches IE9, FF15 and Opera12. 11 12 * fast/writing-mode/percentage-height-orthogonal-writing-modes-quirks-expected.txt: 13 * platform/chromium-linux/fast/table/height-percent-test-expected.png: 14 * platform/chromium-linux/tables/mozilla/core/cell_heights-expected.png: 15 * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug19526-expected.png: 16 * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug85016-expected.png: 17 * platform/chromium-win/tables/mozilla/core/cell_heights-expected.txt: 18 * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug19526-expected.txt: 19 * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug85016-expected.txt: 20 * platform/mac/fast/table/height-percent-test-expected.txt: 21 Verified that all the changes match FF15. 22 1 23 2012-09-13 Ojan Vafai <ojan@chromium.org> 2 24 -
trunk/LayoutTests/fast/writing-mode/percentage-height-orthogonal-writing-modes-quirks-expected.txt
r128375 r128517 26 26 </div> 27 27 </div> 28 FAIL: 29 Expected 584 for height, but got 1447. 30 31 <div class="container" style="width: auto; height: auto; float: left;"> 32 <div class="item" style="width: 100%; height: 100%;" data-expected-height="584" data-expected-width="0"></div> 33 </div> 28 PASS 34 29 FAIL: 35 30 Expected 584 for height, but got 600. -
trunk/LayoutTests/fast/writing-mode/percentage-height-orthogonal-writing-modes-quirks.html
r128375 r128517 72 72 </div> 73 73 74 <!-- FIXME: We incorrectly use the size of the body element for calculating the percentage height. https://bugs.webkit.org/show_bug.cgi?id=96426 -->75 74 <div class="container" style="width: auto; height: auto; float: left;"> 76 75 <div class="item" style="width: 100%; height: 100%;" data-expected-height=584 data-expected-width=0></div> -
trunk/LayoutTests/platform/chromium-win/tables/mozilla/core/cell_heights-expected.txt
r56259 r128517 1 layer at (0,0) size 785x 158401 layer at (0,0) size 785x4366 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 158404 RenderBlock {HTML} at (0,0) size 785x 158405 RenderBody {BODY} at (8,8) size 769x 158243 layer at (0,0) size 785x4366 4 RenderBlock {HTML} at (0,0) size 785x4366 5 RenderBody {BODY} at (8,8) size 769x4350 6 6 RenderTable {TABLE} at (0,0) size 39x584 [bgcolor=#0000FF] [border: (1px outset #808080)] 7 7 RenderTableSection {TBODY} at (1,1) size 37x582 … … 89 89 RenderBlock (anonymous) at (0,1668) size 769x20 90 90 RenderBR {BR} at (0,0) size 0x19 91 RenderTable {TABLE} at (0,1688) size 39x 1688[bgcolor=#FFA500] [border: (1px outset #808080)]92 RenderTableSection {TBODY} at (1,1) size 37x 168693 RenderTableRow {TR} at (0,2) size 37x 33594 RenderTableCell {TD} at (2, 157) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]91 RenderTable {TABLE} at (0,1688) size 39x584 [bgcolor=#FFA500] [border: (1px outset #808080)] 92 RenderTableSection {TBODY} at (1,1) size 37x582 93 RenderTableRow {TR} at (0,2) size 37x114 94 RenderTableCell {TD} at (2,47) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 95 95 RenderText {#text} at (2,2) size 29x19 96 96 text run at (2,2) width 29: "20%" 97 RenderTableRow {TR} at (0, 339) size 37x134598 RenderTableCell {TD} at (2, 999) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]97 RenderTableRow {TR} at (0,118) size 37x462 98 RenderTableCell {TD} at (2,337) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] 99 99 RenderText {#text} at (2,2) size 29x19 100 100 text run at (2,2) width 29: "80%" 101 RenderBlock (anonymous) at (0, 3376) size 769x20101 RenderBlock (anonymous) at (0,2272) size 769x20 102 102 RenderBR {BR} at (0,0) size 0x19 103 RenderTable {TABLE} at (0, 3396) size 61x206 [bgcolor=#808080] [border: (1px outset #808080)]103 RenderTable {TABLE} at (0,2292) size 61x206 [bgcolor=#808080] [border: (1px outset #808080)] 104 104 RenderTableSection {TBODY} at (1,1) size 59x204 105 105 RenderTableRow {TR} at (0,2) size 59x200 … … 110 110 RenderText {#text} at (2,2) size 24x19 111 111 text run at (2,2) width 24: "200" 112 RenderBlock (anonymous) at (0, 3602) size 769x20112 RenderBlock (anonymous) at (0,2498) size 769x20 113 113 RenderBR {BR} at (0,0) size 0x19 114 RenderTable {TABLE} at (0, 3622) size 61x198 [bgcolor=#FFA500] [border: (1px outset #808080)]114 RenderTable {TABLE} at (0,2518) size 61x198 [bgcolor=#FFA500] [border: (1px outset #808080)] 115 115 RenderTableSection {TBODY} at (1,1) size 59x196 116 116 RenderTableRow {TR} at (0,2) size 59x192 … … 121 121 RenderText {#text} at (2,2) size 16x19 122 122 text run at (2,2) width 16: "20" 123 RenderBlock (anonymous) at (0, 3820) size 769x20123 RenderBlock (anonymous) at (0,2716) size 769x20 124 124 RenderBR {BR} at (0,0) size 0x19 125 RenderTable {TABLE} at (0, 3840) size 39x3839[border: (1px outset #808080)]126 RenderTableSection {TBODY} at (1,1) size 37x 3837127 RenderTableRow {TR} at (0,2) size 37x5 37128 RenderTableCell {TD} at (2,2 58) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]125 RenderTable {TABLE} at (0,2736) size 39x584 [border: (1px outset #808080)] 126 RenderTableSection {TBODY} at (1,1) size 37x582 127 RenderTableRow {TR} at (0,2) size 37x500 128 RenderTableCell {TD} at (2,240) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 129 129 RenderText {#text} at (2,2) size 24x19 130 130 text run at (2,2) width 24: "500" 131 RenderTableRow {TR} at (0,5 41) size 37x3294132 RenderTableCell {TD} at (2, 2176) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]131 RenderTableRow {TR} at (0,504) size 37x76 132 RenderTableCell {TD} at (2,530) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] 133 133 RenderText {#text} at (2,2) size 29x19 134 134 text run at (2,2) width 29: "80%" 135 RenderBlock (anonymous) at (0, 7679) size 769x20135 RenderBlock (anonymous) at (0,3320) size 769x20 136 136 RenderBR {BR} at (0,0) size 0x19 137 RenderTable {TABLE} at (0, 7699) size 100x7699[bgcolor=#FF0000] [border: (1px outset #808080)]138 RenderTableSection {TBODY} at (1,1) size 98x 7697139 RenderTableRow {TR} at (0,2) size 98x 2413140 RenderTableCell {TD} at (2,2 629) size 30x24 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1]137 RenderTable {TABLE} at (0,3340) size 100x584 [bgcolor=#FF0000] [border: (1px outset #808080)] 138 RenderTableSection {TBODY} at (1,1) size 98x582 139 RenderTableRow {TR} at (0,2) size 98x41 140 RenderTableCell {TD} at (2,257) size 30x24 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1] 141 141 RenderText {#text} at (2,2) size 24x19 142 142 text run at (2,2) width 24: "500" 143 RenderTableCell {TD} at (34,1 196) size 30x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]143 RenderTableCell {TD} at (34,10) size 30x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 144 144 RenderText {#text} at (2,2) size 26x19 145 145 text run at (2,2) width 26: "auto" 146 RenderTableRow {TR} at (0, 2417) size 98x2863147 RenderTableCell {TD} at (34, 3836) size 30x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]146 RenderTableRow {TR} at (0,45) size 98x491 147 RenderTableCell {TD} at (34,278) size 30x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] 148 148 RenderText {#text} at (2,2) size 26x19 149 149 text run at (2,2) width 26: "auto" 150 RenderTableCell {TD} at (66, 3836) size 30x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]150 RenderTableCell {TD} at (66,278) size 30x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] 151 151 RenderText {#text} at (2,2) size 26x19 152 152 text run at (2,2) width 26: "auto" 153 RenderTableRow {TR} at (0,5 282) size 98x2413154 RenderTableCell {TD} at (2, 6476) size 30x24 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]153 RenderTableRow {TR} at (0,538) size 98x42 154 RenderTableCell {TD} at (2,547) size 30x24 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] 155 155 RenderText {#text} at (2,2) size 26x19 156 156 text run at (2,2) width 26: "auto" 157 RenderTableCell {TD} at (34, 6476) size 30x24 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]157 RenderTableCell {TD} at (34,547) size 30x24 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] 158 158 RenderText {#text} at (2,2) size 26x19 159 159 text run at (2,2) width 26: "auto" 160 RenderBlock (anonymous) at (0, 15398) size 769x20160 RenderBlock (anonymous) at (0,3924) size 769x20 161 161 RenderBR {BR} at (0,0) size 0x19 162 RenderTable {TABLE} at (0, 15418) size 53x406 [bgcolor=#FFA500] [border: (1px outset #808080)]162 RenderTable {TABLE} at (0,3944) size 53x406 [bgcolor=#FFA500] [border: (1px outset #808080)] 163 163 RenderTableSection {TBODY} at (1,1) size 51x404 164 164 RenderTableRow {TR} at (0,2) size 51x400 -
trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug19526-expected.txt
r56259 r128517 1 layer at (0,0) size 785x1 3441 layer at (0,0) size 785x1272 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x1 3444 RenderBlock {HTML} at (0,0) size 785x1 3445 RenderBody {BODY} at (8,8) size 769x1 3283 layer at (0,0) size 785x1272 4 RenderBlock {HTML} at (0,0) size 785x1272 5 RenderBody {BODY} at (8,8) size 769x1256 6 6 RenderBlock {P} at (0,0) size 769x20 7 7 RenderText {#text} at (0,0) size 335x19 … … 26 26 RenderText {#text} at (0,0) size 327x19 27 27 text run at (0,0) width 327: "50 percent height table inside 100 percent height table:" 28 RenderTable {TABLE} at (0,672) size 769x 656[bgcolor=#808080] [border: (1px outset #808080)]29 RenderTableSection {TBODY} at (1,1) size 767x 65430 RenderTableRow {TR} at (0,2) size 767x 65031 RenderTableCell {TD} at (2,1 63) size 381x327[border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]32 RenderTable {TABLE} at (2,2) size 377x 323[bgcolor=#FFFF00] [border: (1px outset #808080)]33 RenderTableSection {TBODY} at (1,1) size 375x 32134 RenderTableRow {TR} at (0,2) size 375x 31735 RenderTableCell {TD} at (2,1 48) size 185x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]28 RenderTable {TABLE} at (0,672) size 769x584 [bgcolor=#808080] [border: (1px outset #808080)] 29 RenderTableSection {TBODY} at (1,1) size 767x582 30 RenderTableRow {TR} at (0,2) size 767x578 31 RenderTableCell {TD} at (2,145) size 381x291 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 32 RenderTable {TABLE} at (2,2) size 377x287 [bgcolor=#FFFF00] [border: (1px outset #808080)] 33 RenderTableSection {TBODY} at (1,1) size 375x285 34 RenderTableRow {TR} at (0,2) size 375x281 35 RenderTableCell {TD} at (2,130) size 185x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] 36 36 RenderText {#text} at (2,2) size 126x19 37 37 text run at (2,2) width 126: " Inner Table (yellow)" 38 RenderTableCell {TD} at (189,1 48) size 184x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]38 RenderTableCell {TD} at (189,130) size 184x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 39 39 RenderText {#text} at (2,2) size 4x19 40 40 text run at (2,2) width 4: " " 41 RenderTableCell {TD} at (385, 315) size 380x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]41 RenderTableCell {TD} at (385,279) size 380x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] 42 42 RenderText {#text} at (2,2) size 117x19 43 43 text run at (2,2) width 117: " Outer Table (grey)" -
trunk/LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug85016-expected.txt
r112904 r128517 1 layer at (0,0) size 960x2 9881 layer at (0,0) size 960x2063 2 2 RenderView at (0,0) size 785x585 3 layer at (0,0) size 785x2 9884 RenderBlock {HTML} at (0,0) size 785x2 9885 RenderBody {BODY} at (32,32) size 721x 29243 layer at (0,0) size 785x2063 4 RenderBlock {HTML} at (0,0) size 785x2063 5 RenderBody {BODY} at (32,32) size 721x1999 6 6 RenderBlock {DIV} at (32,0) size 657x653 [border: (1px solid #008000)] 7 7 RenderBlock {DIV} at (33,33) size 591x587 [border: (1px solid #FF0000)] … … 18 18 RenderText {#text} at (0,0) size 443x19 19 19 text run at (0,0) width 443: "percentage height image in table cell (red), in a DIV with no height (green)" 20 RenderBlock {DIV} at (32,1478) size 657x 144621 RenderTable {TABLE} at (0,0) size 260x 1446[border: (1px solid #FF0000)]22 RenderTableSection {TBODY} at (1,1) size 258x 144423 RenderTableRow {TR} at (0,2) size 258x 144024 RenderTableCell {TD} at (2, 635) size 254x174 [border: (1px solid #FF0000)] [r=0 c=0 rs=1 cs=1]20 RenderBlock {DIV} at (32,1478) size 657x521 21 RenderTable {TABLE} at (0,0) size 260x521 [border: (1px solid #FF0000)] 22 RenderTableSection {TBODY} at (1,1) size 258x519 23 RenderTableRow {TR} at (0,2) size 258x515 24 RenderTableCell {TD} at (2,172) size 254x174 [border: (1px solid #FF0000)] [r=0 c=0 rs=1 cs=1] 25 25 RenderImage {IMG} at (2,2) size 250x170 -
trunk/LayoutTests/platform/chromium/TestExpectations
r128515 r128517 3627 3627 BUGWK96524 WIN LINUX DEBUG : fast/filesystem/workers/detached-frame-crash.html = PASS CRASH 3628 3628 3629 BUG_OJAN WIN MAC : fast/table/height-percent-test.html = TEXT IMAGE+TEXT IMAGE 3630 BUG_OJAN WIN MAC : tables/mozilla/core/cell_heights.html = TEXT IMAGE+TEXT IMAGE 3631 BUG_OJAN WIN MAC : tables/mozilla_expected_failures/bugs/bug19526.html = TEXT IMAGE+TEXT IMAGE 3632 BUG_OJAN WIN MAC : tables/mozilla_expected_failures/bugs/bug85016.html = TEXT IMAGE+TEXT IMAGE 3633 3629 3634 BUGWK96549 MAC : platform/chromium/virtual/gpu/fast/hidpi/focus-rings.html = IMAGE 3630 3635 BUGWK96549 MAC : platform/chromium/virtual/gpu/fast/hidpi/video-controls-in-hidpi.html = IMAGE -
trunk/LayoutTests/platform/efl/TestExpectations
r128454 r128517 1048 1048 BUGWK88238 SKIP : editing/pasteboard/paste-global-selection.html = TEXT 1049 1049 1050 BUG_OJAN : fast/table/height-percent-test.html = TEXT IMAGE+TEXT IMAGE 1051 BUG_OJAN : tables/mozilla/core/cell_heights.html = TEXT IMAGE+TEXT IMAGE 1052 BUG_OJAN : tables/mozilla_expected_failures/bugs/bug19526.html = TEXT IMAGE+TEXT IMAGE 1053 1050 1054 // Fails after r128270. 1051 1055 BUGWK96517 : fast/events/popup-blocking-timers.html = TEXT -
trunk/LayoutTests/platform/gtk/TestExpectations
r128452 r128517 1375 1375 BUGWK96594 : fast/table/bad-replaced-sizing-preferred-logical-widths.html = TEXT 1376 1376 1377 BUG_OJAN : fast/table/height-percent-test.html = TEXT IMAGE+TEXT IMAGE 1378 BUG_OJAN : tables/mozilla/core/cell_heights.html = TEXT IMAGE+TEXT IMAGE 1379 BUG_OJAN : tables/mozilla_expected_failures/bugs/bug19526.html = TEXT IMAGE+TEXT IMAGE 1380 BUG_OJAN : tables/mozilla_expected_failures/bugs/bug85016.html = TEXT IMAGE+TEXT IMAGE 1381 1377 1382 BUGWK73003 DEBUG : editing/spelling/spellcheck-async.html = TEXT 1378 1383 BUGWK73003 DEBUG : editing/spelling/spellcheck-paste.html = PASS -
trunk/LayoutTests/platform/mac/TestExpectations
r128412 r128517 356 356 BUGWK96583 : fast/writing-mode/percentage-height-orthogonal-writing-modes-quirks.html = TEXT 357 357 358 BUG_OJAN : fast/table/height-percent-test.html = TEXT IMAGE+TEXT IMAGE 359 BUG_OJAN : tables/mozilla/core/cell_heights.html = TEXT IMAGE+TEXT IMAGE 360 BUG_OJAN : tables/mozilla_expected_failures/bugs/bug19526.html = TEXT IMAGE+TEXT IMAGE 361 358 362 // New test added in r128389 359 363 BUGWK96594 : fast/table/bad-replaced-sizing-preferred-logical-widths.html = TEXT -
trunk/LayoutTests/platform/mac/fast/table/height-percent-test-expected.txt
r25970 r128517 1 layer at (0,0) size 785x13 741 layer at (0,0) size 785x1304 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x13 744 RenderBlock {HTML} at (0,0) size 785x13 745 RenderBody {BODY} at (8,16) size 769x1 3423 layer at (0,0) size 785x1304 4 RenderBlock {HTML} at (0,0) size 785x1304 5 RenderBody {BODY} at (8,16) size 769x1272 6 6 RenderBlock {DIV} at (16,0) size 737x26 [border: (1px solid #000000)] 7 7 RenderBlock (floating) {DIV} at (1,1) size 100x24 … … 14 14 RenderTableCell {TD} at (0,1) size 96x22 [r=0 c=0 rs=1 cs=1] 15 15 RenderImage {IMG} at (0,0) size 96x22 [bgcolor=#008000] 16 RenderBlock {DIV} at (16,84) size 737x5 78[border: (1px solid #000000)]17 RenderBlock {DIV} at (1,1) size 735x5 7618 RenderBlock {DIV} at (0,0) size 100x5 76[bgcolor=#008000]19 RenderBlock {DIV} at (16,6 78) size 737x664[border: (1px solid #000000)]20 RenderBlock {DIV} at (1,1) size 735x 66221 RenderTable {TABLE} at (0,0) size 96x 662[bgcolor=#FF0000]22 RenderTableSection {TBODY} at (0,0) size 96x 66223 RenderTableRow {TR} at (0,0) size 96x 66224 RenderTableCell {TD} at (0, 320) size 96x22 [r=0 c=0 rs=1 cs=1]16 RenderBlock {DIV} at (16,84) size 737x586 [border: (1px solid #000000)] 17 RenderBlock {DIV} at (1,1) size 735x584 18 RenderBlock {DIV} at (0,0) size 100x584 [bgcolor=#008000] 19 RenderBlock {DIV} at (16,686) size 737x586 [border: (1px solid #000000)] 20 RenderBlock {DIV} at (1,1) size 735x584 21 RenderTable {TABLE} at (0,0) size 96x584 [bgcolor=#FF0000] 22 RenderTableSection {TBODY} at (0,0) size 96x584 23 RenderTableRow {TR} at (0,0) size 96x584 24 RenderTableCell {TD} at (0,281) size 96x22 [r=0 c=0 rs=1 cs=1] 25 25 RenderImage {IMG} at (0,0) size 96x22 [bgcolor=#008000] -
trunk/LayoutTests/platform/qt/TestExpectations
r128129 r128517 134 134 BUGWK94004 : css2.1/20110323/c541-word-sp-000.htm = IMAGE 135 135 136 BUG_OJAN : fast/table/height-percent-test.html = TEXT IMAGE+TEXT IMAGE 137 BUG_OJAN : tables/mozilla/core/cell_heights.html = TEXT IMAGE+TEXT IMAGE 138 BUG_OJAN : tables/mozilla_expected_failures/bugs/bug19526.html = TEXT IMAGE+TEXT IMAGE 139 BUG_OJAN : tables/mozilla_expected_failures/bugs/bug85016.html = TEXT IMAGE+TEXT IMAGE 140 136 141 // Added by bug 89826 137 142 BUGWK94005 : css2.1/20110323/word-spacing-remove-space-003.htm = IMAGE -
trunk/Source/WebCore/ChangeLog
r128514 r128517 1 2012-09-13 Ojan Vafai <ojan@chromium.org> 2 3 percentage heights in quirks mode with auto-sized body are computed incorrectly 4 https://bugs.webkit.org/show_bug.cgi?id=96426 5 6 Reviewed by Tony Chang. 7 8 In quirks mode, for the body element, we need to keep walking up to the html element 9 if the body's height is auto. Also, we need to subtract the body/html elements 10 margin/border/padding so that we properly get the body's content height. 11 12 This behavior matches IE9, FF and Opera. 13 14 None of this applies to standards mode since we don't walk up the 15 containingBlock chain for auto-sized elements. 16 17 Test: fast/css/percentage-height-auto-sized-body-quirks.html 18 19 * rendering/RenderBox.cpp: 20 (WebCore::RenderBox::computePercentageLogicalHeight): 21 1 22 2012-09-13 Adrienne Walker <enne@google.com> 2 23 -
trunk/Source/WebCore/rendering/RenderBox.cpp
r128478 r128517 2131 2131 bool skippedAutoHeightContainingBlock = false; 2132 2132 RenderBlock* cb = containingBlock(); 2133 while (!cb->isRenderView() && !cb->isBody() && !cb->isTableCell() && !cb->isOutOfFlowPositioned() && cb->style()->logicalHeight().isAuto() && isHorizontalWritingMode() == cb->isHorizontalWritingMode()) { 2133 LayoutUnit rootMarginBorderPaddingHeight = 0; 2134 while (!cb->isRenderView() && !cb->isTableCell() && !cb->isOutOfFlowPositioned() && cb->style()->logicalHeight().isAuto() && isHorizontalWritingMode() == cb->isHorizontalWritingMode()) { 2134 2135 if (!document()->inQuirksMode() && !cb->isAnonymousBlock()) 2135 2136 break; 2137 if (cb->isBody() || cb->isRoot()) 2138 rootMarginBorderPaddingHeight += cb->marginBefore() + cb->marginAfter() + cb->borderAndPaddingLogicalHeight(); 2136 2139 skippedAutoHeightContainingBlock = true; 2137 2140 cb = cb->containingBlock(); … … 2183 2186 availableHeight = max<LayoutUnit>(0, contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight()); 2184 2187 } 2185 } else if (cb->isRenderView() || (cb->isBody() && document()->inQuirksMode()) ||isOutOfFlowPositionedWithSpecifiedHeight) {2188 } else if (cb->isRenderView() || isOutOfFlowPositionedWithSpecifiedHeight) { 2186 2189 // Don't allow this to affect the block' height() member variable, since this 2187 2190 // can get called while the block is still laying out its kids. … … 2194 2197 if (availableHeight == -1) 2195 2198 return availableHeight; 2199 2200 availableHeight -= rootMarginBorderPaddingHeight; 2196 2201 2197 2202 LayoutUnit result = valueForLength(height, availableHeight);
Note: See TracChangeset
for help on using the changeset viewer.