Changeset 69141 in webkit
- Timestamp:
- Oct 5, 2010 1:32:06 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r69138 r69141 1 2010-10-05 David Hyatt <hyatt@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 https://bugs.webkit.org/show_bug.cgi?id=47204 6 7 Make isSelfCollapsingBlock use logical height instead of height in all its checks. 8 9 Added fast/blockflow/self-collapsing-block.html 10 11 * fast/blockflow/self-collapsing-block.html: Added. 12 * platform/mac/fast/blockflow/self-collapsing-block-expected.checksum: Added. 13 * platform/mac/fast/blockflow/self-collapsing-block-expected.png: Added. 14 * platform/mac/fast/blockflow/self-collapsing-block-expected.txt: Added. 15 1 16 2010-10-05 Daniel Cheng <dcheng@chromium.org> 2 17 -
trunk/WebCore/ChangeLog
r69140 r69141 1 2010-10-05 David Hyatt <hyatt@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 https://bugs.webkit.org/show_bug.cgi?id=47204 6 7 Make isSelfCollapsingBlock use logical height instead of height in all its checks. 8 9 Added fast/blockflow/self-collapsing-block.html 10 11 * rendering/RenderBlock.cpp: 12 (WebCore::RenderBlock::isSelfCollapsingBlock): 13 1 14 2010-10-05 Eric Uhrhane <ericu@chromium.org> 2 15 -
trunk/WebCore/rendering/RenderBlock.cpp
r69136 r69141 1020 1020 // (d) have a min-height 1021 1021 // (e) have specified that one of our margins can't collapse using a CSS extension 1022 if ( height() > 01023 || isTable() || borderAndPadding Height()1024 || style()-> minHeight().isPositive()1022 if (logicalHeight() > 0 1023 || isTable() || borderAndPaddingLogicalHeight() 1024 || style()->logicalMinHeight().isPositive() 1025 1025 || style()->marginBeforeCollapse() == MSEPARATE || style()->marginAfterCollapse() == MSEPARATE) 1026 1026 return false; 1027 1027 1028 bool hasAutoHeight = style()->height().isAuto(); 1029 if (style()->height().isPercent() && !document()->inQuirksMode()) { 1028 Length logicalHeightLength = style()->logicalHeight(); 1029 bool hasAutoHeight = logicalHeightLength.isAuto(); 1030 if (logicalHeightLength.isPercent() && !document()->inQuirksMode()) { 1030 1031 hasAutoHeight = true; 1031 1032 for (RenderBlock* cb = containingBlock(); !cb->isRenderView(); cb = cb->containingBlock()) { 1032 if (cb->style()-> height().isFixed() || cb->isTableCell())1033 if (cb->style()->logicalHeight().isFixed() || cb->isTableCell()) 1033 1034 hasAutoHeight = false; 1034 1035 } … … 1037 1038 // If the height is 0 or auto, then whether or not we are a self-collapsing block depends 1038 1039 // on whether we have content that is all self-collapsing or not. 1039 if (hasAutoHeight || (( style()->height().isFixed() || style()->height().isPercent()) && style()->height().isZero())) {1040 if (hasAutoHeight || ((logicalHeightLength.isFixed() || logicalHeightLength.isPercent()) && logicalHeightLength.isZero())) { 1040 1041 // If the block has inline children, see if we generated any line boxes. If we have any 1041 1042 // line boxes, then we can't be self-collapsing, since we have content.
Note: See TracChangeset
for help on using the changeset viewer.