[css-multicol] Update WPT test suite
authorrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jan 2018 13:26:46 +0000 (13:26 +0000)
committerrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jan 2018 13:26:46 +0000 (13:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182087

Reviewed by Javier Fernandez.

LayoutTests/imported/w3c:

* resources/import-expectations.json:
* resources/resource-files.json:
* web-platform-tests/css/css-multicol/OWNERS: Added.
* web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash-expected.txt: Added.
* web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html: Added.
* web-platform-tests/css/css-multicol/multicol-basic-001-expected.html:
* web-platform-tests/css/css-multicol/multicol-basic-001.html:
* web-platform-tests/css/css-multicol/multicol-basic-002-expected.html:
* web-platform-tests/css/css-multicol/multicol-basic-002.html:
* web-platform-tests/css/css-multicol/multicol-basic-003-expected.html:
* web-platform-tests/css/css-multicol/multicol-basic-003.html:
* web-platform-tests/css/css-multicol/multicol-basic-004-expected.html:
* web-platform-tests/css/css-multicol/multicol-basic-004.html:
* web-platform-tests/css/css-multicol/multicol-basic-005-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-005.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-006-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-006.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-007-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-007.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-008-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-basic-008.xht: Added.
* web-platform-tests/css/css-multicol/multicol-block-no-clip-001-expected.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-002-expected.xht.
* web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-clip-001.xht.
* web-platform-tests/css/css-multicol/multicol-block-no-clip-002-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-clip-001.xht.
* web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001-expected.html: Added.
* web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht:
* web-platform-tests/css/css-multicol/multicol-break-000-expected.xht:
* web-platform-tests/css/css-multicol/multicol-break-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-break-001.xht:
* web-platform-tests/css/css-multicol/multicol-clip-001.xht:
* web-platform-tests/css/css-multicol/multicol-columns-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-001.xht:
* web-platform-tests/css/css-multicol/multicol-columns-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-002.xht:
* web-platform-tests/css/css-multicol/multicol-columns-003-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-003.xht:
* web-platform-tests/css/css-multicol/multicol-columns-004-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-004.xht:
* web-platform-tests/css/css-multicol/multicol-columns-005-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-005.xht:
* web-platform-tests/css/css-multicol/multicol-columns-006-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-006.xht:
* web-platform-tests/css/css-multicol/multicol-columns-007-expected.xht:
* web-platform-tests/css/css-multicol/multicol-columns-007.xht:
* web-platform-tests/css/css-multicol/multicol-columns-invalid-002.xht:
* web-platform-tests/css/css-multicol/multicol-containing-001.xht:
* web-platform-tests/css/css-multicol/multicol-containing-002.xht:
* web-platform-tests/css/css-multicol/multicol-count-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-count-001.xht:
* web-platform-tests/css/css-multicol/multicol-count-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-count-computed-003-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-count-computed-003.xht: Added.
* web-platform-tests/css/css-multicol/multicol-count-computed-005-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-count-computed-005.xht: Added.
* web-platform-tests/css/css-multicol/multicol-fill-000.xht:
* web-platform-tests/css/css-multicol/multicol-fill-001.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-001.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-002.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-003.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002.xht:
* web-platform-tests/css/css-multicol/multicol-fill-balance-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-fill-balance-001.xht:
* web-platform-tests/css/css-multicol/multicol-fill-balance-002-expected.html: Added.
* web-platform-tests/css/css-multicol/multicol-fill-balance-002.html: Added.
* web-platform-tests/css/css-multicol/multicol-gap-000.xht:
* web-platform-tests/css/css-multicol/multicol-gap-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-gap-animation-001-expected.txt: Added.
* web-platform-tests/css/css-multicol/multicol-gap-animation-001.html: Added.
* web-platform-tests/css/css-multicol/multicol-gap-animation-002-expected.txt: Added.
* web-platform-tests/css/css-multicol/multicol-gap-animation-002.html: Added.
* web-platform-tests/css/css-multicol/multicol-gap-animation-003-expected.txt: Added.
* web-platform-tests/css/css-multicol/multicol-gap-animation-003.html: Added.
* web-platform-tests/css/css-multicol/multicol-gap-fraction-002-expected.html: Added.
* web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html: Added.
* web-platform-tests/css/css-multicol/multicol-gap-large-001.xht:
* web-platform-tests/css/css-multicol/multicol-gap-large-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-gap-percentage-001-expected.txt: Added.
* web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html: Added.
* web-platform-tests/css/css-multicol/multicol-height-block-child-001-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht: Added.
* web-platform-tests/css/css-multicol/multicol-inherit-001.xht:
* web-platform-tests/css/css-multicol/multicol-inherit-002.xht:
* web-platform-tests/css/css-multicol/multicol-inherit-003.xht:
* web-platform-tests/css/css-multicol/multicol-margin-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-margin-001.xht:
* web-platform-tests/css/css-multicol/multicol-margin-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-margin-002.xht:
* web-platform-tests/css/css-multicol/multicol-margin-child-001.xht:
* web-platform-tests/css/css-multicol/multicol-nested-005.xht:
* web-platform-tests/css/css-multicol/multicol-nested-column-rule-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-002.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-003.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-004-expected.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-004.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-005-expected.xht:
* web-platform-tests/css/css-multicol/multicol-nested-margin-005.xht:
* web-platform-tests/css/css-multicol/multicol-overflow-000.xht:
* web-platform-tests/css/css-multicol/multicol-reduce-000-expected.xht:
* web-platform-tests/css/css-multicol/multicol-reduce-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-000-expected.xht:
* web-platform-tests/css/css-multicol/multicol-rule-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-001.xht:
* web-platform-tests/css/css-multicol/multicol-rule-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-rule-002.xht:
* web-platform-tests/css/css-multicol/multicol-rule-003.xht:
* web-platform-tests/css/css-multicol/multicol-rule-color-001.xht:
* web-platform-tests/css/css-multicol/multicol-rule-color-inherit-002.xht:
* web-platform-tests/css/css-multicol/multicol-rule-dashed-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-double-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-fraction-002.xht:
* web-platform-tests/css/css-multicol/multicol-rule-fraction-003-expected.xht:
* web-platform-tests/css/css-multicol/multicol-rule-fraction-003.xht:
* web-platform-tests/css/css-multicol/multicol-rule-groove-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-hidden-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-inset-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-large-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-rule-large-001.xht:
* web-platform-tests/css/css-multicol/multicol-rule-large-002.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-001.xht.
* web-platform-tests/css/css-multicol/multicol-rule-none-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-outset-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-px-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-rule-px-001.xht:
* web-platform-tests/css/css-multicol/multicol-rule-ridge-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-samelength-001.xht:
* web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-expected.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-shorthand-001-expected.xht.
* web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-002.xht.
* web-platform-tests/css/css-multicol/multicol-rule-solid-000.xht:
* web-platform-tests/css/css-multicol/multicol-rule-stacking-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-rule-stacking-001.xht:
* web-platform-tests/css/css-multicol/multicol-shorthand-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-shorthand-001.xht:
* web-platform-tests/css/css-multicol/multicol-span-000.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-001.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-003-expected.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-003.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003-expected.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-margin-001.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-margin-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht:
* web-platform-tests/css/css-multicol/multicol-span-none-001-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-span-none-001.xht: Added.
* web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001.xht:
* web-platform-tests/css/css-multicol/multicol-width-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-width-001.xht:
* web-platform-tests/css/css-multicol/multicol-width-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-width-003-expected.xht:
* web-platform-tests/css/css-multicol/multicol-width-ch-001-expected.xht: Added.
* web-platform-tests/css/css-multicol/multicol-width-ch-001.xht: Added.
* web-platform-tests/css/css-multicol/multicol-width-count-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-width-count-001.xht:
* web-platform-tests/css/css-multicol/multicol-width-count-002-expected.xht:
* web-platform-tests/css/css-multicol/multicol-width-negative-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-width-small-001.xht:
* web-platform-tests/css/css-multicol/multicol-zero-height-001-expected.xht:
* web-platform-tests/css/css-multicol/multicol-zero-height-001.xht:
* web-platform-tests/css/css-multicol/support/w3c-import.log: Added.
* web-platform-tests/css/css-multicol/w3c-import.log: Added.

LayoutTests:

* TestExpectations:
* platform/gtk/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

173 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/resources/import-expectations.json
LayoutTests/imported/w3c/resources/resource-files.json
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/OWNERS [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-001-expected.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-001.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-002-expected.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-002.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-003-expected.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-003.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-004-expected.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-004.html
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-005-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-005.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-006-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-006.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-007-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-007.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-008-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-008.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-001-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-002-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-break-000-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-break-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-break-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-clip-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-003-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-004-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-004.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-005-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-005.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-006-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-006.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-007-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-007.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-columns-invalid-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-containing-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-containing-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-003-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-003.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-005-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-005.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-002-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-002.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-001-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-001.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-002-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-002.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-003-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-003.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-fraction-002-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-large-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-large-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-percentage-001-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-height-block-child-001-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-inherit-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-inherit-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-inherit-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-margin-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-margin-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-margin-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-margin-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-margin-child-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-005.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-004-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-004.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-005-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-005.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-overflow-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-reduce-000-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-reduce-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-000-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-color-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-dashed-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-double-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-fraction-002.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-fraction-003-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-fraction-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-groove-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-hidden-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-inset-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-002.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-none-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-outset-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-px-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-px-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-ridge-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-samelength-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-solid-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-stacking-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-stacking-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-shorthand-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-shorthand-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-000.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-003-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-003-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-ch-001-expected.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-count-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-count-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-count-002-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-negative-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-small-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-zero-height-001-expected.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-zero-height-001.xht
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/support/w3c-import.log [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/w3c-import.log [new file with mode: 0644]
LayoutTests/platform/gtk/TestExpectations

index 76823a8..630b747 100644 (file)
@@ -1,3 +1,13 @@
+2018-01-25  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-multicol] Update WPT test suite
+        https://bugs.webkit.org/show_bug.cgi?id=182087
+
+        Reviewed by Javier Fernandez.
+
+        * TestExpectations:
+        * platform/gtk/TestExpectations:
+
 2018-01-25  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] Update WPT tests and move them to imported/w3c/web-platform-tests
index 617bf57..7362cb2 100644 (file)
@@ -1059,10 +1059,6 @@ webkit.org/b/148806 imported/w3c/web-platform-tests/css/css-multicol/multicol-co
 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-child-002.xht [ WontFix ]
 
 webkit.org/b/148818 imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002.xht [ ImageOnlyFailure ] # only scrollbar
-webkit.org/b/148818 imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht [ ImageOnlyFailure ] # only scrollbar
-
-webkit.org/b/148812 imported/w3c/web-platform-tests/css/css-multicol/multicol-width-small-001.xht [ ImageOnlyFailure ]
-webkit.org/b/148814 imported/w3c/web-platform-tests/css/css-multicol/multicol-break-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148816 imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-004.xht [ ImageOnlyFailure ]
 webkit.org/b/148823 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-003.xht [ ImageOnlyFailure ]
 
@@ -1078,18 +1074,20 @@ webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-in
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-002.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-002.xht [ ImageOnlyFailure ]
-webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-width-ems-001.xht [ ImageOnlyFailure ] # Could be a bad test?
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-002.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-003.xht [ ImageOnlyFailure ]
-webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-004.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-nested-margin-005.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-auto.xht [ ImageOnlyFailure ]
-webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-zero-height-001.xht [ ImageOnlyFailure ]
 webkit.org/b/148805 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-all-child-001.xht [ ImageOnlyFailure ]
+webkit.org/b/182087 imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-color-inherit-002.xht [ ImageOnlyFailure ]
+webkit.org/b/182087 imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht [ ImageOnlyFailure ]
+webkit.org/b/182087 imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001.xht [ ImageOnlyFailure ]
+webkit.org/b/182087 imported/w3c/web-platform-tests/css/css-multicol/multicol-width-ch-001.xht [ ImageOnlyFailure ]
+
 
 webkit.org/b/148884 imported/w3c/web-platform-tests/html/semantics/forms/textfieldselection/selection.html [ Pass Failure ]
 
index 75b6023..a41f7df 100644 (file)
@@ -1,3 +1,180 @@
+2018-01-25  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-multicol] Update WPT test suite
+        https://bugs.webkit.org/show_bug.cgi?id=182087
+
+        Reviewed by Javier Fernandez.
+
+        * resources/import-expectations.json:
+        * resources/resource-files.json:
+        * web-platform-tests/css/css-multicol/OWNERS: Added.
+        * web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash-expected.txt: Added.
+        * web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-001-expected.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-001.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-002-expected.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-002.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-003-expected.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-003.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-004-expected.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-004.html:
+        * web-platform-tests/css/css-multicol/multicol-basic-005-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-005.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-006-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-006.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-007-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-007.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-008-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-basic-008.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-block-no-clip-001-expected.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-width-002-expected.xht.
+        * web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-clip-001.xht.
+        * web-platform-tests/css/css-multicol/multicol-block-no-clip-002-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-clip-001.xht.
+        * web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001-expected.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-break-000-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-break-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-break-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-clip-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-003-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-004-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-004.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-005-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-005.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-006-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-006.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-007-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-007.xht:
+        * web-platform-tests/css/css-multicol/multicol-columns-invalid-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-containing-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-containing-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-count-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-count-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-count-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-count-computed-003-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-count-computed-003.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-count-computed-005-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-count-computed-005.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-fill-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-auto-block-children-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-balance-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-balance-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-fill-balance-002-expected.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-fill-balance-002.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-gap-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-gap-animation-001-expected.txt: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-animation-001.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-animation-002-expected.txt: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-animation-002.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-animation-003-expected.txt: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-animation-003.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-fraction-002-expected.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-large-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-gap-large-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-gap-percentage-001-expected.txt: Added.
+        * web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html: Added.
+        * web-platform-tests/css/css-multicol/multicol-height-block-child-001-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-inherit-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-inherit-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-inherit-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-margin-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-margin-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-margin-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-margin-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-margin-child-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-005.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-column-rule-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-column-rule-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-004-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-004.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-005-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-nested-margin-005.xht:
+        * web-platform-tests/css/css-multicol/multicol-overflow-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-reduce-000-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-reduce-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-000-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-color-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-color-inherit-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-dashed-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-double-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-fraction-002.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-fraction-003-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-fraction-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-groove-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-hidden-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-inset-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-large-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-large-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-large-002.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-001.xht.
+        * web-platform-tests/css/css-multicol/multicol-rule-none-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-outset-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-px-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-px-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-ridge-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-samelength-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-expected.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-shorthand-001-expected.xht.
+        * web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-002.xht.
+        * web-platform-tests/css/css-multicol/multicol-rule-solid-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-stacking-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-rule-stacking-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-shorthand-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-shorthand-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-000.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-003-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-block-sibling-003.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-margin-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-margin-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-margin-bottom-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-span-none-001-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-span-none-001.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-table-cell-vertical-align-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-003-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-ch-001-expected.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-width-ch-001.xht: Added.
+        * web-platform-tests/css/css-multicol/multicol-width-count-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-count-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-count-002-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-negative-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-width-small-001.xht:
+        * web-platform-tests/css/css-multicol/multicol-zero-height-001-expected.xht:
+        * web-platform-tests/css/css-multicol/multicol-zero-height-001.xht:
+        * web-platform-tests/css/css-multicol/support/w3c-import.log: Added.
+        * web-platform-tests/css/css-multicol/w3c-import.log: Added.
+
 2018-01-25  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] Update WPT tests and move them to imported/w3c/web-platform-tests
