nephele
/
haikuwebkit
1
0
Fork 0
Code Issues Releases Activity
haikuwebkit/LayoutTests/fast/multicol/nested-columns.html

19 lines
2.2 KiB
HTML
Raw Permalink Normal View History

Add a test of columns inside columns. The test also puts a RenderLayer in the 2nd column of the 2nd column to make sure layer positioning works across nested columns. Reviewed by Dan Bernstein. * fast/multicol/nested-columns.html: Added. * platform/mac/fast/multicol/nested-columns-expected.txt: Added. Canonical link: https://commits.webkit.org/50755@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@59616 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2010-05-17 17:57:48 +00:00
<html>
Add support for the column-fill property https://bugs.webkit.org/show_bug.cgi?id=117693 Patch by Morten Stenshorne <mstensho@opera.com> on 2013-10-15 Reviewed by David Hyatt. Source/WebCore: This is only supported in the (new) region based multicol implementation. With column-fill support, a lot of multicol tests needed an update. The old implementation behaved as if column-fill were 'auto', but the initial value is 'balance', so now we need to be explicit about that. For auto-height tests it doesn't really matter - such multicols are always balanced anyway. Tests: fast/multicol/newmulticol/fixed-height-fill-auto.html fast/multicol/newmulticol/fixed-height-fill-balance.html * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::propertyValue): * css/CSSParser.cpp: (WebCore::isValidKeywordPropertyAndValue): (WebCore::isKeywordPropertyID): (WebCore::CSSParser::parseValue): * css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): (WebCore::CSSPrimitiveValue::operator ColumnFill): * css/CSSPropertyNames.in: * css/CSSValueKeywords.in: * css/DeprecatedStyleBuilder.cpp: (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): * rendering/RenderMultiColumnBlock.h: * rendering/style/RenderStyle.h: * rendering/style/RenderStyleConstants.h: * rendering/style/StyleMultiColData.cpp: (WebCore::StyleMultiColData::StyleMultiColData): (WebCore::StyleMultiColData::operator==): * rendering/style/StyleMultiColData.h: LayoutTests: With column-fill support, a lot of multicol tests needed an update. The old implementation behaved as if column-fill were 'auto', but the initial value is 'balance', so now we need to be explicit about that. For auto-height tests it doesn't really matter - such multicols are always balanced anyway. * compositing/geometry/composited-in-columns.html: * fast/block/positioning/offsetLeft-offsetTop-multicolumn-expected.html: * fast/block/positioning/offsetLeft-offsetTop-multicolumn.html: * fast/borders/border-antialiasing.html: * fast/dynamic/float-moved-downwards-for-pagination-expected.html: * fast/dynamic/float-moved-downwards-for-pagination.html: * fast/dynamic/layer-no-longer-paginated.html: * fast/events/document-elementFromPoint.html: * fast/line-grid/line-grid-inside-columns.html: * fast/line-grid/line-grid-into-columns.html: * fast/multicol/break-properties.html: * fast/multicol/cell-shrinkback.html: * fast/multicol/client-rects.html: * fast/multicol/column-count-with-rules.html: * fast/multicol/fixed-column-percent-logical-height-orthogonal-writing-mode.html: * fast/multicol/flipped-blocks-hit-test.html: * fast/multicol/float-paginate-complex.html: * fast/multicol/float-paginate-empty-lines.html: * fast/multicol/float-paginate.html: * fast/multicol/float-truncation.html: * fast/multicol/hit-test-above-or-below.html: * fast/multicol/hit-test-end-of-column-with-line-height.html: * fast/multicol/hit-test-end-of-column.html: * fast/multicol/hit-test-float.html: * fast/multicol/image-inside-nested-blocks-with-border.html: * fast/multicol/layers-in-multicol.html: * fast/multicol/layers-split-across-columns.html: * fast/multicol/margin-collapse.html: * fast/multicol/mixed-opacity-fixed-test.html: * fast/multicol/mixed-opacity-test.html: * fast/multicol/mixed-positioning-stacking-order.html: * fast/multicol/nested-columns.html: * fast/multicol/newmulticol/cell-shrinkback-expected.html: * fast/multicol/newmulticol/cell-shrinkback.html: * fast/multicol/newmulticol/column-rules-fixed-height-expected.html: * fast/multicol/newmulticol/fixed-height-fill-auto-expected.html: Added. * fast/multicol/newmulticol/fixed-height-fill-auto.html: Added. * fast/multicol/newmulticol/fixed-height-fill-balance-expected.html: Added. * fast/multicol/newmulticol/fixed-height-fill-balance.html: Added. * fast/multicol/newmulticol/float-avoidance-expected.html: * fast/multicol/newmulticol/float-avoidance.html: * fast/multicol/newmulticol/float-multicol-expected.html: * fast/multicol/newmulticol/float-multicol.html: * fast/multicol/newmulticol/float-paginate-complex-expected.html: * fast/multicol/newmulticol/float-paginate-complex.html: * fast/multicol/newmulticol/float-paginate-empty-lines-expected.html: * fast/multicol/newmulticol/float-paginate-empty-lines.html: * fast/multicol/newmulticol/float-paginate-expected.html: * fast/multicol/newmulticol/float-paginate.html: * fast/multicol/newmulticol/layers-in-multicol-expected.html: * fast/multicol/newmulticol/layers-in-multicol.html: * fast/multicol/newmulticol/layers-split-across-columns-expected.html: * fast/multicol/newmulticol/layers-split-across-columns.html: * fast/multicol/newmulticol/positioned-split-expected.html: * fast/multicol/newmulticol/positioned-split.html: * fast/multicol/newmulticol/positioned-with-constrained-height-expected.html: * fast/multicol/newmulticol/positioned-with-constrained-height.html: * fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html: * fast/multicol/orphans-relayout.html: * fast/multicol/overflow-across-columns-percent-height.html: * fast/multicol/overflow-across-columns.html: * fast/multicol/overflow-content-expected.html: * fast/multicol/overflow-content.html: * fast/multicol/overflow-unsplittable.html: * fast/multicol/pageLogicalOffset-vertical-expected.html: * fast/multicol/pageLogicalOffset-vertical.html: * fast/multicol/paginate-block-replaced.html: * fast/multicol/positioned-outside-of-columns.html: * fast/multicol/positioned-split.html: * fast/multicol/positive-leading.html: * fast/multicol/progression-reverse-overflow-expected.html: * fast/multicol/progression-reverse-overflow.html: * fast/multicol/progression-reverse.html: * fast/multicol/scrolling-overflow.html: * fast/multicol/seamless-flowed-through-columns-expected.html: * fast/multicol/seamless-flowed-through-columns.html: * fast/multicol/table-margin-collapse.html: * fast/multicol/table-row-height-increase-expected.html: * fast/multicol/table-row-height-increase.html: * fast/multicol/table-vertical-align.html: * fast/multicol/transform-inside-opacity.html: * fast/multicol/unsplittable-inline-block.html: * fast/multicol/vertical-lr/break-properties.html: * fast/multicol/vertical-lr/column-count-with-rules.html: * fast/multicol/vertical-lr/float-multicol.html: * fast/multicol/vertical-lr/float-paginate-complex.html: * fast/multicol/vertical-lr/float-paginate.html: * fast/multicol/vertical-lr/float-truncation.html: * fast/multicol/vertical-lr/image-inside-nested-blocks-with-border.html: * fast/multicol/vertical-lr/nested-columns.html: * fast/multicol/vertical-lr/rules-with-border-before.html: * fast/multicol/vertical-lr/unsplittable-inline-block.html: * fast/multicol/vertical-rl/break-properties.html: * fast/multicol/vertical-rl/column-count-with-rules.html: * fast/multicol/vertical-rl/float-avoidance.html: * fast/multicol/vertical-rl/float-multicol.html: * fast/multicol/vertical-rl/float-paginate-complex.html: * fast/multicol/vertical-rl/float-paginate.html: * fast/multicol/vertical-rl/float-truncation.html: * fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html: * fast/multicol/vertical-rl/nested-columns.html: * fast/multicol/vertical-rl/rule-style.html: * fast/multicol/vertical-rl/rules-with-border-before.html: * fast/multicol/vertical-rl/unsplittable-inline-block.html: * fast/multicol/widows-and-orphans.html: * fast/regions/region-style-in-columns.html: * fast/repaint/multicol-repaint.html: * fast/sub-pixel/column-clipping.html: Canonical link: https://commits.webkit.org/140927@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157458 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2013-10-15 18:45:29 +00:00
<body style="-webkit-column-count:2; -webkit-column-fill:auto; column-count:2; column-fill:auto; width:750px; height:500px;">
Add a test of columns inside columns. The test also puts a RenderLayer in the 2nd column of the 2nd column to make sure layer positioning works across nested columns. Reviewed by Dan Bernstein. * fast/multicol/nested-columns.html: Added. * platform/mac/fast/multicol/nested-columns-expected.txt: Added. Canonical link: https://commits.webkit.org/50755@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@59616 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2010-05-17 17:57:48 +00:00
<h1>Header One</h1>
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus. Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras convallis adipiscing sem. Nam nonummy enim. Nullam bibendum lobortis neque. Vestibulum velit orci, tempus euismod, pretium quis, interdum vitae, nulla. Phasellus eget ante et tortor condimentum vestibulum.
Suspendisse hendrerit quam nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
<h1>Header Two</h1>
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus. Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras convallis adipiscing sem. Nam nonummy enim. Nullam bibendum lobortis neque. Vestibulum velit orci, tempus euismod, pretium quis, interdum vitae, nulla. Phasellus eget ante et tortor condimentum vestibulum.
Suspendisse hendrerit quam nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
<h1>Header Three</h1>
<div style="-webkit-column-count:2">
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus. Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras convallis adipiscing sem. Nam nonummy enim. Nullam bibendum lobortis neque. Vestibulum velit orci, tempus euismod, pretium quis, interdum vitae, nulla. Phasellus eget ante et tortor condimentum vestibulum.
Suspendisse hendrerit quam nec felis. Sed varius turpis vitae pede. <span style="position:relative; opacity:0.5">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</span>
</div>
<h1>Header Four</h1>
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla varius enim ac mi.
</body>
</html>