Changeset 124347 in webkit
- Timestamp:
- Aug 1, 2012 11:16:58 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r124340 r124347 1 2012-07-31 Robert Hogan <robert@webkit.org> 2 3 CSS 2.1 failure: margin-collapse-012 fails 4 https://bugs.webkit.org/show_bug.cgi?id=80219 5 6 Reviewed by Eric Seidel. 7 8 * css2.1/20110323/margin-collapse-012.htm: Added. 9 * css2.1/20110323/margin-collapse-012-expected.html: Added. 10 * fast/css/margin-collapse-abspos-negmargin-expected.html: Added. 11 * fast/css/margin-collapse-abspos-negmargin.htm: Added. 12 13 * fast/block/positioning/auto/001.html: 14 * fast/block/positioning/auto/002.html: 15 * fast/block/positioning/auto/vertical-lr/002.html: 16 * fast/block/positioning/auto/vertical-rl/002.html: 17 * fast/dynamic/staticY.html: 18 Remove the margins from these tests so the results remain the same. The new results 19 are consistent with FF. 20 21 * platform/chromium-linux/fast/box-sizing/box-sizing-expected.png: 22 * platform/chromium-win/compositing/overflow/clip-descendents-expected.txt: 23 * platform/chromium-win/fast/box-sizing/box-sizing-expected.txt: 24 I've rebaselined these - removing the margins doesn't seem helpful. 25 1 26 2012-08-01 Xianzhu Wang <wangxianzhu@chromium.org> 2 27 -
trunk/LayoutTests/fast/block/positioning/auto/001.html
r11995 r124347 8 8 <div style="position:absolute;width:100px;height:200px;border:20px solid black;padding:50px;"> 9 9 <div style="margin-bottom:50px"></div> 10 <span style="position:absolute; margin-top:50px;width:100px;height:100px;background-color:green"></span>10 <span style="position:absolute;width:100px;height:100px;background-color:green"></span> 11 11 <div style="position:absolute;width:100px;height:100px;background-color:olive;top:0px"></div> 12 12 <div style="position:absolute;width:100px;height:100px;background-color:olive;top:200px"></div> -
trunk/LayoutTests/fast/block/positioning/auto/002.html
r11995 r124347 8 8 <div style="position:absolute;width:100px;height:200px;border:20px solid black;padding-top:50px;padding-bottom:50px;padding-left:px;padding-right:100px"> 9 9 <div style="margin-bottom:50px"></div> 10 <div style="margin-left:100px;position:absolute; margin-top:50px;width:100px;height:100px;background-color:green"></div>10 <div style="margin-left:100px;position:absolute;width:100px;height:100px;background-color:green"></div> 11 11 <div style="margin-left:100px;position:absolute;width:100px;height:100px;background-color:olive;top:0px"></div> 12 12 <div style="margin-left:100px;position:absolute;width:100px;height:100px;background-color:olive;top:200px"></div> -
trunk/LayoutTests/fast/block/positioning/auto/vertical-lr/002.html
r79930 r124347 8 8 <div style="position:absolute;height:100px;width:200px;border:20px solid black;padding-left:50px;padding-right:50px;padding-bottom:100px"> 9 9 <div style="margin-right:50px"></div> 10 <div style="margin-top:100px;position:absolute; margin-left:50px;width:100px;height:100px;background-color:green"></div>10 <div style="margin-top:100px;position:absolute;width:100px;height:100px;background-color:green"></div> 11 11 <div style="margin-top:100px;position:absolute;width:100px;height:100px;background-color:olive;left:0px"></div> 12 12 <div style="margin-top:100px;position:absolute;width:100px;height:100px;background-color:olive;left:200px"></div> -
trunk/LayoutTests/fast/block/positioning/auto/vertical-rl/002.html
r79930 r124347 8 8 <div style="position:absolute;height:100px;width:200px;border:20px solid black;padding-left:50px;padding-right:50px;padding-bottom:100px"> 9 9 <div style="margin-left:50px"></div> 10 <div style="margin-top:100px;position:absolute; margin-right:50px;width:100px;height:100px;background-color:green"></div>10 <div style="margin-top:100px;position:absolute;width:100px;height:100px;background-color:green"></div> 11 11 <div style="margin-top:100px;position:absolute;width:100px;height:100px;background-color:olive;right:0px"></div> 12 12 <div style="margin-top:100px;position:absolute;width:100px;height:100px;background-color:olive;right:200px"></div> -
trunk/LayoutTests/fast/dynamic/staticY.html
r19148 r124347 53 53 document.body.offsetTop; 54 54 55 t2.style.marginTop = "50px";56 55 t3.style.height = "50px"; 57 56 t4.style.height = "50px"; -
trunk/LayoutTests/platform/chromium-win/compositing/overflow/clip-descendents-expected.txt
r116006 r124347 8 8 (children 6 9 9 (GraphicsLayer 10 (position 48.00 66.00)10 (position 48.00 82.00) 11 11 (bounds 60.00 70.00) 12 12 (children 1 … … 20 20 ) 21 21 (GraphicsLayer 22 (position 240.00 66.00)22 (position 240.00 82.00) 23 23 (bounds 60.00 70.00) 24 24 (drawsContent 1) 25 25 ) 26 26 (GraphicsLayer 27 (position 240.00 66.00)27 (position 240.00 82.00) 28 28 (bounds 60.00 70.00) 29 29 (children 1 … … 36 36 ) 37 37 (GraphicsLayer 38 (position 240.00 66.00)38 (position 240.00 82.00) 39 39 (bounds 60.00 70.00) 40 40 (children 1 -
trunk/LayoutTests/platform/chromium-win/fast/box-sizing/box-sizing-expected.txt
r121722 r124347 70 70 RenderBR {BR} at (120,0) size 0x19 71 71 RenderBlock {HR} at (0,897) size 769x3 [border: (1px inset #000000)] 72 layer at (13,4 18) size 20x2073 RenderBlock (positioned) {DIV} at (13,4 17) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]74 layer at (43,4 18) size 20x2075 RenderBlock (positioned) {DIV} at (43,4 17) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]76 layer at (73,4 18) size 20x2077 RenderBlock (positioned) {DIV} at (73,4 17) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]78 layer at (103,4 18) size 20x2079 RenderBlock (positioned) {DIV} at (103,4 17) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]72 layer at (13,428) size 20x20 73 RenderBlock (positioned) {DIV} at (13,427) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 74 layer at (43,428) size 20x20 75 RenderBlock (positioned) {DIV} at (43,427) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 76 layer at (73,428) size 20x20 77 RenderBlock (positioned) {DIV} at (73,427) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 78 layer at (103,428) size 20x20 79 RenderBlock (positioned) {DIV} at (103,427) size 20x21 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 80 80 RenderBR {BR} at (6,6) size 0x19 81 81 RenderBR {BR} at (6,26) size 0x19 82 82 RenderBR {BR} at (6,46) size 0x19 83 layer at (13,7 57) size 20x2084 RenderImage {IMG} at (13,7 57) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]85 layer at (43,7 57) size 20x2086 RenderImage {IMG} at (43,7 57) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]87 layer at (73,7 57) size 20x2088 RenderImage {IMG} at (73,7 57) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]89 layer at (103,7 57) size 20x2090 RenderImage {IMG} at (103,7 57) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)]83 layer at (13,767) size 20x20 84 RenderImage {IMG} at (13,767) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 85 layer at (43,767) size 20x20 86 RenderImage {IMG} at (43,767) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 87 layer at (73,767) size 20x20 88 RenderImage {IMG} at (73,767) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] 89 layer at (103,767) size 20x20 90 RenderImage {IMG} at (103,767) size 20x20 [color=#FFFFFF] [bgcolor=#FFA500] [border: (2px solid #000000)] -
trunk/LayoutTests/platform/chromium/TestExpectations
r124340 r124347 3504 3504 // Started failing after http://trac.webkit.org/changeset/124314 3505 3505 BUGWK92863 : fast/forms/input-widths.html = TEXT 3506 3507 // Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219 3508 BUGWK80219 MAC WIN : fast/box-sizing/box-sizing.html = IMAGE+TEXT 3509 BUGWK80219 MAC : compositing/overflow/clip-descendents.html = TEXT -
trunk/LayoutTests/platform/efl/TestExpectations
r124294 r124347 831 831 // This test depends on subpixel layout. 832 832 BUGWK92352 : css3/flexbox/flex-rounding.html = TEXT 833 834 // Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219 835 BUGWK80219 : fast/box-sizing/box-sizing.html = IMAGE+TEXT 836 BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT -
trunk/LayoutTests/platform/gtk/TestExpectations
r124311 r124347 36 36 // Tests that require new results. 37 37 ////////////////////////////////////////////////////////////////////////////////////////// 38 39 // Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219 40 BUGWK80219 : fast/box-sizing/box-sizing.html = IMAGE+TEXT 41 BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT 38 42 39 43 ////////////////////////////////////////////////////////////////////////////////////////// -
trunk/LayoutTests/platform/mac/TestExpectations
r123452 r124347 306 306 // Layout Test css3/filters/custom/custom-filter-animation.html is failing 307 307 BUGWK84813 : css3/filters/custom/custom-filter-animation.html = TEXT 308 309 // Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219 310 BUGWK80219 : fast/box-sizing/box-sizing.html = IMAGE+TEXT 311 BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT -
trunk/LayoutTests/platform/qt/TestExpectations
r124317 r124347 125 125 126 126 BUGWK85811 DEBUG : fast/events/message-port-close.html = CRASH 127 128 // Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219 129 BUGWK80219 : fast/box-sizing/box-sizing.html = IMAGE+TEXT 130 BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT -
trunk/Source/WebCore/ChangeLog
r124342 r124347 1 2012-07-31 Robert Hogan <robert@webkit.org> 2 3 CSS 2.1 failure: margin-collapse-012 fails 4 https://bugs.webkit.org/show_bug.cgi?id=80219 5 6 Reviewed by Eric Seidel. 7 8 Tests: css2.1/20110323/margin-collapse-012.htm 9 fast/css/margin-collapse-abspos-negmargin.htm 10 11 I also ran this against the full margin-collapse-* CSS 2.1 suite without regressions. 12 13 Per http://www.w3.org/TR/CSS21/box.html#collapsing-margins don't collapse the margins of 14 positioned blocks. Instead, just use the margin of the sibling/container to offset the 15 positioned block's logical top - its own margin gets added in later at 16 RenderBox::computePositionedLogicalHeightUsing(). 17 18 * rendering/RenderBlock.cpp: 19 (WebCore::RenderBlock::adjustPositionedBlock): 20 1 21 2012-08-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 22 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r124168 r124347 1692 1692 1693 1693 if (!marginInfo.canCollapseWithMarginBefore()) { 1694 child->computeBlockDirectionMargins(this);1695 LayoutUnit marginBefore = marginBeforeForChild(child);1694 // Positioned blocks don't collapse margins, so add the margin provided by 1695 // the container now. The child's own margin is added later when calculating its logical top. 1696 1696 LayoutUnit collapsedBeforePos = marginInfo.positiveMargin(); 1697 1697 LayoutUnit collapsedBeforeNeg = marginInfo.negativeMargin(); 1698 if (marginBefore > 0) { 1699 if (marginBefore > collapsedBeforePos) 1700 collapsedBeforePos = marginBefore; 1701 } else { 1702 if (-marginBefore > collapsedBeforeNeg) 1703 collapsedBeforeNeg = -marginBefore; 1704 } 1705 logicalTop += (collapsedBeforePos - collapsedBeforeNeg) - marginBefore; 1698 logicalTop += collapsedBeforePos - collapsedBeforeNeg; 1706 1699 } 1707 1700
Note: See TracChangeset
for help on using the changeset viewer.