index 763c820..2e4223f 100644 (file)
     "web-platform-tests/workers": "import", 
     "web-platform-tests/worklets": "skip", 
     "web-platform-tests/x-frame-options": "skip"
-}
+}
\ No newline at end of file
index b901cb0..34b1edb 100644 (file)
@@ -28,6 +28,7 @@
         "web-platform-tests/css/css-grid-1/test-plan/index.html",
         "web-platform-tests/css/css-grid/grid-items/ref-filled-green-100px-square-image.html",
         "web-platform-tests/css/css-grid/test-plan/index.html",
+        "web-platform-tests/css/css-multicol/multicol-rule-large-002.xht",
         "web-platform-tests/css/css-shapes/test-plan/index.html",
         "web-platform-tests/css/css-ui/canvas-cursor-001.html",
         "web-platform-tests/css/css-ui/canvas-cursor-002.html",
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/OWNERS b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/OWNERS
new file mode 100644 (file)
index 0000000..3247ab2
--- /dev/null
@@ -0,0 +1,3 @@
+@frivoal
+@mstensho
+@rachelandrew
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash-expected.txt
new file mode 100644 (file)
index 0000000..42a6b74
--- /dev/null
@@ -0,0 +1,5 @@
+
+hest
+
+PASS No crash or assertion failure. 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/extremely-tall-multicol-with-extremely-tall-child-crash.html
new file mode 100644 (file)
index 0000000..c39cd34
--- /dev/null
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>CSS Multi-column Layout Test: extremely tall multicolumn container with extremely tall inline-block inside</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/" title="CSS Multi-column Layout Module Level 1">
+<meta name="assert" content="This tests that we get no crash if we put an extremely tall inline-block inside an extremely tall multicol container. Engines typically have some maximum limit for how large values they can represent. If the value is large enough to become 'infinity', the engine should still not crash">
+<!--  Explanation for the CSS values specified below: This test was written for
+     the Chromium Blink engine, which uses a fixed-point 32 bit integer. In this
+     example, the value will be too large, so it will be clamped to the maximum
+     value (about 2^25 px). However, there's a a further complication in that
+     CSS length values in Blink are transported via a 32bit float, so precision
+     will be a few pixels off. So even if 1234567890px is way more than Blink
+     can handle, it will be truncated to a bit less than the maximum value
+     (about 2^25). We want the multicol container to be as tall as it can
+     possibly get, so we put it inside a 1234567890px tall container, and
+     specify the height of the child multicol container to be 200% to ensure
+     this. We also use a percentage to specify the height of the child inside
+     the multicol container, for the same reason.  -->
+<div style="height:1234567890px;">
+  <div style="columns:2; column-fill:auto; height:200%;">
+    <div style="display:inline-block; height:100%;"></div><br>
+    hest
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(() => { }, "No crash or assertion failure.");
+</script>
index d57038f..8c04121 100644 (file)
@@ -10,7 +10,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -20,7 +19,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        border-spacing: 0;
@@ -38,7 +37,7 @@
                        border-spacing: 0;
                        border-collapse: collapse;
                        display: inline;
-                       border: none; 
+                       border: none;
                }
 
                .item-1{
@@ -58,7 +57,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <table class="multicol-basic-ref">
                <tr>
@@ -69,4 +68,4 @@
        </table>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 43f9c88..960e74c 100644 (file)
@@ -2,6 +2,7 @@
 <html>
 <!--  Submitted from TestTWF Paris  -->
 <head>
+       <meta charset="utf-8">
        <title>CSS Test: Multi-column element via columns: [integer]</title>
        <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
        <link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
@@ -13,7 +14,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -23,7 +23,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        columns: 3;
@@ -52,7 +52,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <div class="multicol-basic-ref">
                <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
index d57038f..8c04121 100644 (file)
@@ -10,7 +10,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -20,7 +19,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        border-spacing: 0;
@@ -38,7 +37,7 @@
                        border-spacing: 0;
                        border-collapse: collapse;
                        display: inline;
-                       border: none; 
+                       border: none;
                }
 
                .item-1{
@@ -58,7 +57,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <table class="multicol-basic-ref">
                <tr>
@@ -69,4 +68,4 @@
        </table>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index ecaec5e..d350706 100644 (file)
@@ -2,6 +2,7 @@
 <html>
 <!--  Submitted from TestTWF Paris  -->
 <head>
+       <meta charset="utf-8">
        <title>CSS Test: Multi-column element via column-count: [integer]</title>
        <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
        <link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
@@ -13,7 +14,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -23,7 +23,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        column-count: 3;
@@ -52,7 +52,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <div class="multicol-basic-ref">
                <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
index d57038f..8c04121 100644 (file)
@@ -10,7 +10,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -20,7 +19,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        border-spacing: 0;
@@ -38,7 +37,7 @@
                        border-spacing: 0;
                        border-collapse: collapse;
                        display: inline;
-                       border: none; 
+                       border: none;
                }
 
                .item-1{
@@ -58,7 +57,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <table class="multicol-basic-ref">
                <tr>
@@ -69,4 +68,4 @@
        </table>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index c3166d2..b0faf5b 100644 (file)
@@ -2,6 +2,7 @@
 <html>
 <!--  Submitted from TestTWF Paris  -->
 <head>
+       <meta charset="utf-8">
        <title>CSS Test: Multi-column element via columns: [width]</title>
        <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
        <link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
@@ -13,7 +14,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -23,7 +23,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        columns: 120px;
@@ -52,7 +52,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <div class="multicol-basic-ref">
                <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
index d57038f..8c04121 100644 (file)
@@ -10,7 +10,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -20,7 +19,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        border-spacing: 0;
@@ -38,7 +37,7 @@
                        border-spacing: 0;
                        border-collapse: collapse;
                        display: inline;
-                       border: none; 
+                       border: none;
                }
 
                .item-1{
@@ -58,7 +57,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <table class="multicol-basic-ref">
                <tr>
@@ -69,4 +68,4 @@
        </table>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 1ba84c5..b346ac8 100644 (file)
@@ -2,6 +2,7 @@
 <html>
 <!--  Submitted from TestTWF Paris  -->
 <head>
+       <meta charset="utf-8">
        <title>CSS Test: Multi-column element via column-width: [width]</title>
        <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
        <link rel="author" title="Håkon Wium Lie" href="mailto:howcome@opera.com"/>
@@ -13,7 +14,6 @@
        <style type="text/css">
                .multicol-wrapper>*{
                        font-family: Ahem;
-                       -webkit-font-smoothing: none;
                }
 
                div.multicol-wrapper{
@@ -23,7 +23,7 @@
                        width: 360px;
                }
 
-               .multicol-basic-ref{ 
+               .multicol-basic-ref{
                        background: yellow;
                        width: 360px;
                        column-width: 120px;
@@ -52,7 +52,7 @@
        </style>
 </head>
 <body>
-<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p> 
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
 <div class="multicol-wrapper">
        <div class="multicol-basic-ref">
                <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-005-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-005-expected.xht
new file mode 100644 (file)
index 0000000..a46863c
--- /dev/null
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>multicol-000</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-005.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-005.xht
new file mode 100644 (file)
index 0000000..6a9cfdd
--- /dev/null
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>CSS Multi-column Layout Test: columns as column-count (basic)</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<link rel="match" href="reference/multicol-basic-005-ref.xht"/>
+<link rel="help" href="https://www.w3.org/TR/css3-multicol/#columns"/>
+<link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-count"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-006-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-006-expected.xht
new file mode 100644 (file)
index 0000000..a46863c
--- /dev/null
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>multicol-000</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-006.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-006.xht
new file mode 100644 (file)
index 0000000..0c1ee61
--- /dev/null
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>CSS Multi-column Layout Test: column-count (basic)</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<link rel="match" href="reference/multicol-basic-005-ref.xht"/>
+<link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-count"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  column-count: 3;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-007-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-007-expected.xht
new file mode 100644 (file)
index 0000000..a46863c
--- /dev/null
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>multicol-000</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-007.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-007.xht
new file mode 100644 (file)
index 0000000..add6a0e
--- /dev/null
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>CSS Multi-column Layout Test: columns as column-width (basic)</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<link rel="match" href="reference/multicol-basic-005-ref.xht"/>
+<link rel="help" href="https://www.w3.org/TR/css3-multicol/#columns"/>
+<link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-width"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  columns: 200px;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-008-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-008-expected.xht
new file mode 100644 (file)
index 0000000..a46863c
--- /dev/null
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>multicol-000</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  columns: 3;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-008.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-basic-008.xht
new file mode 100644 (file)
index 0000000..a2f550c
--- /dev/null
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>CSS Multi-column Layout Test: column-width (basic)</title>
+<link rel="author" title="Hakon Wium Lie" href="mailto:howcome@opera.com"/>
+<link rel="match" href="reference/multicol-basic-005-ref.xht"/>
+<link rel="help" href="https://www.w3.org/TR/css3-multicol/#column-width"/>
+<style type="text/css">
+div {
+  margin: 1em auto;
+  background: yellow;
+  border: thin solid black;
+  width: 600px;
+  column-width: 200px;
+  column-gap: 0;
+  column-rule: none;
+}
+</style>
+</head>
+<body>
+<div>This multicol element should have a width of 600 pixels and the content should be flowed into three columns with no gap or rule between them.</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-001-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-001-expected.xht
new file mode 100644 (file)
index 0000000..fb140db
--- /dev/null
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-24  -->
+  <meta name="flags" content="image" />
+  <style type="text/css"><![CDATA[
+  table
+  {
+  border-spacing: 0px;
+  border: gray solid 1em;
+  font: 1.25em/1 serif;
+  }
+
+  td
+  {
+  padding: 0;
+  width: 3em;
+  }
+
+  td + td {width: 8em;}
+
+  img, td {vertical-align: top;}
+  ]]></style>
+ </head>
+ <body>
+  <table>
+    <tr>
+      <td><img src="support/swatch-blue.png" width="40" height="80" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="60" height="20" alt="Image download support must be enabled" /></td><td><img src="support/swatch-orange.png" width="40" height="80" alt="Image download support must be enabled" /></td>
+    </tr></table>
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-001.xht
new file mode 100644 (file)
index 0000000..2bf87ff
--- /dev/null
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: Overflowed content inside multicol element</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-24  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements" title="8.1. Overflow inside multicol elements" />
+  <link rel="match" href="multicol-block-no-clip-001-ref.xht"/>
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks that content in the normal flow that extends into column gaps is not clipped in the middle of the column gap." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  border: gray solid 1em;
+  font: 1.25em/1 Ahem;
+  orphans: 1;
+  widows: 1;
+  width: 11em;
+
+  column-count: 4;
+  column-gap: 1em;
+  }
+
+  h4
+  {
+  background: black;
+  color: black;
+  font: inherit;
+  margin: 0;
+  }
+
+  #first-column {color: blue;}
+
+  #second-column {color: orange;}
+
+  #third-column, #fourth-column {color: white;}
+  ]]></style>
+ </head>
+ <body>
+  <div>
+    <span id="first-column"> ab cd ef gh </span>
+    <h4>123</h4>
+    <span id="second-column"> ij kl mn oq </span>
+    <span id="third-column"> ab cd ef gh </span>
+    <span id="fourth-column"> rs tu vw xy </span>
+  </div>
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-002-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-002-expected.xht
new file mode 100644 (file)
index 0000000..e61dce2
--- /dev/null
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-24  -->
+  <meta name="flags" content="image" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  font: 1.25em/1 serif;
+  border: 1em solid gray;
+  width: 11em;
+  height: 6em;
+  position: relative;
+  }
+
+  img {position: absolute;}
+
+  img#black {top: 4em;}
+
+  img#first-orange {top: 5em;}
+
+  img#second-orange {left: 4em;}
+
+  img#first-pink
+  {
+  left: 4em;
+  top: 3em;
+  }
+
+  img#second-pink {left: 8em;}
+
+  img#yellow
+  {
+  left: 8em;
+  top: 1em;
+  }
+  ]]></style>
+ </head>
+ <body>
+
+  <div>
+       <img id="blue" src="support/swatch-blue.png" width="40" height="80" alt="Image download support must be enabled" />
+       <img id="black" src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" />
+       <img id="first-orange" src="support/swatch-orange.png" width="40" height="20" alt="Image download support must be enabled" />
+       <img id="second-orange" src="support/swatch-orange.png" width="40" height="60" alt="Image download support must be enabled" />
+       <img id="first-pink" src="support/swatch-pink.png" width="40" height="60" alt="Image download support must be enabled" />
+       <img id="second-pink" src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" />
+       <img id="yellow" src="support/swatch-yellow.png" width="40" height="80" alt="Image download support must be enabled" />
+  </div>
+
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-block-no-clip-002.xht
new file mode 100644 (file)
index 0000000..4192f29
--- /dev/null
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: Overflowed content inside and outside multicol element</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-24  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements" title="8.1. Overflow inside multicol elements" />
+  <link rel="match" href="multicol-block-no-clip-002-ref.xht"/>
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks that content in the normal flow that extends into column gaps is not clipped in the middle of the column gap." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  border: gray solid 1em;
+  font: 1.25em/1 Ahem;
+  orphans: 1;
+  widows: 1;
+  width: 11em;
+
+  column-count: 3;
+  column-gap: 1em;
+  }
+
+  h4
+  {
+  background: black;
+  color: black;
+  font: inherit;
+  margin: 0;
+  }
+
+  #first-column {color: blue;}
+
+  #second-column {color: orange;}
+
+  #third-column {color: pink;}
+
+  #fourth-column {color: yellow;}
+  ]]></style>
+ </head>
+ <body>
+  <div>
+    <span id="first-column"> ab cd ef gh </span>
+    <h4>1234</h4>
+    <span id="second-column"> ij kl mn oq </span>
+    <span id="third-column"> ab cd ef gh </span>
+    <span id="fourth-column"> rs tu vw xy </span>
+  </div>
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-br-inside-avoidcolumn-001-expected.html
new file mode 100644 (file)
index 0000000..d8d71f8
--- /dev/null
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="jfernandez@igalia.com" />
+<style>
+div {
+  background-color: green;
+  height: 200px;
+  width: 200px;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div></div>
index 419a88b..d3f2c9e 100644 (file)
@@ -5,47 +5,33 @@
 <title>multicol | break-inside: avoid-column</title>
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-breaks"/>
-<link rel="match" href="multicol-br-inside-avoidcolumn-ref.xht"/>
+<link rel="match" href="../reference/ref-filled-green-200px-square.html"/>
 <meta name="flags" content=""/>
 <style type="text/css"><![CDATA[
-html {
-       width: 800px;
-       background: white;
+.multicol {
+  column-count: 2;
+  column-gap: 0;
+  column-fill: auto;
+  overflow: hidden;
+  width: 200px;
+  height: 300px;
 }
-body {
-       background: black;
-       column-count: 3;
-       column-gap: 0;
-       column-fill: auto;
-       height: 300px;
+.multicol > div {
+  height: 200px;
+  break-inside: avoid-column;
+  background: green;
 }
-h1 {
-       column-span: all;
-       color: white;
-}
-div { background: red;
-       height: 150px;
-       break-inside: avoid-column;
-}
-span {
-       float: left;
+.multicol > div.red {
+  background:red;
 }
 ]]></style>
 </head>
 <body>
-<h1>You should not see the word FAIL</h1>
-
-<div>
-       <span>FAIL</span>
-</div>
-
-<div>
-       <span>FAIL</span>
-</div>
-
-<div>
-       <span>FAIL</span>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="multicol">
+  <div></div>
+  <div></div>
+  <div class="red"></div>
 </div>
-
 </body>
 </html>
index e2543ac..d87ead0 100644 (file)
@@ -14,7 +14,7 @@
   height: 3em;
   width: 10em;
   }
-  
+
   img {vertical-align: top;}
   ]]></style>
  </head>
@@ -27,4 +27,4 @@
   <div><img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 84af309..2922716 100644 (file)
@@ -21,9 +21,9 @@
 
   <p>Test passes if the 2 horizontal bars are <strong>identical</strong>.</p>
 
-  <div>&nbsp; <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
+  <div><img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
 
-  <div>&nbsp; <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
+  <div><img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4920b04..c8c53d4 100644 (file)
@@ -47,7 +47,7 @@
       <div>C</div>
   </div>
 
-  <div id="reference">&nbsp; <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
+  <div id="reference"><img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /> <img src="support/black20x20.png" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 672a8fc..b59578b 100644 (file)
@@ -7,7 +7,7 @@
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements" title="8.1. Overflow inside multicol elements" />
   <link rel="match" href="multicol-clip-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that content in the normal flow can extend into column gap before it reaches its middle. In this test, the 'l' and 'c' glyphs are painted into the left half of the column gap; the 'l' and 'e' glyphs extend outside the last column box at the edge of the multi-column and are therefore rendered thanks to the default 'overflow: visible' declaration." />
+  <meta name="assert" content="This test checks that content in the normal flow can extend into column gap. In this test, the 'l' and 'c' glyphs are painted into the left half of the column gap; the 'l' and 'e' glyphs extend outside the last column box at the edge of the multi-column and are therefore rendered thanks to the default 'overflow: visible' declaration." />
   <style type="text/css"><![CDATA[
   div
   {
@@ -41,4 +41,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index a97020f..4220dce 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index b71d0a3..1a340ef 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 055030f..6c0e0d4 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index a1d01ce..fc95b75 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index f023761..3e02d35 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4cc324d..1f58cc4 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index ade4085..3af8ef7 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 6a482f6..1076efa 100644 (file)
@@ -5,7 +5,7 @@
   <!-- 
   Original, initial filename of this test was
   multicol-columns-toolong-002.xht
-  and it should be filename-renamed 
+  and it should be filename-renamed
   multicol-columns-invalid-002.xht
    -->
 
@@ -37,7 +37,7 @@
  </head>
  <body>
   <div>
-  bl ac 
+  bl ac
     <span>
     bl ue
     </span>
@@ -47,4 +47,4 @@
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 6789bbb..b7ed1d4 100644 (file)
@@ -31,8 +31,8 @@
   }
 
   /*
-  In this test, the initial containing block establishes containing block 
-  for such red span. Therefore, the 2 short red stripes should be 
+  In this test, the initial containing block establishes containing block
+  for such red span. Therefore, the 2 short red stripes should be
   positioned out of view, just outside the top edge of viewport.
   */
 
@@ -46,4 +46,4 @@
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index cf68a9d..18d957e 100644 (file)
   column-count: 4;
   column-gap: 1em;
   }
-  
-  span {color: red;}  
-  
+
+  span {color: red;}
+
   img#white-overlapping
   {
   left: 11em;
   position: absolute;
-  top: 1em;  
+  top: 1em;
   }
   ]]></style>
  </head>
@@ -35,4 +35,4 @@
   <div>4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 4444 1&nbsp;&nbsp; 1&nbsp;&nbsp; 1&nbsp;&nbsp; 4444 1&nbsp;&nbsp;1 1&nbsp;&nbsp;1 4444 1&nbsp;&nbsp;1  1&nbsp;&nbsp;1  1&nbsp;&nbsp;1 4444 1<span>RED</span> 1<span>RED</span> 4444 &nbsp;&nbsp;&nbsp;1  &nbsp;&nbsp;&nbsp;1 4444 4444 1&nbsp;&nbsp; 1&nbsp;&nbsp; 4444 &nbsp;&nbsp;&nbsp;1  &nbsp;&nbsp;&nbsp;1 4444 <img id="white-overlapping" src="support/swatch-white.png" width="60" height="40" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4645b63..eb6276c 100644 (file)
@@ -19,6 +19,6 @@
   ]]></style>
  </head>
  <body>
-  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div> 
+  <div>d da d da d da d da d da d da dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dame dame dame dame dame dame damerdamerdamerdamerdamerdamer<br />d da d da d da d da d da&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; dam&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; dame dame dame dame dame &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; damerdamerdamerdamerdamer &nbsp;&nbsp;&nbsp;&nbsp;</div>
  </body>
-</html>
\ No newline at end of file
+</html>
index cb9b197..e30d653 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 05e676f..5867b46 100644 (file)
  </head>
  <body>
 
- <div><img src="support/black20x20.png" width="420" height="20" alt="Image download support must be enabled" /> 
- <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> 
+ <div><img src="support/black20x20.png" width="420" height="20" alt="Image download support must be enabled" />
+
+ <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />
+
  <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" />
 
  <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" />
@@ -37,4 +37,4 @@
  </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-003-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-003-expected.xht
new file mode 100644 (file)
index 0000000..30d6d75
--- /dev/null
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-29  -->
+  <meta name="flags" content="image" />
+
+  <style type="text/css"><![CDATA[
+  img {vertical-align: top;}
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div><img src="support/swatch-gray.png" width="300" height="20" alt="Image download support must be enabled" /></div>
+
+  <div><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="5" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="35" height="20" alt="Image download support must be enabled" /><img src="support/swatch-purple.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="60" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /></div>
+
+  <div><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-orange.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="5" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="35" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="60" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /></div>
+
+  <div><img src="support/swatch-gray.png" width="300" height="20" alt="Image download support must be enabled" /></div>
+
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-003.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-003.xht
new file mode 100644 (file)
index 0000000..2a5cc08
--- /dev/null
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: column-rule and overflow inside (complex test)</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-29  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
+  <link rel="match" href="multicol-count-computed-003-ref.xht" />
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should not be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should not be clipped and should overlappe partially the 1st column-rule." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background: yellow;
+  border: gray solid 1em;
+  color: black;
+  font: 1.25em/1 Ahem;
+  orphans: 1;
+  widows: 1;
+  width: 13em;
+
+  column-count: 3;
+  column-gap: 5em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.5em;
+  }
+
+  /*
+  (11)  if (column-width = auto) and (column-count != auto) then
+  (12)    N := column-count;
+  (13)    W := max(0, (available-width - ((N - 1) * column-gap)) / N);
+  (14)  exit;
+
+  So, the used column-count in this test is 3.
+
+  W := max(0, (available-width - ((N - 1) * column-gap)) / N);
+  W == max(0, (13em - ((3 - 1) * 5em)) / 3);
+  W == max(0, (13em - (2 * 5em)) / 3);
+  W == max(0, (13em - (10em)) / 3);
+  W == max(0, (3em) / 3);
+  W == max(0, 1em);
+  W == 1em;
+
+  So, the used column-width in this test is 1em.
+  */
+
+  #pink {color: pink;}
+  #orange {color: orange;}
+  #purple {color: purple;}
+  #gray {color: gray;}
+
+  /*
+  Since
+  "
+  content that extends outside column boxes visibly overflows and is not clipped to the column box.
+  "
+  https://drafts.csswg.org/css-multicol-1/#overflow-inside-multicol-elements
+  this causes the right-half (0.5em) of the 'K' glyph to
+  overlap the right-half (0.75em) of the 1st blue column-rule.
+  Same thing should happen to the 'N' glyph of 'ORAN'.
+
+  Because no inline content should be rendered into the
+  3rd column box, this causes the 2nd column rule not
+  been rendered because
+  "
+  Column rules are only drawn between two columns that
+  both have content.
+  "
+  http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
+  */
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div>
+       <span id="pink">PINK</span>
+       <span id="orange">ORAN</span>
+       <span id="purple">PURP</span>
+       <span id="gray">GRAY</span>
+  </div>
+
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-005-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-005-expected.xht
new file mode 100644 (file)
index 0000000..30d6d75
--- /dev/null
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-07-29  -->
+  <meta name="flags" content="image" />
+
+  <style type="text/css"><![CDATA[
+  img {vertical-align: top;}
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div><img src="support/swatch-gray.png" width="300" height="20" alt="Image download support must be enabled" /></div>
+
+  <div><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="5" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="35" height="20" alt="Image download support must be enabled" /><img src="support/swatch-purple.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="60" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /></div>
+
+  <div><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-orange.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="5" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="35" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="60" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /></div>
+
+  <div><img src="support/swatch-gray.png" width="300" height="20" alt="Image download support must be enabled" /></div>
+
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-005.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-count-computed-005.xht
new file mode 100644 (file)
index 0000000..863ca71
--- /dev/null
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: column-rule and overflow inside (complex test)</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-03  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" title="3. The number and width of columns" />
+  <link rel="match" href="multicol-count-computed-003-ref.xht" />
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should not be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should not be partially clipped and should overlap partially with the 1st column-rule." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background: yellow;
+  border: gray solid 1em;
+  color: black;
+  font: 1.25em/1 Ahem;
+  orphans: 1;
+  widows: 1;
+  width: 13em;
+
+  column-gap: 5em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 1.5em;
+  column-width: 1em;
+  }
+
+  /*
+  (15)  if (column-width != auto) and (column-count = auto) then
+  (16)    N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
+  (17)    W := ((available-width + column-gap) / N) - column-gap;
+  (18)  exit;
+
+  N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
+  N == max(1, floor((13em + 5em) / (1em + 5em)));
+  N == max(1, floor(18em / 6em));
+  N == max(1, floor(3));
+  N == 3;
+
+  So, the used column-count in this test is 3.
+
+  W := ((available-width + column-gap) / N) - column-gap;
+  W == ((13em + 5em) / 3) - 5em;
+  W == ((18em) / 3) - 5em;
+  W == (6em) - 5em;
+  W == 1em;
+
+  So, the used column-width in this test is 1em.
+  */
+
+  #pink {color: pink;}
+  #orange {color: orange;}
+  #purple {color: purple;}
+  #gray {color: gray;}
+
+  /*
+  Since
+  "
+  content that extends outside column boxes visibly overflows and is not clipped to the column box
+  "
+  http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements
+  this causes the right-half (0.5em) of the 'K' glyph to
+  overlap with the right-half (0.75em) of the 1st blue column-rule.
+  Same thing should happen to the 'N' glyph of 'ORAN'.
+
+  Because no inline content should be rendered into the
+  3rd column box, this causes the 2nd column rule not
+  been rendered because
+  "
+  Column rules are only drawn between two columns that
+  both have content.
+  "
+  http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
+  */
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div>
+       <span id="pink">PINK</span>
+       <span id="orange">ORAN</span>
+       <span id="purple">PURP</span>
+       <span id="gray">GRAY</span>
+  </div>
+
+ </body>
+</html>
index bcfceca..1243ec7 100644 (file)
   columns: 3;
   column-fill: balance;
   column-gap: 0em;
-  
+
   /*
 
   N == 3;
-  
-  W == 6em;  
-  
+
+  W == 6em;
+
   */
-  
+
   orphans: 1;
   widows: 1;
   }
@@ -66,6 +66,6 @@
       <td>I</td>
     </tr>
   </table>
+
  </body>
-</html>
\ No newline at end of file
+</html>
index e9d9648..1cce4c3 100644 (file)
   columns: 2;
   column-fill: balance;
   column-gap: 0em;
-  
+
   /*
 
   N == 2;
-  
-  W == 10em;  
-  
+
+  W == 10em;
+
   */
   }
 
@@ -61,4 +61,4 @@
   </table>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index b7c8f8a..782b7cb 100644 (file)
@@ -28,6 +28,6 @@
  <body>
 
   <div>1 22 333 4444 55555 666666 7777777 999999999 1 22 333 4444 55555 666666 7777777 999999999 1 22 333 4444 55555 666666 7777777 999999999</div>
+
  </body>
-</html>
\ No newline at end of file
+</html>
index d1fd989..70c1f06 100644 (file)
@@ -7,7 +7,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-       font-family: ahem; 
+       font-family: ahem;
        font-size: 1.25em;
        line-height: 1em;
        color: green;
@@ -20,7 +20,7 @@ body>div {
 }
 div.col {
        column-count: 2;
-       column-fill: auto; 
+       column-fill: auto;
        column-gap: 0;
 }
 div.red {
index 65fe188..9a28395 100644 (file)
@@ -10,7 +10,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-       font-family: ahem; 
+       font-family: ahem;
        font-size: 1.25em;
        line-height: 1em;
        color: green;
@@ -23,7 +23,7 @@ body>div {
 }
 div.col {
        column-count: 2;
-       column-fill: auto; 
+       column-fill: auto;
        column-gap: 0;
 }
 div.red {
index 82c4d0f..db83258 100644 (file)
@@ -47,7 +47,7 @@
   |12 4567 90|  |          |
   ************  ************
 
-  The digits are the green squares, the white squares 
+  The digits are the green squares, the white squares
   are the blank white spaces. The yellow vertical stripe
   represent both the column-gap and the column-rule.
   The "3" glyph at line 5 of 1st column box should be
@@ -56,4 +56,4 @@
    -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 087295d..0289f10 100644 (file)
@@ -6,65 +6,35 @@
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-16  -->
   <meta name="flags" content="" />
   <style type="text/css"><![CDATA[
-  body {margin: 8px;}
+  body {margin:0; margin-top:8px;}
 
   div
   {
+  float: left;
   background-color: blue;
   height: 200px;
-  width: 680px;
+  width: 60%;
+  margin-left: 8px;
   }
 
   h1
   {
-  color: white; 
+  color: white;
   font-size: 2em;
   line-height: 1.25; /* or 1.21875 to achieve a 39px tall line box */
-  margin-top: 8px; /* The margin-top of body and h1 will collapse into an 8px gap */
-  margin-bottom: 21px;
-  padding-top: 21px;
+  margin: 21px 0em;
   }
 
   span#pass
   {
+  float: left;
+  margin-left: 10px;
   color: blue;
   font-size: 1.5em;
   font-weight: bolder;
-  left: 698px;
-  
-  /*
-
-  Expected result:
-  
-  8px                                           688px
-  v                                              v
-  ************************************************
-  *                                              *
-  *  <h1>Test passes if the word "PASS!" is<br />*  1st line box
-  *  on the right &#8600;</h1>                   *  2nd line box
-  *                                              *
-  ************************************************
-  *                                              *
-  * <h2>nbsp;<h2>  <h2>nbsp;<h2>  <h2>nbsp;<h2>  *  <h2>PASS!</h2>
-  *                                              *
-  ************************************************
-                ^              ^              
-               228px          458px
-
-  */
 
   line-height: 1;
-  position: absolute;
-  top: 130px;
-
-  /*
-    8px : margin-top of body element
-   21px : margin-top of h1 element which must not collapse with body's margin-top
-   80px : content height: 2 line boxes required to render the "Test passes if ..." sentence
-   21px : margin-bottom of h1 element
- ====================================
-  130px : top position of span#pass in document box
-  */
+  margin-top: 122px;
   }
   ]]></style>
  </head>
@@ -72,8 +42,8 @@
 
   <div>
     <h1>Test passes if "PASS!" is<br />on the right &#8600;</h1>
-    <span id="pass">PASS!</span>
   </div>
+  <span id="pass">PASS!</span>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4a2c464..f5ebf54 100644 (file)
   background-color: blue;
   height: 200px;
   margin: 8px;
-  width: 680px; 
+  width: 60%;
 
   column-count: 3;
   column-fill: auto;
   column-gap: 10px;
-
-  /* 
-  So, each column box should be 
-  [680px minus (2 mult 10px)] divided by 3 == 220px wide
-  */
   }
 
   h1
 
   <h2>PASS!</h2>
 
-  <!-- 
-  
-  Expected result:
-  
-  8px                                           688px
-  v                                              v
-  ************************************************
-  *                                              *
-  *  <h1>Test passes if the word "PASS!" is<br />*  1st line box
-  *  on the right &#8600;</h1>                   *  2nd line box
-  *                                              *
-  ************************************************
-  *                                              *
-  * <h2>nbsp;<h2>  <h2>nbsp;<h2>  <h2>nbsp;<h2>  *  <h2>PASS!</h2>
-  *                                              *
-  ************************************************
-                ^              ^              
-               228px          458px
-   -->
-
  </body>
-</html>
\ No newline at end of file
+</html>
index 5570e4e..a91908a 100644 (file)
@@ -7,7 +7,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-       font-family: ahem;  
+       font-family: ahem;
        font-size: 1.25em;
        line-height: 1em;
        color: green;
@@ -20,7 +20,7 @@ body>div {
 }
 div.col {
        column-count: 2;
-       column-fill: balance; 
+       column-fill: balance;
        column-gap: 0;
 }
 div.red {
index f5f76ef..7dbd140 100644 (file)
@@ -10,7 +10,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-       font-family: ahem;  
+       font-family: ahem;
        font-size: 1.25em;
        line-height: 1em;
        color: green;
@@ -23,7 +23,7 @@ body>div {
 }
 div.col {
        column-count: 2;
-       column-fill: balance; 
+       column-fill: balance;
        column-gap: 0;
 }
 div.red {
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-002-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-002-expected.html
new file mode 100644 (file)
index 0000000..82fcaa3
--- /dev/null
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<p>Test passes if there is a filled green square.</p>
+<div style="width:100px; height:100px; background:green;"></div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-002.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-fill-balance-002.html
new file mode 100644 (file)
index 0000000..fb6004d
--- /dev/null
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>CSS Multi-column Layout Test: Balancing with more forced breaks than columns</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf" title="7.1. column-fill">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This multicol container will create overflowing columns, no matter what, due to forced break. Don't overstretch.">
+<p>Test passes if there is a filled green square.</p>
+<div style="columns:2; column-gap:0; width:100px; background:green;">
+  <div style="height:100px;"></div>
+  <div style="break-before:column; height:90px;"></div>
+  <div style="break-before:column; height:10px;"></div>
+</div>
index 59a57ac..57bf808 100644 (file)
@@ -17,7 +17,7 @@
   }
 
   div#test
-  { 
+  {
   background-color: yellow;
   orphans: 1;
   widows: 1;
@@ -38,4 +38,4 @@
   <div id="reference">1234567890<span>1234567890</span>1234567890</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index fdac806..9a0871d 100644 (file)
@@ -6,7 +6,7 @@
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-05  -->
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
-  div {margin: 1.25em;}
+  div {margin: 1.25em; line-height: 1;}
 
   img {vertical-align: top;}
   ]]></style>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-001-expected.txt
new file mode 100644 (file)
index 0000000..e16e205
--- /dev/null
@@ -0,0 +1,3 @@
+
+FAIL column-gap property is animatable assert_equals: expected "100px" but got "0px"
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-001.html
new file mode 100644 (file)
index 0000000..6a3a8d3
--- /dev/null
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Multi-column Layout Test: column-gap test animation</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-gap">
+<link rel="help" href="https://www.w3.org/TR/web-animations-1/#dom-animatable-animate">
+<meta name="assert" content="Test checks that column-gap is an animatable property, and that the computed values during the animation are the expected ones.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #multicol {
+    column-gap: 0px;
+  }
+</style>
+<body>
+  <div id="multicol"></div>
+  <div id="log"></div>
+
+  <script>
+    test(
+      function(){
+        var multicol = document.getElementById("multicol");
+        assert_equals(getComputedStyle(multicol).columnGap, "0px");
+
+        var keyframes = [
+          { columnGap: "100px" },
+          { columnGap: "200px" }
+        ];
+        var options = {
+          duration: 10,
+          fill: "forwards",
+          easing: "linear"
+        };
+
+        var player = multicol.animate(keyframes, options);
+        player.pause();
+        player.currentTime = 0;
+        assert_equals(getComputedStyle(multicol).columnGap, "100px");
+        player.currentTime = 5;
+        assert_equals(getComputedStyle(multicol).columnGap, "150px");
+        player.currentTime = 10;
+        assert_equals(getComputedStyle(multicol).columnGap, "200px");
+      }, "column-gap property is animatable");
+  </script>
+</body>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-002-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-002-expected.txt
new file mode 100644 (file)
index 0000000..94cc89c
--- /dev/null
@@ -0,0 +1,3 @@
+
+FAIL column-gap: normal is not interpolable assert_equals: expected "100px" but got "80.24139404296875px"
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-002.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-002.html
new file mode 100644 (file)
index 0000000..de3756c
--- /dev/null
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Multi-column Layout Test: column-gap normal test animation</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-gap">
+<link rel="help" href="https://www.w3.org/TR/web-animations-1/#dom-animatable-animate">
+<meta name="assert" content="Test checks that 'normal' value for column-gap property is not interpolable.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @keyframes column-gap-normal-to-100 {
+    from { column-gap: normal; }
+    to { column-gap: 100px; }
+  }
+
+  #multicol {
+    animation-name: column-gap-normal-to-100;
+    animation-duration: 2s;
+    animation-delay: -1s;
+    animation-play-state: paused;
+  }
+</style>
+<body>
+  <div id="multicol"></div>
+  <div id="log"></div>
+
+  <script>
+    test(
+      function(){
+        var multicol = document.getElementById("multicol");
+        assert_equals(getComputedStyle(multicol).columnGap, "100px");
+      }, "column-gap: normal is not interpolable");
+  </script>
+</body>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-003-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-003-expected.txt
new file mode 100644 (file)
index 0000000..4a5e93a
--- /dev/null
@@ -0,0 +1,3 @@
+
+FAIL Default column-gap is not interpolable assert_equals: expected "100px" but got "80.24139404296875px"
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-003.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-animation-003.html
new file mode 100644 (file)
index 0000000..71182fa
--- /dev/null
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Multi-column Layout Test: Default column-gap test animation</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-gap">
+<link rel="help" href="https://www.w3.org/TR/web-animations-1/#dom-animatable-animate">
+<meta name="assert" content="Test checks that the default value for column-gap property, which is 'normal', is not interpolable.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @keyframes column-gap-to-100 {
+    to { column-gap: 100px; }
+  }
+
+  #multicol {
+    animation-name: column-gap-to-100;
+    animation-duration: 2s;
+    animation-delay: -1s;
+    animation-play-state: paused;
+  }
+</style>
+<body>
+  <div id="multicol"></div>
+  <div id="log"></div>
+
+  <script>
+    test(
+      function(){
+        var multicol = document.getElementById("multicol");
+        assert_equals(getComputedStyle(multicol).columnGap, "100px");
+      }, "Default column-gap is not interpolable");
+  </script>
+</body>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-fraction-002-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-fraction-002-expected.html
new file mode 100644 (file)
index 0000000..98ee818
--- /dev/null
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<p>There should be nothing below.</p>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-fraction-002.html
new file mode 100644 (file)
index 0000000..ae1aaaa
--- /dev/null
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<title>CSS Multi-column Layout Test: 'column-gap' with sub-pixel values</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'">
+<link rel="match" href="../reference/nothing.html" />
+<meta name="assert" content="Specified column-gap should never be rounded up to the nearest integer, or the second column in the tests might overflow the multicol container in the inline direction.">
+<style>
+  .multicol { margin:10px; float:left; columns:2; width:50px; column-gap:10.9px; column-fill:auto; height:50px; background:white; }
+  .filler { height:50px; }
+  .below-everything { position:relative; z-index:-1; float:right; width:20px; height:20px; background:red; }
+</style>
+
+<p>There should be nothing below.</p>
+
+<div class="multicol" style="column-gap:10px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.1px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.2px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.3px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.4px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.5px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.6px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.7px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.8px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:10.9px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
+
+<div class="multicol" style="column-gap:11px;">
+  <div class="filler"></div>
+  <div class="below-everything"></div>
+</div>
index 56e6500..3b5218c 100644 (file)
@@ -7,7 +7,7 @@
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 'column-gap" />
   <link rel="match" href="multicol-gap-large-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that when 'column-gap' is large and when used 'column-width' is narrow, then content extends into column-gap until its middle and content can extend, overflow outside the edges of the multi-colum element if 'overflow' is set to 'visible'." />
+  <meta name="assert" content="This test checks that when 'column-gap' is large and when used 'column-width' is narrow, then content extends into column-gap and content can extend, overflow outside the edges of the multi-colum element if 'overflow' is set to 'visible'." />
   <style type="text/css"><![CDATA[
   div
   {
 
   column-count: 4;
   column-gap: 4em;
-  
+
   /*
   N == 4;
   W == 0em;
   */
-  
+
   /*
-  In this test, the content of first 3 column 
-  boxes extend into middle of column-gap and 
-  content of the 4th column box extend outside the 
-  right edge of multi-column. The gray border-right of 
-  multi-column elemen overlaps partially the 3rd 
+  In this test, the content of first 3 column
+  boxes extend into middle of column-gap and
+  content of the 4th column box extend outside the
+  right edge of multi-column. The gray border-right of
+  multi-column elemen overlaps partially the 3rd
   column-gap.
   */
   }
@@ -52,4 +52,4 @@
   bl ac
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index c64e741..aa42e5d 100644 (file)
@@ -7,7 +7,7 @@
   <meta name="flags" content="image" />
   <style type="text/css"><![CDATA[
   div {font: 1.25em/1 serif;}
-  
+
   img {vertical-align: top;}
   ]]></style>
  </head>
@@ -21,4 +21,4 @@
   <div><img src="support/swatch-gray.png" width="260" height="20" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-percentage-001-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-percentage-001-expected.txt
new file mode 100644 (file)
index 0000000..a24225b
--- /dev/null
@@ -0,0 +1,105 @@
+
+FAIL .multicol 1 assert_equals: 
+<div class="multicol marginTopBottom" data-expected-width="8" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="3" data-expected-height="20">XXXXX</div>
+    <div data-offset-x="5" data-offset-y="0" data-expected-width="3" data-expected-height="20">XXXXX</div>
+  </div>
+width expected 3 but got 0
+FAIL .multicol 2 assert_equals: 
+<div class="multicol marginTopBottom" data-expected-width="8" data-expected-height="60">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="3" data-expected-height="60">XX X X</div>
+    <div data-offset-x="5" data-offset-y="0" data-expected-width="3" data-expected-height="60">XX X X</div>
+  </div>
+width expected 3 but got 0
+FAIL .multicol 3 assert_equals: 
+<div class="multicol marginTopBottom" data-expected-width="8" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="3" data-expected-height="20">X</div>
+    <div data-offset-x="5" data-offset-y="0" data-expected-width="3" data-expected-height="20">X</div>
+  </div>
+width expected 3 but got 0
+FAIL .multicol 4 assert_equals: 
+<div class="multicol marginTopBottom" data-expected-width="200" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+    <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+  </div>
+width expected 75 but got 90
+FAIL .multicol 5 assert_equals: 
+<div class="multicol marginTopBottom" data-expected-width="200" data-expected-height="40">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+    <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+  </div>
+width expected 75 but got 90
+FAIL .multicol 6 assert_equals: 
+<div class="multicol marginTopBottom" data-expected-width="200" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+    <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+  </div>
+width expected 75 but got 90
+FAIL .multicol 7 assert_equals: 
+<div class="multicol inlineBlock" data-expected-width="200" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+</div>
+width expected 200 but got 220
+FAIL .multicol 8 assert_equals: 
+<div class="multicol inlineBlock" data-expected-width="240" data-expected-height="40">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="90" data-expected-height="40">XX X X</div>
+  <div data-offset-x="150" data-offset-y="0" data-expected-width="90" data-expected-height="40">XX X X</div>
+</div>
+width expected 240 but got 260
+FAIL .multicol 9 assert_equals: 
+<div class="multicol inlineBlock" data-expected-width="40" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="20">X</div>
+  <div data-offset-x="25" data-offset-y="0" data-expected-width="15" data-expected-height="20">X</div>
+</div>
+width expected 40 but got 60
+FAIL .multicol 10 assert_equals: 
+<div class="multicol fixed200" data-expected-width="200" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+</div>
+width expected 75 but got 90
+FAIL .multicol 11 assert_equals: 
+<div class="multicol fixed200" data-expected-width="200" data-expected-height="40">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+</div>
+width expected 75 but got 90
+FAIL .multicol 12 assert_equals: 
+<div class="multicol fixed200" data-expected-width="200" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+</div>
+width expected 75 but got 90
+Multicol container: fixed width
+
+X
+X
+XX X X
+XX X X
+XXXXX
+XXXXX
+Multicol container: intrinsic width
+
+X
+X
+XX X X
+XX X X
+XXXXX
+XXXXX
+Multicol container: auto width
+
+X
+X
+XX X X
+XX X X
+XXXXX
+XXXXX
+X
+X
+XX X X
+XX X X
+XXXXX
+XXXXX
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-gap-percentage-001.html
new file mode 100644 (file)
index 0000000..b086eba
--- /dev/null
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Multi-column Layout Test: column-gap supports percentages</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-gap">
+<meta name="assert" content="This test checks the behavior of precentage column-gap in different situations depending on the multicol container size.">
+<style>
+.multicol {
+  position: relative;
+  font: 20px/1 Ahem;
+  margin: 10px;
+  column-count: 2;
+  column-gap: 25%;
+  background: yellow;
+}
+
+.fixed200 {
+  width: 200px;
+}
+
+.inlineBlock {
+  display: inline-block;
+}
+
+.wrapper200 {
+  width: 200px;
+}
+
+.wrapper8 {
+  width: 8px;
+}
+
+.marginTopBottom {
+  margin: 10px 0;
+}
+
+.multicol > :nth-child(1) { background: magenta; }
+.multicol > :nth-child(2) { background: cyan; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.multicol')">
+
+<div id="log"></div>
+
+<h3>Multicol container: fixed width</h3>
+
+<div class="multicol fixed200" data-expected-width="200" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+</div>
+
+<div class="multicol fixed200"
+    data-expected-width="200" data-expected-height="40">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+</div>
+
+<div class="multicol fixed200"
+    data-expected-width="200" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+</div>
+
+<h3>Multicol container: intrinsic width</h3>
+
+<div class="multicol inlineBlock"
+    data-expected-width="40" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="15" data-expected-height="20">X</div>
+  <div data-offset-x="25" data-offset-y="0" data-expected-width="15" data-expected-height="20">X</div>
+</div>
+
+<div class="multicol inlineBlock"
+    data-expected-width="240" data-expected-height="40">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="90" data-expected-height="40">XX X X</div>
+  <div data-offset-x="150" data-offset-y="0" data-expected-width="90" data-expected-height="40">XX X X</div>
+</div>
+
+<div class="multicol inlineBlock"
+    data-expected-width="200" data-expected-height="20">
+  <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+  <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+</div>
+
+<h3>Multicol container: auto width</h3>
+
+<div class="wrapper200">
+
+  <div class="multicol marginTopBottom"
+      data-expected-width="200" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+    <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">X</div>
+  </div>
+
+  <div class="multicol marginTopBottom"
+      data-expected-width="200" data-expected-height="40">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+    <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="40">XX X X</div>
+  </div>
+
+  <div class="multicol marginTopBottom"
+      data-expected-width="200" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+    <div data-offset-x="125" data-offset-y="0" data-expected-width="75" data-expected-height="20">XXXXX</div>
+  </div>
+
+</div>
+
+<div class="wrapper8">
+
+  <div class="multicol marginTopBottom"
+      data-expected-width="8" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="3" data-expected-height="20">X</div>
+    <div data-offset-x="5" data-offset-y="0" data-expected-width="3" data-expected-height="20">X</div>
+  </div>
+
+  <div class="multicol marginTopBottom"
+      data-expected-width="8" data-expected-height="60">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="3" data-expected-height="60">XX X X</div>
+    <div data-offset-x="5" data-offset-y="0" data-expected-width="3" data-expected-height="60">XX X X</div>
+  </div>
+
+  <div class="multicol marginTopBottom"
+      data-expected-width="8" data-expected-height="20">
+    <div data-offset-x="0" data-offset-y="0" data-expected-width="3" data-expected-height="20">XXXXX</div>
+    <div data-offset-x="5" data-offset-y="0" data-expected-width="3" data-expected-height="20">XXXXX</div>
+  </div>
+
+</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-height-block-child-001-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-height-block-child-001-expected.xht
new file mode 100644 (file)
index 0000000..9e117d3
--- /dev/null
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-08  -->
+  <meta name="flags" content="image" />
+ </head>
+ <body>
+   <div style="font:20px/1 Ahem; width:22em; height:5em; background:blue;">
+     <div style="width:3em; height:5em; background:black;"></div>
+   </div>
+   <div style="font:20px/1 Ahem; width:14em; height:3em; background:blue;">
+     <div style="float:left; width:3em; height:3em; margin-right:5em; background:orange;"></div>
+     <div style="float:left; width:3em; height:3em; background:orange;"></div>
+   </div>
+
+  <!-- 
+
+  Expected results:
+
+ 0em           7em          14em            22em
+  v             v             v               v
+0 *********************************************
+  * bla         |             |               *
+  * bla         |             |               *
+  * bla         |             |               *
+  * bla         |             |               *
+5 * bla         |             |               *
+6 * orn         | zzz         |****************
+7 * orn         | zzz         |
+8 * orn         | zzz         |
+  *****************************
+
+   -->
+
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-height-block-child-001.xht
new file mode 100644 (file)
index 0000000..6d9160e
--- /dev/null
@@ -0,0 +1,91 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: multi-column element with child block (complex)</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-08  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" title="2. The multi-column model" />
+  <link rel="bookmark" href="http://lists.w3.org/Archives/Public/www-style/2013Aug/0091.html" title="[css3-multicol] Nested multicolumn elements rendering" />
+  <link rel="match" href="multicol-height-block-child-001-ref.xht" />
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks that a nested multi-column element's inline content could be clipped horizontally." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: blue;
+  font: 20px/1 Ahem;
+  height: 8em;
+  width: 14em;
+
+  column-count: 2;
+  column-gap: 2em;
+
+  /*
+
+  N == 2;
+
+  W == 6em;
+
+  H == 8em;
+
+  */
+  }
+
+  div#outer
+  {
+  color: black;
+  column-fill: auto;
+  }
+
+  div#inner
+  {
+  color: orange;
+  column-fill: balance;
+  }
+  ]]></style>
+ </head>
+ <body>
+
+  <div id="outer">
+  bla bla bla bla bla
+
+    <div id="inner">orn orn orn zzz zzz zzz</div>
+
+  </div>
+
+  <!-- 
+  Both column boxes of div#inner start in the 1st column box of
+  div#outer multi-column element.  All the 6 lines of div#inner will
+  be rendered inside the 1st column box of div#outer. The first three
+  lines in the first inner column, and the last three in the second
+  inner column, which will overflow the first outer column, and
+  actually appear as if they were part of the second outer column. No
+  clipping should occur, unless explicitly requested.
+
+  All the 6 lines of #inner fit in a column row that resides in the
+  first outer column. #inner has a fixed height, and is taller than
+  what can fit in the first outer column, so it needs to continue in
+  the second outer column, with no inner column content left to
+  fragment. #inner is a 14em wide block that is put into a 6em wide
+  outer column, so it will overflow the outer column all the way to
+  22em, relatively to the left edge of the outer multicol container.
+
+  Expected results:
+
+ 0em           7em          14em            22em
+  v             v             v               v
+0 *********************************************
+  * bla         |             |               *
+  * bla         |             |               *
+  * bla         |             |               *
+  * bla         |             |               *
+5 * bla         |             |               *
+6 * orn         | zzz         |****************
+7 * orn         | zzz         |
+8 * orn         | zzz         |
+  *****************************
+
+   -->
+
+ </body>
+</html>
index faa4712..493dadd 100644 (file)
   -  2em : horizontal margin of external div
   -  2em : 2 column gaps
  ==========
-    30em 
+    30em
 
   So, W == 10em;
 
-    30em 
+    30em
   -  6em : 3 mult by 2em: horizontal margin of 3 internal divs
- ========== 
+ ==========
     24em : 8em for each of the 3 column boxes without their horizontal margins
 
   */
@@ -72,4 +72,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 96e95a8..a29133c 100644 (file)
   column-gap: 1em;
   font: 1.25em/1 Ahem;
   width: 32em;
-  
+
   /*
   N == 3;
 
-    32em 
+    32em
   -  2em : 2 column gaps
  ==========
     30em : available width of the 3 inner multi-column elements
@@ -79,4 +79,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index d6c47b9..aa5bac9 100644 (file)
@@ -42,19 +42,19 @@ div+div+div {
        <div>
                xx xx
                xx xx
-               xx xx 
+               xx xx
                xx xx
        </div>
        <div>
                xx xx
                xx xx
-               xx xx 
+               xx xx
                xx xx
        </div>
        <div>
                xx xx
                xx xx
-               xx xx 
+               xx xx
                xx xx
        </div>
 </div>
index 651cf75..05a1379 100644 (file)
@@ -1,29 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
-
  <head>
-
   <title>CSS Reftest Reference</title>
-
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
   <style type="text/css"><![CDATA[
-  div\r
-  {\r
-  background-color: green;\r
+  div
+  {
+  background-color: green;
   height: 100px;
-  width: 100px;\r
+  width: 100px;
   }
   ]]></style>
-
  </head>
-
  <body>
-
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
-  <div></div>\r
-
+  <div></div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 19999da..2a0bbbb 100644 (file)
@@ -5,7 +5,7 @@
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-10  -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
-  <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that the margin-top of the first child of a multi-column element (with column-fill: auto) does not collapse with its parent." />
   <style type="text/css"><![CDATA[
@@ -38,7 +38,7 @@
  </head>
 
  <body>
+
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="test-multi-column-red">
@@ -65,6 +65,6 @@
   *********************
 
    -->
+
  </body>
-</html>
\ No newline at end of file
+</html>
index 651cf75..05a1379 100644 (file)
@@ -1,29 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
-
  <head>
-
   <title>CSS Reftest Reference</title>
-
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
-
   <style type="text/css"><![CDATA[
-  div\r
-  {\r
-  background-color: green;\r
+  div
+  {
+  background-color: green;
   height: 100px;
-  width: 100px;\r
+  width: 100px;
   }
   ]]></style>
-
  </head>
-
  <body>
-
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
-  <div></div>\r
-
+  <div></div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 4a4e5f6..0f32f29 100644 (file)
@@ -5,7 +5,7 @@
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-10  -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
-  <link rel="match" href="reference/ref-filled-green-100px-square.xht" />
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
   <meta name="flags" content="ahem" />
   <meta name="assert" content="This test checks that the margin-top of the first child (an inline-block) of a multi-column element (with column-fill: balance) does not collapse with its parent." />
   <style type="text/css"><![CDATA[
@@ -42,7 +42,7 @@
  </head>
 
  <body>
+
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
   <div id="test-multi-column-red">
@@ -71,4 +71,4 @@
    -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
index ecb7a7f..9d108a0 100644 (file)
@@ -35,7 +35,7 @@
 
   <div>
        1scol 1scol
-       1scol 
+       1scol
   <h4> h4h41   </h4>
   <h4> h4h42   </h4>
        2ncol 2ncol
@@ -45,4 +45,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index e2d2482..2762d3d 100644 (file)
@@ -7,9 +7,9 @@
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
   <link rel="match" href="multicol-nested-005-ref.xht" />
   <!-- 
-  The original filename of this test was 
+  The original filename of this test was
   multicol-inherit-005.xht
-  This test also serves as a conversion of 
+  This test also serves as a conversion of
   multicol-nested-001.xht
    -->
   <meta name="flags" content="ahem" />
@@ -39,7 +39,7 @@
   in each inner column box. So:
 
     13em : width of each outer column box
-   -     
+   -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
@@ -54,8 +54,8 @@
   W == max(0, 3em);
   W == 3em;
 
-  So, each duo of 'a', 'm' and 'x' should fill one and only 1 line 
-  box. There are 8 duos; therefore, the first 2 inner 
+  So, each duo of 'a', 'm' and 'x' should fill one and only 1 line
+  box. There are 8 duos; therefore, the first 2 inner
   column boxes should use 3 line boxes and the 3rd inner
   column box should be using 2 line boxes.
 
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 7891c19..c45cc91 100644 (file)
@@ -5,41 +5,8 @@
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-09  -->
   <meta name="flags" content="" />
-  <style type="text/css"><![CDATA[
-  div#rel-pos-wrapper
-  {
-  font: 1.25em/1 serif;
-  position: relative;
-  }
-
-  div#rel-pos-wrapper > div
-  {
-  background-color: blue;
-  font-size: 1em;
-  height: 3em;
-  position: absolute;
-  width: 1em;
-  }
-
-  div#first-column-rule
-  {
-  left: 14em;
-  top: auto;
-  }
-
-  div#second-column-rule
-  {
-  left: 29em;
-  top: auto;
-  }
-   ]]></style>
  </head>
  <body>
-
-  <div id="rel-pos-wrapper">
-       <div id="first-column-rule"></div>
-       <div id="second-column-rule"></div>
-  </div>
-
+   <div style="font: 1.25em/1 Ahem; width:8em; height:3em; margin-left:9em; border-left:1em solid blue; border-right:1em solid blue;"></div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 424446b..5639151 100644 (file)
@@ -18,7 +18,7 @@
   {
   column-rule: blue solid 1em;
   font: 1.25em/1 Ahem;
-  width: 42em;
+  width: 26em;
   }
 
   /*
   N == 3;
 
   W == max(0, (available-width - ((N - 1) * column-gap)) / N);
-  W == max(0, (42em - ((3 - 1) * 3em)) / 3);
-  W == max(0, (42em - (2 * 3em)) / 3);
-  W == max(0, (42em - 6em) / 3);
-  W == max(0, 36em / 3);
-  W == max(0, 12em);
-  W == 12em;
+  W == max(0, (26em - ((3 - 1) * 1em)) / 3);
+  W == max(0, (26em - (2 * 1em)) / 3);
+  W == max(0, (26em - 2em) / 3);
+  W == max(0, 24em / 3);
+  W == max(0, 8em);
+  W == 8em;
 
   So, the first column-rule should be at:
 
     1.0em : margin-left of outer div
-   12.0em : width of 1st column box
-    1.0em : (3.0em / 2) - (1.0em / 2) : left edge of 1st column-rule
+    8.0em : width of 1st column box
+    0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 1st column-rule
   =========
-   14.0em
+    9.0em
 
   The 2nd column-rule should be at:
 
     1.0em : margin-left of outer div
-   12.0em : width of 1st column box
-    3.0em : first column-gap
-   12.0em : width of 2nd column box
-    1.0em : (3.0em / 2) - (1.0em / 2) : left edge of 2nd column-rule
+    8.0em : width of 1st column box
+    1.0em : first -moz-column-gap
+    8.0em : width of 2nd column box
+    0.0em : (1.0em / 2) - (1.0em / 2) : left edge of 2nd column-rule
   =========
-   29.0em
+   18.0em
 
   The height of column rule depends on number of line boxes in
   each outer column box which depends on number of line boxes
   in each inner column box. So:
 
-    12em : width of each outer column box
-   -     
+     8em : width of each outer column box
+   -
      2em : horizontal margin of each div inside
    =======
-    10em : width of each inner multi-column elements
+     6em : width of each inner multi-column elements
 
   N == 3;
 
-  W == max(0, (available-width - ((N - 1) * column-gap)) / N);
-  W == max(0, (10em - ((3 - 1) * 3em)) / 3);
-  W == max(0, (10em - (2 * 3em)) / 3);
-  W == max(0, (10em - 6em) / 3);
+  W == max(0, (available-width - ((N - 1) * -column-gap)) / N);
+  W == max(0, (6em - ((3 - 1) * 1em)) / 3);
+  W == max(0, (6em - (2 * 1em)) / 3);
+  W == max(0, (6em - 2em) / 3);
   W == max(0, 4em / 3);
   W == max(0, 1.33333em);
   W == 1.33333em;
 
-  So, each duo of 'a', 'm' and 'x' should fill one and only 1 line 
-  box. There are 8 duos; therefore, the first 2 inner 
+  So, each duo of 'a', 'm' and 'x' should fill one and only 1 line
+  box. There are 8 duos; therefore, the first 2 inner
   column boxes should use 3 line boxes and the 3rd inner
   column box should be using 2 line boxes.
 
@@ -90,7 +90,7 @@
   widows: 1;
 
   column-count: 3;
-  column-gap: 3em;
+  column-gap: 1em;
   }
   ]]></style>
  </head>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 0cc6002..abd0baa 100644 (file)
@@ -1,21 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
-<html xmlns="http://www.w3.org/1999/xhtml">\r
-<head>\r
-  <title>CSS Reftest Reference</title>\r
-  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />\r
-  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-14  -->\r
-  <meta name="flags" content="" />\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-14  -->
+  <meta name="flags" content="" />
   <style type="text/css"><![CDATA[
   body {margin: 0em;}
-\r
-  div\r
-  {\r
-  background-color: yellow;\r
+
+  div
+  {
+  background-color: yellow;
   font: 1.25em/1 serif;
   height: 5em;
-  position: relative;\r
-  width: 41em;\r
-  }\r
+  position: relative;
+  width: 41em;
+  }
 
   div > div
   {
   height: 2em;
   left: 37em;
   }
-  ]]></style>\r
- </head>\r
- <body>\r
-\r
+  ]]></style>
+ </head>
+ <body>
+
   <div>
     <div id="first-blue"></div>
     <div id="second-blue"></div>
     <div id="third-blue"></div>
-  </div>\r
-\r
- </body>\r
+  </div>
+
+ </body>
 </html>
\ No newline at end of file
index d1e3e1a..89f7cee 100644 (file)
@@ -65,7 +65,7 @@
 
     13em : width of each outer column box
    -
-     2em : horizontal margin of each div inside 
+     2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
@@ -89,7 +89,7 @@
   'x2' and 'x3' duos filling 3 line boxes.
 
   The 2nd column box of last inner multi-column should
-  have 'x4', 'x5' and 'x6' duos filling 3 line boxes. 
+  have 'x4', 'x5' and 'x6' duos filling 3 line boxes.
 
   The 3rd column box of the last inner multi-column should
   have 'x7' and 'x8' duos filling 2 line boxes.
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index cd09f96..017a500 100644 (file)
@@ -46,7 +46,7 @@
   W == 13em;
 
     13em : width of each outer column box
-   -     
+   -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
@@ -93,4 +93,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 00ebb9b..4d2fdb6 100644 (file)
   background-color: blue;
   height: 2em;
   left: 33em;
-  } 
+  }
 
   div#blue3
   {
   background-color: blue;
   height: 1em;
   left: 37em;
-  } 
+  }
    ]]></style>
  </head>
  <body>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index f0ba4e1..e72f608 100644 (file)
@@ -50,7 +50,7 @@
   W == 13em;
 
     13em : width of each outer column box
-   -     
+   -
      2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
@@ -97,4 +97,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 00ebb9b..4d2fdb6 100644 (file)
   background-color: blue;
   height: 2em;
   left: 33em;
-  } 
+  }
 
   div#blue3
   {
   background-color: blue;
   height: 1em;
   left: 37em;
-  } 
+  }
    ]]></style>
  </head>
  <body>
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 6f0cad4..0425414 100644 (file)
@@ -48,8 +48,8 @@
   W == 13em;
 
     13em : width of each outer column box
-   -     
-     2em : horizontal margin of each div inside 
+   -
+     2em : horizontal margin of each div inside
    =======
     11em : width of each inner multi-column elements
 
@@ -95,4 +95,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 1302956..0b56a84 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div
-  { 
+  {
   columns: 2;
   column-fill: balance;
   column-gap: 0px;
@@ -46,4 +46,4 @@
   <table id="reference"><tr><td>G<br />H</td><td>I<br />J</td></tr></table>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 43105a2..4d1598e 100644 (file)
@@ -23,7 +23,7 @@
   {
   column-gap: 0;
   column-width: 201px;
-  
+
   /*
 
   N == max(1, floor((U + column-gap)/(column-width + column-gap)))
   N == max(1, floor(2.985))
   N == max(1, 2)
   N == 2;
-  
+
   W == max(0, ((U + column-gap)/N - column-gap))
   W == max(0, ((600px + 0px)/2 - 0px))
   W == max(0, ((600px)/2 - 0px))
   W == max(0, (300px - 0px))
   W == max(0, 300px)
   W == 300px;
-  
+
   */
   }
 
@@ -58,6 +58,6 @@
   1 2 3 4 5 6 7 8<span>A B C D E F G H </span><br />
   9 0 1 2 3 4 5 6<span>I J K L M N O P </span>
   </div>
+
  </body>
-</html>
\ No newline at end of file
+</html>
index a9392c9..db46631 100644 (file)
@@ -15,7 +15,7 @@
   }
 
   span
-  { 
+  {
   border-left: lime solid 1px;
   border-right: lime solid 1px;
   }
@@ -34,4 +34,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index e48473d..75ed070 100644 (file)
@@ -35,7 +35,7 @@
   }
 
   span
-  { 
+  {
   border-left: lime solid 1px;
   border-right: lime solid 1px;
   }
@@ -54,4 +54,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index a4714ff..07d0b25 100644 (file)
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0em;
   column-rule: green solid 20em;
-  
+
   /*
-  
+
   N == 2;
 
   W == 200px;
@@ -46,4 +46,4 @@
   <div id="reference">12345678901234567890</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index f9a70f1..fb1e3ed 100644 (file)
@@ -11,7 +11,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;
@@ -38,7 +37,7 @@ div+div+div {
 
 <body>
 
-<div> 
+<div>
        <div>xx xx</div>
        <div class="a">x x</div>
        <div>xx xx</div>
index c6e4124..d187c3d 100644 (file)
@@ -14,7 +14,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;
@@ -48,13 +47,13 @@ span+span+span {
 <body>
 
 <div>
-       xx xx 
+       xx xx
 <span>
 </span>
        xx xx
 <span>
 </span>
-       xx xx 
+       xx xx
 <span>
 </span>
        xx xx
index 4441253..fc90376 100644 (file)
@@ -27,7 +27,7 @@
   /*
 
   N == 4;
-  
+
   W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (14em - ((4 - 1) * 1em)) / 4);
   W == max(0, (14em - (3 * 1em)) / 4);
@@ -52,4 +52,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index dc36e21..a37c9f0 100644 (file)
@@ -2,22 +2,23 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Multi-column Layout Test: column-rule-color: inherit (complex)</title>
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-09-03  -->
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-09-03 and 2016-10-02  -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crc" title="4.2. 'column-rule-color'" />
   <link rel="help" href="http://www.w3.org/TR/css3-values/#common-keywords" title="3.1.1. CSS-wide keywords: 'initial' and 'inherit'" />
+  <link rel="help" href="https://drafts.csswg.org/css-color-4/#currentcolor-color" title="5.2. The 'currentcolor' keyword" />
   <link rel="match" href="multicol-rule-color-inherit-001-ref.xht" />
   <meta name="flags" content="ahem" />
-  <meta name="assert" content="This test checks that, by default, column-rule-color is the current color applying to the element." />
+  <meta name="assert" content="In this test, div#parent's computed 'column-rule-color' is given by div#parent's 'currentcolor' (a reserved keyword) and not 'red'. Then div.child's 'column-rule-color' take such specified value ('currentcolor') from its parent (due to 'inherit' keyword) and not 'red'. And then, it is applied to div.child's 'column-rule-color'." />
   <style type="text/css"><![CDATA[
   div#parent
   {
-  color: green;
-  font: 1.25em/1 Ahem;
+  color: red;
+  font: 20px/1 Ahem;
   }
 
   div.child
   {
-  color: red;
+  color: green;
   display: inline-block;
   font-size: 1em;
   width: 5em;
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 2a8042a..a0de7a0 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime dashed 0.2em;
@@ -47,4 +47,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index df31278..fd82e72 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime double 0.2em;
@@ -47,4 +47,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 098c470..e8bc0fb 100644 (file)
@@ -29,7 +29,7 @@
   /*
 
   N == 4;
-  
+
   W == max(0, (available-width - ((N - 1) * column-gap)) / N);
   W == max(0, (14em - ((4 - 1) * 1em)) / 4);
   W == max(0, (14em - (3 * 1em)) / 4);
@@ -50,6 +50,6 @@
   3r cl
   4t cl
   </div>
+
  </body>
-</html>
\ No newline at end of file
+</html>
index 29848b7..f4d3b84 100644 (file)
@@ -32,9 +32,9 @@ div div {
        background: blue;
        width: 1em;
 }
-#a1 {left: 2.43em;}
+#a1 {left: 2.4em;}
 #a2 {left: 3.75em;}
-#a3 {left: 6.13em;}
+#a3 {left: 6.15em;}
 #a4 {left: 7.5em;}
 #a5 {left: 9.9em;}
 #a6 {left: 11.25em;}
@@ -43,7 +43,7 @@ div div {
 
 <body>
 
-<div> 
+<div>
        <div></div>
        <div id="a1" class="a"></div>
        <div id="a2"></div>
index 825b04c..3ba5044 100644 (file)
@@ -47,13 +47,13 @@ span+span+span {
 <body>
 
 <div>
-       xx xx 
+       xx xx
 <span>
 </span>
        xx xx
 <span>
 </span>
-       xx xx 
+       xx xx
 <span>
 </span>
        xx xx
index 79ec96b..d1d5f18 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime groove 0.2em;
@@ -47,4 +47,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4558bf0..3ca606c 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: red hidden 0.2em;
@@ -45,4 +45,4 @@
   <div id="reference">A</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 916d5e5..adc9006 100644 (file)
@@ -19,7 +19,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime inset 0.2em;
@@ -35,7 +35,7 @@
   orphans: 1;
   widows: 1;
   }
-  
+
   span {border-left: lime ridge 0.2em;}
   ]]></style>
  </head>
@@ -48,4 +48,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index c11dc27..93a14a0 100644 (file)
@@ -22,8 +22,8 @@
   <div><img src="support/swatch-gray.png" width="340" height="20" alt="Image download support must be enabled" /></div>
 
   <div><img src="support/swatch-blue.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-lime.png" width="40" height="40" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="120" height="40" alt="Image download support must be enabled" /></div>
-  
+
   <div><img src="support/swatch-gray.png" width="340" height="20" alt="Image download support must be enabled" /></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4d2f114..bf03027 100644 (file)
@@ -15,7 +15,7 @@
   font: 1.25em/1 Ahem;
   margin-left: 1em;
   }
-  
+
   div
   {
   background-color: red;
@@ -48,7 +48,7 @@
   */
 
   /*
-  Since column rules do not take up space, then the test 
+  Since column rules do not take up space, then the test
   should not generate an horizontal scrollbar.
   */
   ]]></style>
@@ -62,6 +62,6 @@
   3r cl
   4t cl
   </div>
+
  </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-002.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-large-002.xht
new file mode 100644 (file)
index 0000000..ebc222e
--- /dev/null
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: over-excessively wide column-rule-width</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-09-03  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
+  <link rel="bookmark" href="http://lists.w3.org/Archives/Public/www-style/2013Sep/0006.html" title="[css3-multicol] z-order of column-rule: below or above border?" />
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks that if a column rule is over-excessively wide, even wider than window viewport, then the column rule will exceed the window viewport width but will not generate an horizontal scrollbar since column rules do not take up space." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: red;
+  border: gray solid 1em;
+  color: lime;
+  font: 1.25em/1 Ahem;
+  orphans: 1;
+  widows: 1;
+  width: 15em;
+
+  column-count: 4;
+  column-gap: 1em;
+  column-rule-color: blue;
+  column-rule-style: solid;
+  column-rule-width: 4000px;
+  }
+  ]]></style>
+ </head>
+
+ <body>
+
+  <p>Test passes if there is no horizontal scrollbar.</p>
+
+  <div>
+  1s cl
+  2n cl
+  3r cl
+  4t cl
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
index 6fe0127..903540c 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: red none 0.2em;
@@ -45,4 +45,4 @@
   <div id="reference">A</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index d2c4593..ac5db82 100644 (file)
@@ -19,7 +19,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime outset 0.2em;
@@ -48,4 +48,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index f9a70f1..fb1e3ed 100644 (file)
@@ -11,7 +11,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;
@@ -38,7 +37,7 @@ div+div+div {
 
 <body>
 
-<div> 
+<div>
        <div>xx xx</div>
        <div class="a">x x</div>
        <div>xx xx</div>
index 06b6212..2fd1ee5 100644 (file)
@@ -14,7 +14,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;
@@ -50,9 +49,9 @@ span+span+span {
 <body>
 
 <div id="one">
-       xx xx 
        xx xx
-       xx xx 
+       xx xx
+       xx xx
        xx xx
 </div>
 
index be08072..4361aee 100644 (file)
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime ridge 0.2em;
-  
+
   /*
 
   N == 2;
@@ -47,4 +47,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index a355e26..2890240 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-  <title>CSS Multi-column Layout Test: 'column-rule-width' has same lenght as 'column-gap'</title>
+  <title>CSS Multi-column Layout Test: 'column-rule-width' has same length as 'column-gap'</title>
   <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-15  -->
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
@@ -68,4 +68,4 @@
    -->
 
  </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2-expected.xht
new file mode 100644 (file)
index 0000000..e53487b
--- /dev/null
@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>multicolumn | column-rule</title>
+<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
+<style><![CDATA[
+body {
+       margin: 0;
+}
+body>div {
+       font-family: ahem;
+       font-size: 1em;
+       line-height: 1em;
+       color: black;
+       background: yellow;
+       margin: 1em;
+       border: 1em solid gray;
+       width: 15em;
+       height: 2em;
+}
+div div {
+       width: 2em;
+       height: 2em;
+       float: left;
+}
+.a {
+       color: blue;
+       width: 1em;
+       margin-left: 1em;
+}
+div+div+div {
+       left: 11em;
+}
+]]></style>
+</head>
+
+<body>
+
+<div>
+       <div>xx xx</div>
+       <div class="a">x x</div>
+       <div>xx xx</div>
+       <div class="a">x x</div>
+       <div>xx xx</div>
+       <div class="a">x x</div>
+       <div>xx xx</div>
+</div>
+
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-rule-shorthand-2.xht
new file mode 100644 (file)
index 0000000..0e5282b
--- /dev/null
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>multicolumn | column-rule</title>
+<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
+<link rel="help" href=""/>
+<link rel="match" href="multicol-rule-shorthand-2-ref.xht"/>
+<meta name="flags" content=""/>
+<style type="text/css"><![CDATA[
+body {
+       margin: 0;
+}
+body>div {
+       font-family: ahem;
+       font-size: 1em;
+       line-height: 1em;
+       color: black;
+       background: yellow;
+       margin: 1em;
+       border: 1em solid gray;
+       width: 15em;
+       orphans: 1;
+       widows: 1;
+
+       column-count: 4;
+       column-gap: 1em;
+       column-rule: solid blue 1em;
+       column-rule: normal red 1em;
+       column: normal red 1em;
+}
+span {
+       background: blue;
+       position: absolute;
+       top: 0;
+       left: 3em;
+       height: 2em;
+       width: 1em;
+}
+span+span {
+       left: 7em;
+}
+span+span+span {
+       left: 11em;
+}
+]]></style>
+</head>
+
+<body>
+
+<div>
+       xx xx
+       xx xx
+       xx xx
+       xx xx
+</div>
+
+</body>
+</html>
index 3c88316..abdfe93 100644 (file)
@@ -18,7 +18,7 @@
   }
 
   div#test
-  { 
+  {
   columns: 2;
   column-gap: 0.2em;
   column-rule: lime solid 0.2em;
@@ -47,4 +47,4 @@
   <div id="reference">1234<span>5678</span></div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 4e27bb3..1eac917 100644 (file)
@@ -11,7 +11,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: blue;
index 229b141..60045fd 100644 (file)
@@ -14,7 +14,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: blue;
        background: red;
@@ -39,7 +38,7 @@ span {
 <body>
 
 <div>
-       xx xx 
+       xx xx
        xx xx
        <span>xx xx</span>
        xx xx
index f9a70f1..fb1e3ed 100644 (file)
@@ -11,7 +11,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;
@@ -38,7 +37,7 @@ div+div+div {
 
 <body>
 
-<div> 
+<div>
        <div>xx xx</div>
        <div class="a">x x</div>
        <div>xx xx</div>
index 580c8e0..f06a53e 100644 (file)
@@ -14,7 +14,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: black;
        background: yellow;
@@ -50,9 +49,9 @@ span+span+span {
 <body>
 
 <div>
-       xx xx 
        xx xx
-       xx xx 
+       xx xx
+       xx xx
        xx xx
 </div>
 
index d74abbf..175039d 100644 (file)
@@ -19,7 +19,7 @@
   }
 
   div#test, div.test2
-  { 
+  {
   columns: 2;
   column-fill: balance;
   column-gap: 0em;
@@ -61,4 +61,4 @@
   <div class="test2">C<br />D</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 210d623..5e87d38 100644 (file)
@@ -17,7 +17,7 @@
   div + div {line-height: 1;}
 
   img {vertical-align: top;}
-  
+
   img.padding-left {padding-left: 1em;}
 
   img.padding-left-right {padding: 0em 1em;}
@@ -36,4 +36,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 05e676f..5867b46 100644 (file)
  </head>
  <body>
 
- <div><img src="support/black20x20.png" width="420" height="20" alt="Image download support must be enabled" /> 
- <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> 
+ <div><img src="support/black20x20.png" width="420" height="20" alt="Image download support must be enabled" />
+
+ <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />&nbsp;&nbsp;&nbsp;&nbsp;<img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" />
+
  <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" />
 
  <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="40" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="20" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" /> <img src="support/black20x20.png" width="80" height="20" alt="Image download support must be enabled" />
@@ -37,4 +37,4 @@
  </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 2da488d..a671a39 100644 (file)
@@ -26,6 +26,8 @@
 
   column-count: 4;
   column-gap: 0;
+  orphans: 1;
+  widows: 1;
   }
 
   h4
@@ -45,4 +47,4 @@
   1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp; 1 333 1 333 1 333 55555 1 22&nbsp; 1 22&nbsp; 1&nbsp;&nbsp;&nbsp;&nbsp; 1 22&nbsp; 1 22&nbsp; 1 22&nbsp; 55555 1 333 1 333 1&nbsp;&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp;&nbsp; 55555 1 333 1 333 1&nbsp;&nbsp;&nbsp;&nbsp; 4444 4444 1&nbsp;&nbsp;&nbsp;&nbsp; 55555
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index b53be4c..484b603 100644 (file)
@@ -11,7 +11,6 @@
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1;
        color: black;
        background: black;
index 5a8df64..553fecd 100644 (file)
@@ -7,7 +7,7 @@
   <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
   <link rel="match" href="multicol-span-all-margin-001-ref.xht" />
   <meta name="flags" content="ahem may" />
-  <meta name="assert" content="This test checks that when 'overflow' is set to 'hidden' on a multi-column element, then any spanning ('column-span: all') element exceeding the available width of the multi-column should be clipped accordingly." /> 
+  <meta name="assert" content="This test checks that when 'overflow' is set to 'hidden' on a multi-column element, then any spanning ('column-span: all') element exceeding the available width of the multi-column should be clipped accordingly." />
   <style type="text/css"><![CDATA[
   div
   {
 
   column-span: all;
 
-  /* 
-  This is the target of the test: the spanning element's 
-  width (11em) exceeds the available width of the 
-  multi-column element. The 3em exceeding such 
+  /*
+  This is the target of the test: the spanning element's
+  width (11em) exceeds the available width of the
+  multi-column element. The 3em exceeding such
   width is first clipped at column box boundary.
   */
   }
@@ -68,4 +68,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 5dab3f5..538d1d5 100644 (file)
@@ -16,7 +16,7 @@
   <div>
     <img src="support/swatch-gray.png" width="200" height="20" alt="Image download support must be enabled" /><br />
 
-  <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-orange.png" width="100" height="20" alt="Image download support must be enabled" /> 
+  <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-orange.png" width="100" height="20" alt="Image download support must be enabled" />
 
   <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><br />
 
@@ -25,7 +25,7 @@ alt="Image download support must be enabled" /><img src="support/swatch-yellow.p
 
   <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><br />
 
-  <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="160" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><br /> 
+  <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/black20x20.png" width="160" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><br />
 
   <img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" /><img src="support/swatch-gray.png" width="20" height="20" alt="Image download support must be enabled" /><br />
 
@@ -36,4 +36,4 @@ alt="Image download support must be enabled" /><img src="support/swatch-yellow.p
 </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index c0e59d6..591fe42 100644 (file)
   <div>
     <img src="support/swatch-navy.png" width="160" height="40" alt="Image download support must be enabled" />
     <img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" />
-    <img src="support/black20x20.png" width="160" height="20" alt="Image download support must be enabled" />  
-    <img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" /> 
+    <img src="support/black20x20.png" width="160" height="20" alt="Image download support must be enabled" />
+    <img src="support/swatch-yellow.png" width="160" height="20" alt="Image download support must be enabled" />
     <img src="support/swatch-orange.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="80" height="20" alt="Image download support must be enabled" />
     <img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-blue.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" />
-    <img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" />  
+    <img src="support/swatch-blue.png" width="80" height="20" alt="Image download support must be enabled" /><img src="support/swatch-pink.png" width="40" height="20" alt="Image download support must be enabled" /><img src="support/swatch-yellow.png" width="40" height="20" alt="Image download support must be enabled" />
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 8424967..31e6750 100644 (file)
@@ -50,8 +50,8 @@
   color: orange;
   /*
   In this test, the glyphs "or" are painted into 1st column box.
-  "Content in the normal flow that extends into column 
-  gaps (e.g., long words or images) is clipped in the 
+  "Content in the normal flow that extends into column
+  gaps (e.g., long words or images) is clipped in the
   middle of the column gap."
   Therefore, the glyphs "ang" are clipped and not painted.
   */
@@ -75,4 +75,4 @@
   </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index 19843b1..488d75a 100644 (file)
@@ -14,7 +14,6 @@ body {
 body>div {
        font-family: ahem;
        font-size: 1em;
-       -webkit-font-smoothing: none;
        line-height: 1em;
        color: navy;
        background: yellow;
@@ -68,7 +67,7 @@ h6~h6>span {
 <div>
        xx xx xx xx
        xx xx xx xx
-       
+
        <h6><span>xxxxx</span></h6>
        <h6><span>xxxxx</span></h6>
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001-expected.xht
new file mode 100644 (file)
index 0000000..5cd4739
--- /dev/null
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-22  -->
+  <meta name="flags" content="image" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  font: 1.25em/1 serif;
+  border: 1em solid gray;
+  width: 11em;
+  height: 5em;
+  position: relative;
+  }
+
+  img {position: absolute;}
+
+  img#first-blue {left: 0em; top: 0em;}
+
+  img#second-blue {left: 3em; top: 0em;}
+
+  img#first-pink {left: 6em; top: 0em;}
+
+  img#second-pink {left: 9em; top: 0em;}
+
+  img#black {left: 0em; top: 2em;}
+
+  img#first-yellow {left: 6em; top: 2em;}
+
+  img#second-yellow {left: 9em; top: 2em;}
+
+  img#first-orange {left: 0em; top: 3em;}
+
+  img#second-orange {left: 3em; top: 3em;}
+  ]]></style>
+ </head>
+ <body>
+
+  <div>
+       <img id="first-blue" src="support/swatch-blue.png" width="40" height="40" alt="Image download support must be enabled" /> <img id="second-blue" src="support/swatch-blue.png" width="40" height="40" alt="Image download support must be enabled" /> <img id="first-pink" src="support/swatch-pink.png" width="40" height="40" alt="Image download support must be enabled" /> <img id="second-pink" src="support/swatch-pink.png" width="40" height="40" alt="Image download support must be enabled" />
+
+       <img id="black" src="support/black20x20.png" width="110" height="20" alt="Image download support must be enabled" />
+
+       <img id="first-yellow" src="support/swatch-yellow.png" width="40" height="40" alt="Image download support must be enabled" />
+       <img id="second-yellow" src="support/swatch-yellow.png" width="40" height="40" alt="Image download support must be enabled" />
+
+       <img id="first-orange" src="support/swatch-orange.png" width="40" height="40" alt="Image download support must be enabled" />
+       <img id="second-orange" src="support/swatch-orange.png" width="40" height="40" alt="Image download support must be enabled" />
+  </div>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001.xht b/LayoutTests/imported/w3c/web-platform-tests/css/css-multicol/multicol-span-none-001.xht
new file mode 100644 (file)
index 0000000..b6c7ee0
--- /dev/null
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Multi-column Layout Test: column-span: none (basic)</title>
+  <link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
+  <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!--  2013-08-22  -->
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns" title="6.1. 'column-span'" />
+  <link rel="match" href="multicol-span-none-001-ref.xht" />
+  <meta name="flags" content="ahem" />
+  <meta name="assert" content="This test checks how a 'column-span: none' element is rendered: it should not span across all column boxes." />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  border: gray solid 1em;
+  font: 1.25em/1 Ahem;
+  orphans: 1;
+  widows: 1;
+  width: 11em;
+
+  column-count: 2;
+  column-gap: 1em;
+
+  /*
+
+  N == 2;
+
+  W == 5em;
+
+  */
+  }
+
+  h4
+  {
+  background: black;
+  color: black;
+  font: inherit;
+  margin: 0;
+  width: 11em;
+
+  column-span: none;
+  }
+
+  #column1-top {color: blue;}
+
+  #column1-bottom {color: orange;}
+
+  #column2-top {color: pink;}
+
+  #column2-bottom {color: yellow;}
+  ]]></style>
+ </head>
+ <body>
+  <div>
+    <span id="column1-top"> ab cd ef gh </span>
+    <h4> 1234567890123 </h4>
+    <span id="column1-bottom"> ij kl mn oq </span>
+    <span id="column2-top"> ab cd ef gh </span>
+    <span id="column2-bottom"> rs tu vw xy </span>
+  </div>
+ </body>
+</html>
\ No newline at end of file
index 023c9c6..bbb2d3c 100644 (file)
@@ -7,16 +7,16 @@
 <style type="text/css"><![CDATA[
 div {
        font-family: ahem;
-       font-size: 1em;
+       font-size: 20px;
        line-height: 1em;
        vertical-align: middle;
        color: white;
        background: #3366CC;
        width: 6em;
-       height: 8em;
+       height: 5.5em;
 }
 div+div {
-       margin-top: 10em;
+       margin-top: 9em;
 }
 ]]></style>
 </head>
index f8e7a42..f50d0af 100644 (file)
 <style type="text/css"><![CDATA[
 div {
        font-family: ahem;
-       font-size: 1em;
+       font-size: 20px;
        line-height: 1em;
        vertical-align: middle;
        color: white;
        background: #3366CC;
        width: 6em;
-       height: 400px;
+       height: 20em;
        display: table-cell;
-       
+
        column-count: 2;
        column-gap: 0;
 }
index fe82274..2af0038 100644 (file)
@@ -26,7 +26,7 @@
   <div>d da&nbsp; d da&nbsp; d da&nbsp; d da&nbsp; d da&nbsp;<br />
 
   dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp;<br />
-  
+
   dame&nbsp; dame&nbsp; dame&nbsp; dame&nbsp; dame&nbsp;<br />
 
   damer damer damer damer damer <br />
   d da&nbsp; d da&nbsp; d da&nbsp; d da&nbsp;<br />
 
   dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp; dam&nbsp;&nbsp;<br />
-  
+
   dame&nbsp; dame&nbsp; dame&nbsp; dame&nbsp;<br />
 
-  damer damer damer damer 
-  </div> 
+  damer damer damer damer
+  </div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
index f0a11ab..d26894f 100644 (file)
  </head>
  <body>
   <div>
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
-       d da dam dame damer 
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
+       d da dam dame damer
   </div>
  </body>
-</html>
\ No newline at end of file
+</html>
index 22a0a76..5e6ee6b 100644 (file)
@@ -15,7 +15,7 @@
   }
 
   td {padding: 0 1em 0 0;}
-  
+
   img, td {vertical-align: top;}
   ]]></style>
  </head>
@@ -29,4 +29,4 @@
     </tr>
   </table>
  </body>
-</html>
\ No newline at end of file
+</html>